Fix Box2DTestBed keyboard error! (cocos2d#17741)

xbpiao · minggo · commit 0bd075e46703 · 2017-04-27T09:47:13.000+08:00
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h
@@ -147,21 +147,21 @@ class ApplyForce : public Test
 	{
 		switch (key)
 		{
-		case 'w':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_W:
 			{
 				b2Vec2 f = m_body->GetWorldVector(b2Vec2(0.0f, -200.0f));
 				b2Vec2 p = m_body->GetWorldPoint(b2Vec2(0.0f, 2.0f));
 				m_body->ApplyForce(f, p, true);
 			}
 			break;
 
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			{
 				m_body->ApplyTorque(50.0f, true);
 			}
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			{
 				m_body->ApplyTorque(-50.0f, true);
 			}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h
@@ -109,15 +109,15 @@ class BodyTypes : public Test
 	{
 		switch (key)
 		{
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			m_platform->SetType(b2_dynamicBody);
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_platform->SetType(b2_staticBody);
 			break;
 
-		case 'k':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_K:
 			m_platform->SetType(b2_kinematicBody);
 			m_platform->SetLinearVelocity(b2Vec2(-m_speed, 0.0f));
 			m_platform->SetAngularVelocity(0.0f);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Car.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Car.h
@@ -230,25 +230,25 @@ class Car : public Test
 	{
 		switch (key)
 		{
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_spring1->SetMotorSpeed(m_speed);
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_spring1->SetMotorSpeed(0.0f);
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			m_spring1->SetMotorSpeed(-m_speed);
 			break;
 
-		case 'q':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_Q:
 			m_hz = b2Max(0.0f, m_hz - 1.0f);
 			m_spring1->SetSpringFrequencyHz(m_hz);
 			m_spring2->SetSpringFrequencyHz(m_hz);
 			break;
 
-		case 'e':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_E:
 			m_hz += 1.0f;
 			m_spring1->SetSpringFrequencyHz(m_hz);
 			m_spring2->SetSpringFrequencyHz(m_hz);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h
@@ -106,7 +106,7 @@ class Confined : public Test
 	{
 		switch (key)
 		{
-		case 'c':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_C:
 			CreateCircle();
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h
@@ -69,11 +69,11 @@ class ConvexHull : public Test
 	{
 		switch (key)
 		{
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_auto = !m_auto;
 			break;
 
-		case 'g':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_G:
 			Generate();
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h
@@ -95,27 +95,27 @@ class DistanceTest : public Test
 	{
 		switch (key)
 		{
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_positionB.x -= 0.1f;
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			m_positionB.x += 0.1f;
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_positionB.y -= 0.1f;
 			break;
 
-		case 'w':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_W:
 			m_positionB.y += 0.1f;
 			break;
 
-		case 'q':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_Q:
 			m_angleB += 0.1f * b2_pi;
 			break;
 
-		case 'e':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_E:
 			m_angleB -= 0.1f * b2_pi;
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h
@@ -139,19 +139,19 @@ class DynamicTreeTest : public Test
 	{
 		switch (key)
 		{
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_automated = !m_automated;
 			break;
 
-		case 'c':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_C:
 			CreateProxy();
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			DestroyProxy();
 			break;
 
-		case 'm':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_M:
 			MoveProxy();
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h
@@ -182,15 +182,15 @@ class EdgeShapes : public Test
 	{
 		switch (key)
 		{
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-			Create(key - '1');
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_1:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_2:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_3:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_4:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_5:
+			Create((int32)key - (int32)cocos2d::EventKeyboard::KeyCode::KEY_1);
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			DestroyBody();
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h
@@ -149,7 +149,8 @@ class Gears : public Test
 	{
 		switch (key)
 		{
-		case 0:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_0:
+		// case 0:
 			break;
 		}
 	}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h
@@ -72,7 +72,7 @@ class MotorJoint : public Test
 	{
 		switch (key)
 		{
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_go = !m_go;
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h
@@ -137,8 +137,7 @@ class Pinball : public Test
 	{
 		switch (key)
 		{
-		case 'a':
-		case 'A':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_button = true;
 			break;
 		}
@@ -148,8 +147,7 @@ class Pinball : public Test
 	{
 		switch (key)
 		{
-		case 'a':
-		case 'A':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_button = false;
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h
@@ -81,27 +81,27 @@ class PolyCollision : public Test
 	{
 		switch (key)
 		{
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			m_positionB.x -= 0.1f;
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			m_positionB.x += 0.1f;
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_positionB.y -= 0.1f;
 			break;
 
-		case 'w':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_W:
 			m_positionB.y += 0.1f;
 			break;
 
-		case 'q':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_Q:
 			m_angleB += 0.1f * b2_pi;
 			break;
 
-		case 'e':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_E:
 			m_angleB -= 0.1f * b2_pi;
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h
@@ -234,15 +234,15 @@ class PolyShapes : public Test
 	{
 		switch (key)
 		{
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-			Create(key - '1');
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_1:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_2:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_3:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_4:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_5:
+			Create((int32)key - (int32)cocos2d::EventKeyboard::KeyCode::KEY_1);
 			break;
 
-		case 'a':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:
 			for (int32 i = 0; i < e_maxBodies; i += 2)
 			{
 				if (m_bodies[i])
@@ -252,8 +252,7 @@ class PolyShapes : public Test
 				}
 			}
 			break;
-
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			DestroyBody();
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h
@@ -72,15 +72,15 @@ class Prismatic : public Test
 	{
 		switch (key)
 		{
-		case 'l':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_L:
 			m_joint->EnableLimit(!m_joint->IsLimitEnabled());
 			break;
 
-		case 'm':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_M:
 			m_joint->EnableMotor(!m_joint->IsMotorEnabled());
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			m_joint->SetMotorSpeed(-m_joint->GetMotorSpeed());
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h
@@ -306,20 +306,19 @@ class RayCast : public Test
 	{
 		switch (key)
 		{
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-			Create(key - '1');
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_1:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_2:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_3:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_4:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_5:
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_6:
+			Create((int32)key - (int32)cocos2d::EventKeyboard::KeyCode::KEY_1);
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			DestroyBody();
 			break;
-
-		case 'm':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_M:
 			if (m_mode == e_closest)
 			{
 				m_mode = e_any;
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h
@@ -128,11 +128,11 @@ class Revolute : public Test
 	{
 		switch (key)
 		{
-		case 'l':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_L:
 			m_joint->EnableLimit(!m_joint->IsLimitEnabled());
 			break;
 
-		case 'm':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_M:
 			m_joint->EnableMotor(!m_joint->IsMotorEnabled());
 			break;
 		}
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h
@@ -56,12 +56,12 @@ class Rope : public Test
 	{
 		switch (key)
 		{
-		case 'q':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_Q:
 			m_angle = b2Max(-b2_pi, m_angle - 0.05f * b2_pi);
 			m_rope.SetAngle(m_angle);
 			break;
 
-		case 'e':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_E:
 			m_angle = b2Min(b2_pi, m_angle + 0.05f * b2_pi);
 			m_rope.SetAngle(m_angle);
 			break;
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h
@@ -103,7 +103,7 @@ class RopeJoint : public Test
 	{
 		switch (key)
 		{
-		case 'j':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_J:
 			if (m_rope)
 			{
 				m_world->DestroyJoint(m_rope);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h
@@ -52,7 +52,7 @@ class ShapeEditing : public Test
 	{
 		switch (key)
 		{
-		case 'c':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_C:
 			if (m_fixture2 == NULL)
 			{
 				b2CircleShape shape;
@@ -63,7 +63,7 @@ class ShapeEditing : public Test
 			}
 			break;
 
-		case 'd':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:
 			if (m_fixture2 != NULL)
 			{
 				m_body->DestroyFixture(m_fixture2);
@@ -72,7 +72,7 @@ class ShapeEditing : public Test
 			}
 			break;
 
-		case 's':
+		case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:
 			if (m_fixture2 != NULL)
 			{
 				m_sensor = !m_sensor;
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Tests/Web.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Web.h

Original file line number	Diff line number	Diff line change
`@@ -147,21 +147,21 @@ class ApplyForce : public Test`
`147`	`147`	`{`
`148`	`148`	`switch (key)`
`149`	`149`	`{`
`150`		`- case 'w':`
	`150`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_W:`
`151`	`151`	`{`
`152`	`152`	`b2Vec2 f = m_body->GetWorldVector(b2Vec2(0.0f, -200.0f));`
`153`	`153`	`b2Vec2 p = m_body->GetWorldPoint(b2Vec2(0.0f, 2.0f));`
`154`	`154`	`m_body->ApplyForce(f, p, true);`
`155`	`155`	`}`
`156`	`156`	`break;`
`157`	`157`
`158`		`- case 'a':`
	`158`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:`
`159`	`159`	`{`
`160`	`160`	`m_body->ApplyTorque(50.0f, true);`
`161`	`161`	`}`
`162`	`162`	`break;`
`163`	`163`
`164`		`- case 'd':`
	`164`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_D:`
`165`	`165`	`{`
`166`	`166`	`m_body->ApplyTorque(-50.0f, true);`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class Confined : public Test`
`106`	`106`	`{`
`107`	`107`	`switch (key)`
`108`	`108`	`{`
`109`		`- case 'c':`
	`109`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_C:`
`110`	`110`	`CreateCircle();`
`111`	`111`	`break;`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ class ConvexHull : public Test`
`69`	`69`	`{`
`70`	`70`	`switch (key)`
`71`	`71`	`{`
`72`		`- case 'a':`
	`72`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_A:`
`73`	`73`	`m_auto = !m_auto;`
`74`	`74`	`break;`
`75`	`75`
`76`		`- case 'g':`
	`76`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_G:`
`77`	`77`	`Generate();`
`78`	`78`	`break;`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ class Gears : public Test`
`149`	`149`	`{`
`150`	`150`	`switch (key)`
`151`	`151`	`{`
`152`		`- case 0:`
	`152`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_0:`
	`153`	`+ // case 0:`
`153`	`154`	`break;`
`154`	`155`	`}`
`155`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class MotorJoint : public Test`
`72`	`72`	`{`
`73`	`73`	`switch (key)`
`74`	`74`	`{`
`75`		`- case 's':`
	`75`	`+ case (unsigned char)cocos2d::EventKeyboard::KeyCode::KEY_S:`
`76`	`76`	`m_go = !m_go;`
`77`	`77`	`break;`
`78`	`78`	`}`