1. pygame
  2. pygame
  3. pygame

Commits

marcus  committed 0900459

Fixed renamed PG_AppendContact calls. Minor fixes to make it build again.

  • Participants
  • Parent commits 75de0ce
  • Branches physics

Comments (0)

Files changed (3)

File include/pgAABBBox.h

View file
  • Ignore whitespace
 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 src/pgShapeObject.c

View file
  • Ignore whitespace
 #include <math.h>
 #include <assert.h>
 #include <float.h>
-#include <GL/glut.h>
 
 PyTypeObject pgShapeType;
 PyTypeObject pgRectShapeType;
 	}
 
 	//for test
+/*
 	for(i = 0; i < 4; ++i)
 		tgp[i] = PG_GetGlobalPos(ref, &(((pgRectShape*)ref->shape)->point[i]));
 	glColor3f(1.f, 0.0f, 0.5f);
 		break;
 	}
 	glEnd();
-
+*/
 
 	pAcc = PyObject_Malloc(sizeof(pgVector2));
 	pAcc->real = pAcc->imag = 0;

File src/pgWorldObject.c

View file
  • Ignore whitespace
 			if(PG_IsOverlap(&(refBody->shape->box), &(incBody->shape->box), 1e-8))
 			{
 				
-				PG_AppendContact(refBody, incBody, world->contactList);
+				PG_DetectCollision(refBody, incBody, world->contactList);
 			}
 		}
 	}