mirror of https://github.com/axmolengine/axmol.git
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
This commit is contained in:
commit
180cee96d8
|
@ -7,8 +7,14 @@ local function baseInit(self)
|
|||
|
||||
self._angle = 0
|
||||
|
||||
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
|
||||
if targetPlatform == cc.PLATFORM_OS_MAC or targetPlatform == cc.PLATFORM_OS_IPHONE or targetPlatform == cc.PLATFORM_OS_IPAD then
|
||||
cc.FileUtils:getInstance():addSearchPath("Particle3D/materials")
|
||||
cc.FileUtils:getInstance():addSearchPath("Particle3D/scripts")
|
||||
else
|
||||
cc.FileUtils:getInstance():addSearchPath("res/Particle3D/materials")
|
||||
cc.FileUtils:getInstance():addSearchPath("res/Particle3D/scripts")
|
||||
end
|
||||
|
||||
local size = cc.Director:getInstance():getWinSize()
|
||||
self._camera = cc.Camera:createPerspective(30.0, size.width / size.height, 1.0, 1000.0)
|
||||
|
|
Loading…
Reference in New Issue