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

resolve the titlemap testcase conflict with the 3d testcase.

This commit is contained in:
jianglong0156 2015-06-29 16:34:54 +08:00
parent a81d7aa8b4
commit fd54b9941d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/js-tests/src/TileMapTest/TileMapTest.js
View File

@ -229,7 +229,7 @@ var TMXOrthoTest2 = TileDemo.extend({
}, },
onExit:function () { onExit:function () {
this._super(); this._super();
director.setProjection(cc.Director.PROJECTION_2D); director.setProjection(cc.Director.PROJECTION_DEFAULT);
}, },
// Automation // Automation
@ -1122,7 +1122,7 @@ var TMXIsoVertexZ = TMXFixBugLayer.extend({
}, },
onExit:function () { onExit:function () {
// At exit use any other projection. // At exit use any other projection.
// director.setProjection:cc.Director.PROJECTION_3D); director.setProjection(cc.Director.PROJECTION_DEFAULT);
this._super(); this._super();
}, },
repositionSprite:function (dt) { repositionSprite:function (dt) {
@ -1196,7 +1196,7 @@ var TMXOrthoVertexZ = TMXFixBugLayer.extend({
}, },
onExit:function () { onExit:function () {
// At exit use any other projection. // At exit use any other projection.
// director.setProjection:cc.Director.PROJECTION_3D); director.setProjection(cc.Director.PROJECTION_DEFAULT);
this._super(); this._super();
}, },
repositionSprite:function (dt) { repositionSprite:function (dt) {
@ -1673,6 +1673,11 @@ var TileMapTestScene = TestScene.extend({
cc.director.setDepthTest(true); cc.director.setDepthTest(true);
director.runScene(this); director.runScene(this);
},
onExit:function () {
cc.log("onExit");
cc.director.setDepthTest(false);
this._super();
} }
}); });