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

issue #2404: Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2

This commit is contained in:
James Chen 2013-07-18 14:48:18 +08:00
parent 12ac3105b7
commit 8176f2f178
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h
View File

@ -140,10 +140,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
shape.m_radius = 9.999999776482582e-03f; shape.m_radius = 9.999999776482582e-03f;
shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_vertex1.Set(4.452173995971680e+01f, 1.669565200805664e+01f); shape.m_vertex1.Set(4.452173995971680e+01f, 1.669565200805664e+01f);
shape.m_Vertex2F.Set(4.452173995971680e+01f, 0.000000000000000e+00f); shape.m_vertex2.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_hasVertex0 = bool(0); shape.m_hasVertex0 = bool(0);
shape.m_hasVertex3F = bool(0); shape.m_hasVertex3 = bool(0);
fd.shape = &shape; fd.shape = &shape;
@ -162,10 +162,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
shape.m_radius = 9.999999776482582e-03f; shape.m_radius = 9.999999776482582e-03f;
shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f); shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f);
shape.m_Vertex2F.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex2.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_hasVertex0 = bool(0); shape.m_hasVertex0 = bool(0);
shape.m_hasVertex3F = bool(0); shape.m_hasVertex3 = bool(0);
fd.shape = &shape; fd.shape = &shape;
@ -184,10 +184,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
shape.m_radius = 9.999999776482582e-03f; shape.m_radius = 9.999999776482582e-03f;
shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f); shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f);
shape.m_Vertex2F.Set(4.452173995971680e+01f, 1.669565200805664e+01f); shape.m_vertex2.Set(4.452173995971680e+01f, 1.669565200805664e+01f);
shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_hasVertex0 = bool(0); shape.m_hasVertex0 = bool(0);
shape.m_hasVertex3F = bool(0); shape.m_hasVertex3 = bool(0);
fd.shape = &shape; fd.shape = &shape;
@ -206,10 +206,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
shape.m_radius = 9.999999776482582e-03f; shape.m_radius = 9.999999776482582e-03f;
shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_vertex1.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex1.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_Vertex2F.Set(4.452173995971680e+01f, 0.000000000000000e+00f); shape.m_vertex2.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f); shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
shape.m_hasVertex0 = bool(0); shape.m_hasVertex0 = bool(0);
shape.m_hasVertex3F = bool(0); shape.m_hasVertex3 = bool(0);
fd.shape = &shape; fd.shape = &shape;

20
samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h
View File

@ -35,36 +35,36 @@ public:
b2EdgeShape shape; b2EdgeShape shape;
shape.Set(v1, v2); shape.Set(v1, v2);
shape.m_hasVertex3F = true; shape.m_hasVertex3 = true;
shape.m_Vertex3F = v3; shape.m_vertex3 = v3;
ground->CreateFixture(&shape, 0.0f); ground->CreateFixture(&shape, 0.0f);
shape.Set(v2, v3); shape.Set(v2, v3);
shape.m_hasVertex0 = true; shape.m_hasVertex0 = true;
shape.m_hasVertex3F = true; shape.m_hasVertex3 = true;
shape.m_vertex0 = v1; shape.m_vertex0 = v1;
shape.m_Vertex3F = v4; shape.m_vertex3 = v4;
ground->CreateFixture(&shape, 0.0f); ground->CreateFixture(&shape, 0.0f);
shape.Set(v3, v4); shape.Set(v3, v4);
shape.m_hasVertex0 = true; shape.m_hasVertex0 = true;
shape.m_hasVertex3F = true; shape.m_hasVertex3 = true;
shape.m_vertex0 = v2; shape.m_vertex0 = v2;
shape.m_Vertex3F = v5; shape.m_vertex3 = v5;
ground->CreateFixture(&shape, 0.0f); ground->CreateFixture(&shape, 0.0f);
shape.Set(v4, v5); shape.Set(v4, v5);
shape.m_hasVertex0 = true; shape.m_hasVertex0 = true;
shape.m_hasVertex3F = true; shape.m_hasVertex3 = true;
shape.m_vertex0 = v3; shape.m_vertex0 = v3;
shape.m_Vertex3F = v6; shape.m_vertex3 = v6;
ground->CreateFixture(&shape, 0.0f); ground->CreateFixture(&shape, 0.0f);
shape.Set(v5, v6); shape.Set(v5, v6);
shape.m_hasVertex0 = true; shape.m_hasVertex0 = true;
shape.m_hasVertex3F = true; shape.m_hasVertex3 = true;
shape.m_vertex0 = v4; shape.m_vertex0 = v4;
shape.m_Vertex3F = v7; shape.m_vertex3 = v7;
ground->CreateFixture(&shape, 0.0f); ground->CreateFixture(&shape, 0.0f);
shape.Set(v6, v7); shape.Set(v6, v7);