Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge

This commit is contained in:
yangxiao 2015-02-16 10:04:53 +08:00
parent 5c8fbcedab 9e7b22f35c
commit 180cee96d8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/lua-tests/src/Particle3DTest/Particle3DTest.lua
View File

@ -7,8 +7,14 @@ local function baseInit(self)
self._angle = 0 self._angle = 0
cc.FileUtils:getInstance():addSearchPath("Particle3D/materials") local targetPlatform = cc.Application:getInstance():getTargetPlatform()
cc.FileUtils:getInstance():addSearchPath("Particle3D/scripts") 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() local size = cc.Director:getInstance():getWinSize()
self._camera = cc.Camera:createPerspective(30.0, size.width / size.height, 1.0, 1000.0) self._camera = cc.Camera:createPerspective(30.0, size.width / size.height, 1.0, 1000.0)