1. pygame
  2. Untitled project
  3. pygame

Commits

minz  committed e74c5b3

merge and solve conflicts

  • Participants
  • Parent commits 45112d2
  • Branches physics

Comments (0)

Files changed (4)

File Test/Main.c

View file
 
 #include "pgPhysicsRenderer.h"
 #include "pgBodyObject.h"
-#include "glTestSuite.h"
+//#include "glTestSuite.h"
 
 static pgWorldObject* s_world = NULL;
 

File include/pgAABBBox.h

View file
 int PG_IsOverlap(pgAABBBox* boxA, pgAABBBox* boxB, double eps);
 int PG_IsIn(pgVector2* p, pgAABBBox* box, double eps);
 
-#endif //_PYGAME_MATH_AABBBOX_
-
-
+#endif //_PYGAME_MATH_AABBBOX_

File include/pgBodyObject.h

View file
 pgVector2 PG_GetLocalPointVelocity(pgBodyObject* body,pgVector2 localPoint);
 
 #endif //_PYGAME_PHYSICS_BODY_
-

File src/pgJointObject.c

View file
 	dAngleV /= k;
 	body->fRotation += dAngleV;*/
 
-	double a,b,bb,k,temp,lengthP; //for solve equation
+	double a,b,bb,k,temp; //for solve equation
 	pgVector2 localP = PG_GetGlobalPos(body,localAnchor);
 	pgVector2 L = c_diff(*staticAnchor,localP);
 	pgVector2 vP = PG_GetLocalPointVelocity(body,*localAnchor);
 void _PG_DistanceJoint_ComputeTwoDynamic(pgDistanceJointObject* joint,double stepTime)
 {
 	pgBodyObject *body1 = joint->joint.body1,*body2 = joint->joint.body2;
-	double a1,a2,b1,b2,bb,k1,k2,temp,temp1,temp2,lengthP1,lengthP2; //for solve equation
+	double a1,a2,b1,b2,bb,k1,k2,temp,temp1,temp2; //for solve equation
 	pgVector2 localP1 = PG_GetGlobalPos(body1,&joint->anchor1);
 	pgVector2 localP2 = PG_GetGlobalPos(body2,&joint->anchor2);
 	pgVector2 L = c_diff(localP1,localP2);