Bläddra i källkod

[cococs2dx] Reverted temporary changes to samples

badlogic 8 år sedan
förälder
incheckning
bc8ac2e379

+ 1 - 1
spine-cocos2dx/example/Classes/BatchingExample.cpp

@@ -74,7 +74,7 @@ bool BatchingExample::init () {
 		skeletonNode->addAnimation(0, "jump", true, RandomHelper::random_int(0, 300) / 100.0f);
 		skeletonNode->addAnimation(0, "run", true);
 		
-		skeletonNode->setTwoColorTint(true);
+		// skeletonNode->setTwoColorTint(true);
 
 		skeletonNode->setPosition(Vec2(
 			RandomHelper::random_int(xMin, xMax),

+ 4 - 4
spine-cocos2dx/example/Classes/GoblinsExample.cpp

@@ -43,11 +43,11 @@ Scene* GoblinsExample::scene () {
 bool GoblinsExample::init () {
 	if (!LayerColor::initWithColor(Color4B(128, 128, 128, 255))) return false;
 
-	skeletonNode = SkeletonAnimation::createWithBinaryFile("TwoColorTest.skel", "TwoColorTest.atlas", 0.5f);
-	skeletonNode->setAnimation(0, "animation", true);
-	// skeletonNode->setSkin("goblin");
+	skeletonNode = SkeletonAnimation::createWithJsonFile("goblins-mesh.json", "goblins.atlas", 1.5f);
+	skeletonNode->setAnimation(0, "walk", true);
+	skeletonNode->setSkin("goblin");
 
-	skeletonNode->setPosition(Vec2(_contentSize.width / 2, _contentSize.height / 2));
+	skeletonNode->setPosition(Vec2(_contentSize.width / 2, 20));
 	addChild(skeletonNode);
 
 	scheduleUpdate();

+ 1 - 1
spine-cocos2dx/example/Classes/TankExample.cpp

@@ -44,7 +44,7 @@ bool TankExample::init () {
 	if (!LayerColor::initWithColor(Color4B(128, 128, 128, 255))) return false;
 
 	skeletonNode = SkeletonAnimation::createWithJsonFile("tank.json", "tank.atlas", 0.5f);
-	skeletonNode->setAnimation(0, "drive", true);	
+	skeletonNode->setAnimation(0, "drive", true);
 
 	skeletonNode->setPosition(Vec2(_contentSize.width / 2 + 400, 20));
 	addChild(skeletonNode);