mirror of https://github.com/axmolengine/axmol.git
issue #2771: update project setting
This commit is contained in:
boyu0
parent
f96bc2355a
commit
481ad7ef12
|
|
@ -65,7 +65,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;"$(ProjectDir)..\..\cocos2dx";"$(ProjectDir)..\..\cocos2dx\include";"$(ProjectDir)..\..\cocos2dx\kazmath\include";"$(ProjectDir)..\..\cocos2dx\platform\win32";"$(ProjectDir)..\..\cocos2dx\platform\third_party\win32\OGLES";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;$(ProjectDir)..\..\cocos2dx;$(ProjectDir)..\..\cocos2dx\include;$(ProjectDir)..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3f1cfaf06d95973aa8f2a629582705eb65bb24f6
|
||||
29c3c2dfd8b683a800709d085839444c3a304a0d
|
||||
|
|
@ -38,7 +38,7 @@ PhysicsBodyInfo::~PhysicsBodyInfo()
|
|||
|
||||
Clonable* PhysicsBodyInfo::clone() const
|
||||
{
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -1,446 +0,0 @@
|
|||
/* Copyright (c) 2007 Scott Lembcke
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include "OpenGL/gl.h"
|
||||
#include "OpenGL/glu.h"
|
||||
#include <GLUT/glut.h>
|
||||
#else
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#include "chipmunk_private.h"
|
||||
#include "ChipmunkDebugDraw.h"
|
||||
|
||||
/*
|
||||
IMPORTANT - READ ME!
|
||||
|
||||
This file sets up a simple interface that the individual demos can use to get
|
||||
a Chipmunk space running and draw what's in it. In order to keep the Chipmunk
|
||||
examples clean and simple, they contain no graphics code. All drawing is done
|
||||
by accessing the Chipmunk structures at a very low level. It is NOT
|
||||
recommended to write a game or application this way as it does not scale
|
||||
beyond simple shape drawing and is very dependent on implementation details
|
||||
about Chipmunk which may change with little to no warning.
|
||||
*/
|
||||
|
||||
const Color LINE_COLOR = {200.0/255.0, 210.0/255.0, 230.0/255.0, 1.0};
|
||||
const Color CONSTRAINT_COLOR = {0.0, 0.75, 0.0, 1.0};
|
||||
const float SHAPE_ALPHA = 1.0;
|
||||
|
||||
float ChipmunkDebugDrawPointLineScale = 1.0;
|
||||
|
||||
static Color
|
||||
ColorFromHash(cpHashValue hash, float alpha)
|
||||
{
|
||||
unsigned long val = (unsigned long)hash;
|
||||
|
||||
// scramble the bits up using Robert Jenkins' 32 bit integer hash function
|
||||
val = (val+0x7ed55d16) + (val<<12);
|
||||
val = (val^0xc761c23c) ^ (val>>19);
|
||||
val = (val+0x165667b1) + (val<<5);
|
||||
val = (val+0xd3a2646c) ^ (val<<9);
|
||||
val = (val+0xfd7046c5) + (val<<3);
|
||||
val = (val^0xb55a4f09) ^ (val>>16);
|
||||
|
||||
GLfloat r = (val>>0) & 0xFF;
|
||||
GLfloat g = (val>>8) & 0xFF;
|
||||
GLfloat b = (val>>16) & 0xFF;
|
||||
|
||||
GLfloat max = cpfmax(cpfmax(r, g), b);
|
||||
GLfloat min = cpfmin(cpfmin(r, g), b);
|
||||
GLfloat intensity = 0.75;
|
||||
|
||||
// Saturate and scale the color
|
||||
if(min == max){
|
||||
return RGBAColor(intensity, 0.0, 0.0, alpha);
|
||||
} else {
|
||||
GLfloat coef = alpha*intensity/(max - min);
|
||||
return RGBAColor(
|
||||
(r - min)*coef,
|
||||
(g - min)*coef,
|
||||
(b - min)*coef,
|
||||
alpha
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
glColor_from_color(Color color){
|
||||
glColor4fv((GLfloat *)&color);
|
||||
}
|
||||
|
||||
static Color
|
||||
ColorForShape(cpShape *shape)
|
||||
{
|
||||
if(cpShapeGetSensor(shape)){
|
||||
return LAColor(1, 0);
|
||||
} else {
|
||||
cpBody *body = shape->body;
|
||||
|
||||
if(cpBodyIsSleeping(body)){
|
||||
return LAColor(0.2, 1);
|
||||
} else if(body->node.idleTime > shape->space->sleepTimeThreshold) {
|
||||
return LAColor(0.66, 1);
|
||||
} else {
|
||||
return ColorFromHash(shape->hashid, SHAPE_ALPHA);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const GLfloat circleVAR[] = {
|
||||
0.0000f, 1.0000f,
|
||||
0.2588f, 0.9659f,
|
||||
0.5000f, 0.8660f,
|
||||
0.7071f, 0.7071f,
|
||||
0.8660f, 0.5000f,
|
||||
0.9659f, 0.2588f,
|
||||
1.0000f, 0.0000f,
|
||||
0.9659f, -0.2588f,
|
||||
0.8660f, -0.5000f,
|
||||
0.7071f, -0.7071f,
|
||||
0.5000f, -0.8660f,
|
||||
0.2588f, -0.9659f,
|
||||
0.0000f, -1.0000f,
|
||||
-0.2588f, -0.9659f,
|
||||
-0.5000f, -0.8660f,
|
||||
-0.7071f, -0.7071f,
|
||||
-0.8660f, -0.5000f,
|
||||
-0.9659f, -0.2588f,
|
||||
-1.0000f, -0.0000f,
|
||||
-0.9659f, 0.2588f,
|
||||
-0.8660f, 0.5000f,
|
||||
-0.7071f, 0.7071f,
|
||||
-0.5000f, 0.8660f,
|
||||
-0.2588f, 0.9659f,
|
||||
0.0000f, 1.0000f,
|
||||
0.0f, 0.0f, // For an extra line to see the rotation.
|
||||
};
|
||||
static const int circleVAR_count = sizeof(circleVAR)/sizeof(GLfloat)/2;
|
||||
|
||||
void ChipmunkDebugDrawCircle(cpVect center, cpFloat angle, cpFloat radius, Color lineColor, Color fillColor)
|
||||
{
|
||||
glVertexPointer(2, GL_FLOAT, 0, circleVAR);
|
||||
|
||||
glPushMatrix(); {
|
||||
glTranslatef(center.x, center.y, 0.0f);
|
||||
glRotatef(angle*180.0f/M_PI, 0.0f, 0.0f, 1.0f);
|
||||
glScalef(radius, radius, 1.0f);
|
||||
|
||||
if(fillColor.a > 0){
|
||||
glColor_from_color(fillColor);
|
||||
glDrawArrays(GL_TRIANGLE_FAN, 0, circleVAR_count - 1);
|
||||
}
|
||||
|
||||
if(lineColor.a > 0){
|
||||
glColor_from_color(lineColor);
|
||||
glDrawArrays(GL_LINE_STRIP, 0, circleVAR_count);
|
||||
}
|
||||
} glPopMatrix();
|
||||
}
|
||||
|
||||
static const GLfloat pillVAR[] = {
|
||||
0.0000f, 1.0000f, 1.0f,
|
||||
0.2588f, 0.9659f, 1.0f,
|
||||
0.5000f, 0.8660f, 1.0f,
|
||||
0.7071f, 0.7071f, 1.0f,
|
||||
0.8660f, 0.5000f, 1.0f,
|
||||
0.9659f, 0.2588f, 1.0f,
|
||||
1.0000f, 0.0000f, 1.0f,
|
||||
0.9659f, -0.2588f, 1.0f,
|
||||
0.8660f, -0.5000f, 1.0f,
|
||||
0.7071f, -0.7071f, 1.0f,
|
||||
0.5000f, -0.8660f, 1.0f,
|
||||
0.2588f, -0.9659f, 1.0f,
|
||||
0.0000f, -1.0000f, 1.0f,
|
||||
|
||||
0.0000f, -1.0000f, 0.0f,
|
||||
-0.2588f, -0.9659f, 0.0f,
|
||||
-0.5000f, -0.8660f, 0.0f,
|
||||
-0.7071f, -0.7071f, 0.0f,
|
||||
-0.8660f, -0.5000f, 0.0f,
|
||||
-0.9659f, -0.2588f, 0.0f,
|
||||
-1.0000f, -0.0000f, 0.0f,
|
||||
-0.9659f, 0.2588f, 0.0f,
|
||||
-0.8660f, 0.5000f, 0.0f,
|
||||
-0.7071f, 0.7071f, 0.0f,
|
||||
-0.5000f, 0.8660f, 0.0f,
|
||||
-0.2588f, 0.9659f, 0.0f,
|
||||
0.0000f, 1.0000f, 0.0f,
|
||||
};
|
||||
static const int pillVAR_count = sizeof(pillVAR)/sizeof(GLfloat)/3;
|
||||
|
||||
void ChipmunkDebugDrawSegment(cpVect a, cpVect b, Color color)
|
||||
{
|
||||
GLfloat verts[] = {
|
||||
a.x, a.y,
|
||||
b.x, b.y,
|
||||
};
|
||||
|
||||
glVertexPointer(2, GL_FLOAT, 0, verts);
|
||||
glColor_from_color(color);
|
||||
glDrawArrays(GL_LINES, 0, 2);
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawFatSegment(cpVect a, cpVect b, cpFloat radius, Color lineColor, Color fillColor)
|
||||
{
|
||||
if(radius){
|
||||
glVertexPointer(3, GL_FLOAT, 0, pillVAR);
|
||||
glPushMatrix(); {
|
||||
cpVect d = cpvsub(b, a);
|
||||
cpVect r = cpvmult(d, radius/cpvlength(d));
|
||||
|
||||
const GLfloat matrix[] = {
|
||||
r.x, r.y, 0.0f, 0.0f,
|
||||
-r.y, r.x, 0.0f, 0.0f,
|
||||
d.x, d.y, 0.0f, 0.0f,
|
||||
a.x, a.y, 0.0f, 1.0f,
|
||||
};
|
||||
glMultMatrixf(matrix);
|
||||
|
||||
if(fillColor.a > 0){
|
||||
glColor_from_color(fillColor);
|
||||
glDrawArrays(GL_TRIANGLE_FAN, 0, pillVAR_count);
|
||||
}
|
||||
|
||||
if(lineColor.a > 0){
|
||||
glColor_from_color(lineColor);
|
||||
glDrawArrays(GL_LINE_LOOP, 0, pillVAR_count);
|
||||
}
|
||||
} glPopMatrix();
|
||||
} else {
|
||||
ChipmunkDebugDrawSegment(a, b, lineColor);
|
||||
}
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawPolygon(int count, cpVect *verts, Color lineColor, Color fillColor)
|
||||
{
|
||||
#if CP_USE_DOUBLES
|
||||
glVertexPointer(2, GL_DOUBLE, 0, verts);
|
||||
#else
|
||||
glVertexPointer(2, GL_FLOAT, 0, verts);
|
||||
#endif
|
||||
|
||||
if(fillColor.a > 0){
|
||||
glColor_from_color(fillColor);
|
||||
glDrawArrays(GL_TRIANGLE_FAN, 0, count);
|
||||
}
|
||||
|
||||
if(lineColor.a > 0){
|
||||
glColor_from_color(lineColor);
|
||||
glDrawArrays(GL_LINE_LOOP, 0, count);
|
||||
}
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawPoints(cpFloat size, int count, cpVect *verts, Color color)
|
||||
{
|
||||
#if CP_USE_DOUBLES
|
||||
glVertexPointer(2, GL_DOUBLE, 0, verts);
|
||||
#else
|
||||
glVertexPointer(2, GL_FLOAT, 0, verts);
|
||||
#endif
|
||||
|
||||
glPointSize(size*ChipmunkDebugDrawPointLineScale);
|
||||
glColor_from_color(color);
|
||||
glDrawArrays(GL_POINTS, 0, count);
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawBB(cpBB bb, Color color)
|
||||
{
|
||||
cpVect verts[] = {
|
||||
cpv(bb.l, bb.b),
|
||||
cpv(bb.l, bb.t),
|
||||
cpv(bb.r, bb.t),
|
||||
cpv(bb.r, bb.b),
|
||||
};
|
||||
ChipmunkDebugDrawPolygon(4, verts, color, LAColor(0, 0));
|
||||
}
|
||||
|
||||
static void
|
||||
drawShape(cpShape *shape, void *unused)
|
||||
{
|
||||
cpBody *body = shape->body;
|
||||
Color color = ColorForShape(shape);
|
||||
|
||||
switch(shape->klass->type){
|
||||
case CP_CIRCLE_SHAPE: {
|
||||
cpCircleShape *circle = (cpCircleShape *)shape;
|
||||
ChipmunkDebugDrawCircle(circle->tc, body->a, circle->r, LINE_COLOR, color);
|
||||
break;
|
||||
}
|
||||
case CP_SEGMENT_SHAPE: {
|
||||
cpSegmentShape *seg = (cpSegmentShape *)shape;
|
||||
ChipmunkDebugDrawFatSegment(seg->ta, seg->tb, seg->r, LINE_COLOR, color);
|
||||
break;
|
||||
}
|
||||
case CP_POLY_SHAPE: {
|
||||
cpPolyShape *poly = (cpPolyShape *)shape;
|
||||
ChipmunkDebugDrawPolygon(poly->numVerts, poly->tVerts, LINE_COLOR, color);
|
||||
break;
|
||||
}
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawShape(cpShape *shape)
|
||||
{
|
||||
drawShape(shape, NULL);
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawShapes(cpSpace *space)
|
||||
{
|
||||
cpSpaceEachShape(space, drawShape, NULL);
|
||||
}
|
||||
|
||||
static const GLfloat springVAR[] = {
|
||||
0.00f, 0.0f,
|
||||
0.20f, 0.0f,
|
||||
0.25f, 3.0f,
|
||||
0.30f,-6.0f,
|
||||
0.35f, 6.0f,
|
||||
0.40f,-6.0f,
|
||||
0.45f, 6.0f,
|
||||
0.50f,-6.0f,
|
||||
0.55f, 6.0f,
|
||||
0.60f,-6.0f,
|
||||
0.65f, 6.0f,
|
||||
0.70f,-3.0f,
|
||||
0.75f, 6.0f,
|
||||
0.80f, 0.0f,
|
||||
1.00f, 0.0f,
|
||||
};
|
||||
static const int springVAR_count = sizeof(springVAR)/sizeof(GLfloat)/2;
|
||||
|
||||
static void
|
||||
drawSpring(cpDampedSpring *spring, cpBody *body_a, cpBody *body_b)
|
||||
{
|
||||
cpVect a = cpvadd(body_a->p, cpvrotate(spring->anchr1, body_a->rot));
|
||||
cpVect b = cpvadd(body_b->p, cpvrotate(spring->anchr2, body_b->rot));
|
||||
|
||||
cpVect points[] = {a, b};
|
||||
ChipmunkDebugDrawPoints(5, 2, points, CONSTRAINT_COLOR);
|
||||
|
||||
cpVect delta = cpvsub(b, a);
|
||||
|
||||
glVertexPointer(2, GL_FLOAT, 0, springVAR);
|
||||
glPushMatrix(); {
|
||||
GLfloat x = a.x;
|
||||
GLfloat y = a.y;
|
||||
GLfloat cos = delta.x;
|
||||
GLfloat sin = delta.y;
|
||||
GLfloat s = 1.0f/cpvlength(delta);
|
||||
|
||||
const GLfloat matrix[] = {
|
||||
cos, sin, 0.0f, 0.0f,
|
||||
-sin*s, cos*s, 0.0f, 0.0f,
|
||||
0.0f, 0.0f, 1.0f, 0.0f,
|
||||
x, y, 0.0f, 1.0f,
|
||||
};
|
||||
|
||||
glMultMatrixf(matrix);
|
||||
glDrawArrays(GL_LINE_STRIP, 0, springVAR_count);
|
||||
} glPopMatrix();
|
||||
}
|
||||
|
||||
static void
|
||||
drawConstraint(cpConstraint *constraint, void *unused)
|
||||
{
|
||||
cpBody *body_a = constraint->a;
|
||||
cpBody *body_b = constraint->b;
|
||||
|
||||
const cpConstraintClass *klass = constraint->klass;
|
||||
if(klass == cpPinJointGetClass()){
|
||||
cpPinJoint *joint = (cpPinJoint *)constraint;
|
||||
|
||||
cpVect a = cpvadd(body_a->p, cpvrotate(joint->anchr1, body_a->rot));
|
||||
cpVect b = cpvadd(body_b->p, cpvrotate(joint->anchr2, body_b->rot));
|
||||
|
||||
cpVect points[] = {a, b};
|
||||
ChipmunkDebugDrawPoints(5, 2, points, CONSTRAINT_COLOR);
|
||||
ChipmunkDebugDrawSegment(a, b, CONSTRAINT_COLOR);
|
||||
} else if(klass == cpSlideJointGetClass()){
|
||||
cpSlideJoint *joint = (cpSlideJoint *)constraint;
|
||||
|
||||
cpVect a = cpvadd(body_a->p, cpvrotate(joint->anchr1, body_a->rot));
|
||||
cpVect b = cpvadd(body_b->p, cpvrotate(joint->anchr2, body_b->rot));
|
||||
|
||||
cpVect points[] = {a, b};
|
||||
ChipmunkDebugDrawPoints(5, 2, points, CONSTRAINT_COLOR);
|
||||
ChipmunkDebugDrawSegment(a, b, CONSTRAINT_COLOR);
|
||||
} else if(klass == cpPivotJointGetClass()){
|
||||
cpPivotJoint *joint = (cpPivotJoint *)constraint;
|
||||
|
||||
cpVect a = cpvadd(body_a->p, cpvrotate(joint->anchr1, body_a->rot));
|
||||
cpVect b = cpvadd(body_b->p, cpvrotate(joint->anchr2, body_b->rot));
|
||||
|
||||
cpVect points[] = {a, b};
|
||||
ChipmunkDebugDrawPoints(10, 2, points, CONSTRAINT_COLOR);
|
||||
} else if(klass == cpGrooveJointGetClass()){
|
||||
cpGrooveJoint *joint = (cpGrooveJoint *)constraint;
|
||||
|
||||
cpVect a = cpvadd(body_a->p, cpvrotate(joint->grv_a, body_a->rot));
|
||||
cpVect b = cpvadd(body_a->p, cpvrotate(joint->grv_b, body_a->rot));
|
||||
cpVect c = cpvadd(body_b->p, cpvrotate(joint->anchr2, body_b->rot));
|
||||
|
||||
ChipmunkDebugDrawPoints(5, 1, &c, CONSTRAINT_COLOR);
|
||||
ChipmunkDebugDrawSegment(a, b, CONSTRAINT_COLOR);
|
||||
} else if(klass == cpDampedSpringGetClass()){
|
||||
drawSpring((cpDampedSpring *)constraint, body_a, body_b);
|
||||
}
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawConstraint(cpConstraint *constraint)
|
||||
{
|
||||
drawConstraint(constraint, NULL);
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawConstraints(cpSpace *space)
|
||||
{
|
||||
cpSpaceEachConstraint(space, drawConstraint, NULL);
|
||||
}
|
||||
|
||||
void ChipmunkDebugDrawCollisionPoints(cpSpace *space)
|
||||
{
|
||||
cpArray *arbiters = space->arbiters;
|
||||
|
||||
glColor3f(1.0f, 0.0f, 0.0f);
|
||||
glPointSize(4.0f*ChipmunkDebugDrawPointLineScale);
|
||||
|
||||
glBegin(GL_POINTS); {
|
||||
for(int i=0; i<arbiters->num; i++){
|
||||
cpArbiter *arb = (cpArbiter*)arbiters->arr[i];
|
||||
|
||||
for(int j=0; j<arb->numContacts; j++){
|
||||
cpVect v = arb->contacts[j].p;
|
||||
glVertex2f(v.x, v.y);
|
||||
}
|
||||
}
|
||||
} glEnd();
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
/* Copyright (c) 2007 Scott Lembcke
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
typedef struct Color {
|
||||
float r, g, b, a;
|
||||
} Color;
|
||||
|
||||
static inline Color RGBAColor(float r, float g, float b, float a){
|
||||
Color color = {r, g, b, a};
|
||||
return color;
|
||||
}
|
||||
|
||||
static inline Color LAColor(float l, float a){
|
||||
Color color = {l, l, l, a};
|
||||
return color;
|
||||
}
|
||||
|
||||
extern float ChipmunkDebugDrawPointLineScale;
|
||||
|
||||
void ChipmunkDebugDrawCircle(cpVect center, cpFloat angle, cpFloat radius, Color lineColor, Color fillColor);
|
||||
void ChipmunkDebugDrawSegment(cpVect a, cpVect b, Color color);
|
||||
void ChipmunkDebugDrawFatSegment(cpVect a, cpVect b, cpFloat radius, Color lineColor, Color fillColor);
|
||||
void ChipmunkDebugDrawPolygon(int count, cpVect *verts, Color lineColor, Color fillColor);
|
||||
void ChipmunkDebugDrawPoints(cpFloat size, int count, cpVect *verts, Color color);
|
||||
void ChipmunkDebugDrawBB(cpBB bb, Color color);
|
||||
|
||||
void ChipmunkDebugDrawConstraint(cpConstraint *constraint);
|
||||
void ChipmunkDebugDrawShape(cpShape *shape);
|
||||
|
||||
void ChipmunkDebugDrawShapes(cpSpace *space);
|
||||
void ChipmunkDebugDrawConstraints(cpSpace *space);
|
||||
void ChipmunkDebugDrawCollisionPoints(cpSpace *space);
|
||||
|
|
@ -59,7 +59,8 @@ INCLUDES += \
|
|||
-I$(COCOS_SRC)/platform/linux \
|
||||
-I$(COCOS_SRC)/platform/third_party/linux/libjpeg \
|
||||
-I$(COCOS_SRC)/platform/third_party/linux/libtiff \
|
||||
-I$(COCOS_SRC)/platform/third_party/linux/libwebp
|
||||
-I$(COCOS_SRC)/platform/third_party/linux/libwebp \
|
||||
-I$(COCOS_ROOT/external/chipmunk/include/chipmunk
|
||||
|
||||
LBITS := $(shell getconf LONG_BIT)
|
||||
ifeq ($(LBITS),64)
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(ProjectDir)..;$(ProjectDir)..\platform\win32;$(ProjectDir)..\platform\third_party\win32\iconv;$(ProjectDir)..\platform\third_party\win32\zlib;$(ProjectDir)..\platform\third_party\win32\libpng;$(ProjectDir)..\platform\third_party\win32\libjpeg;$(ProjectDir)..\platform\third_party\win32\libtiff;$(ProjectDir)..\platform\third_party\win32\libwebp;$(ProjectDir)..\platform\third_party\win32\libfreetype2;$(ProjectDir)..\platform\third_party\win32\OGLES;..\include;$(ProjectDir)..\kazmath\include;$(ProjectDir)..\platform\third_party\common\etc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(ProjectDir)..;$(ProjectDir)..\platform\win32;$(ProjectDir)..\platform\third_party\win32\iconv;$(ProjectDir)..\platform\third_party\win32\zlib;$(ProjectDir)..\platform\third_party\win32\libpng;$(ProjectDir)..\platform\third_party\win32\libjpeg;$(ProjectDir)..\platform\third_party\win32\libtiff;$(ProjectDir)..\platform\third_party\win32\libwebp;$(ProjectDir)..\platform\third_party\win32\libfreetype2;$(ProjectDir)..\platform\third_party\win32\OGLES;..\include;$(ProjectDir)..\kazmath\include;$(ProjectDir)..\platform\third_party\common\etc;$(ProjectDir)..\..\external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -211,6 +211,21 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
|
|||
<ClCompile Include="..\particle_nodes\CCParticleExamples.cpp" />
|
||||
<ClCompile Include="..\particle_nodes\CCParticleSystem.cpp" />
|
||||
<ClCompile Include="..\particle_nodes\CCParticleSystemQuad.cpp" />
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsBodyInfo.cpp" />
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsContactInfo.cpp" />
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsJointInfo.cpp" />
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsShapeInfo.cpp" />
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsWorldInfo.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsContact.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsShape.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsWorld.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsContactInfo.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo.cpp" />
|
||||
<ClCompile Include="..\platform\CCEGLViewProtocol.cpp" />
|
||||
<ClCompile Include="..\platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="..\platform\CCSAXParser.cpp" />
|
||||
|
|
@ -365,6 +380,24 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
|
|||
<ClInclude Include="..\particle_nodes\CCParticleExamples.h" />
|
||||
<ClInclude Include="..\particle_nodes\CCParticleSystem.h" />
|
||||
<ClInclude Include="..\particle_nodes\CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsBodyInfo.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsContactInfo.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsHelper.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsJointInfo.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsShapeInfo.h" />
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsWorldInfo.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsContact.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsJoint.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsSetting.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsShape.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsWorld.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsContactInfo.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsHelper.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo.h" />
|
||||
<ClInclude Include="..\platform\CCApplicationProtocol.h" />
|
||||
<ClInclude Include="..\platform\CCCommon.h" />
|
||||
<ClInclude Include="..\platform\CCDevice.h" />
|
||||
|
|
|
|||
|
|
@ -103,6 +103,15 @@
|
|||
<Filter Include="event_dispatcher">
|
||||
<UniqueIdentifier>{3ff2746c-a91b-4b86-93b7-43a9ec14825b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="physics">
|
||||
<UniqueIdentifier>{08593631-5bf5-46aa-9436-62595c4f7bf6}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="physics\chipmunk">
|
||||
<UniqueIdentifier>{aeadfa95-9c89-4212-98ae-89ad57db596a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="physics\Box2D">
|
||||
<UniqueIdentifier>{b9880458-36e5-4f28-a34b-d01d9512a395}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\base_nodes\CCAtlasNode.cpp">
|
||||
|
|
@ -512,6 +521,51 @@
|
|||
<ClCompile Include="..\event_dispatcher\CCTouchEventListener.cpp">
|
||||
<Filter>event_dispatcher</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
|
||||
<Filter>physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\CCPhysicsContact.cpp">
|
||||
<Filter>physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\CCPhysicsJoint.cpp">
|
||||
<Filter>physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\CCPhysicsShape.cpp">
|
||||
<Filter>physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\CCPhysicsWorld.cpp">
|
||||
<Filter>physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo.cpp">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsContactInfo.cpp">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo.cpp">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo.cpp">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo.cpp">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsBodyInfo.cpp">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsContactInfo.cpp">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsJointInfo.cpp">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsShapeInfo.cpp">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\physics\Box2D\CCPhysicsWorldInfo.cpp">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\base_nodes\CCAtlasNode.h">
|
||||
|
|
@ -1035,5 +1089,59 @@
|
|||
<ClInclude Include="..\event_dispatcher\CCTouchEventListener.h">
|
||||
<Filter>event_dispatcher</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsContact.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsJoint.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsSetting.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsShape.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\CCPhysicsWorld.h">
|
||||
<Filter>physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsContactInfo.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsHelper.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo.h">
|
||||
<Filter>physics\chipmunk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsBodyInfo.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsContactInfo.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsHelper.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsJointInfo.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsShapeInfo.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\physics\Box2D\CCPhysicsWorldInfo.h">
|
||||
<Filter>physics\Box2D</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -43,8 +43,8 @@ CocoStudio/Armature/display/CCDisplayFactory.cpp \
|
|||
CocoStudio/Armature/display/CCDisplayManager.cpp \
|
||||
CocoStudio/Armature/display/CCSkin.cpp \
|
||||
CocoStudio/Armature/physics/CCColliderDetector.cpp \
|
||||
CocoStudio/Armature/utils/CCArmatureDefine.cpp \
|
||||
CocoStudio/Armature/utils/CCArmatureDataManager.cpp \
|
||||
CocoStudio/Armature/utils/CCArmatureDefine.cpp \
|
||||
CocoStudio/Armature/utils/CCDataReaderHelper.cpp \
|
||||
CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.cpp \
|
||||
CocoStudio/Armature/utils/CCTransformHelp.cpp \
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ LOCAL_SRC_FILES := hellocpp/main.cpp \
|
|||
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdenshion_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdenshion_static chipmunk_static
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
$(call import-module,cocos2dx)
|
||||
$(call import-module,CocosDenshion/android)
|
||||
$(call import-module,cocos2dx/platform/android)
|
||||
$(call import-module,external/chipmunk)
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;..\Classes;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ LOCAL_SRC_FILES := hellocpp/main.cpp \
|
|||
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdenshion_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdenshion_static chipmunk_static
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
|
@ -21,3 +21,4 @@ $(call import-module,CocosDenshion/android)
|
|||
$(call import-module,cocos2dx)
|
||||
$(call import-module,extensions)
|
||||
$(call import-module,cocos2dx/platform/android)
|
||||
$(call import-module,external/chipmunk)
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ SOURCES = ../Classes/AccelerometerTest/AccelerometerTest.cpp \
|
|||
../Classes/PerformanceTest/PerformanceTest.cpp \
|
||||
../Classes/PerformanceTest/PerformanceTextureTest.cpp \
|
||||
../Classes/PerformanceTest/PerformanceTouchesTest.cpp \
|
||||
../Classes/PhysicsTest/PhysicsTest.cpp \
|
||||
../Classes/RenderTextureTest/RenderTextureTest.cpp \
|
||||
../Classes/RotateWorldTest/RotateWorldTest.cpp \
|
||||
../Classes/SceneTest/SceneTest.cpp \
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ SOURCES = ../Classes/AccelerometerTest/AccelerometerTest.cpp \
|
|||
../Classes/PerformanceTest/PerformanceTest.cpp \
|
||||
../Classes/PerformanceTest/PerformanceTextureTest.cpp \
|
||||
../Classes/PerformanceTest/PerformanceTouchesTest.cpp \
|
||||
../Classes/PhysicsTest/PhysicsTest.cpp \
|
||||
../Classes/RenderTextureTest/RenderTextureTest.cpp \
|
||||
../Classes/RotateWorldTest/RotateWorldTest.cpp \
|
||||
../Classes/SceneTest/SceneTest.cpp \
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
|
|||
<ClCompile Include="..\Classes\LabelTest\LabelTestNew.cpp" />
|
||||
<ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
|
||||
<ClCompile Include="..\Classes\PerformanceTest\PerformanceAllocTest.cpp" />
|
||||
<ClCompile Include="..\Classes\PhysicsTest\PhysicsTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ShaderTest\ShaderTest2.cpp" />
|
||||
<ClCompile Include="..\Classes\SpineTest\SpineTest.cpp" />
|
||||
<ClCompile Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" />
|
||||
|
|
@ -273,6 +274,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
|
|||
<ClInclude Include="..\Classes\FileUtilsTest\FileUtilsTest.h" />
|
||||
<ClInclude Include="..\Classes\LabelTest\LabelTestNew.h" />
|
||||
<ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
|
||||
<ClInclude Include="..\Classes\PhysicsTest\PhysicsTest.h" />
|
||||
<ClInclude Include="..\Classes\ShaderTest\ShaderTest2.h" />
|
||||
<ClInclude Include="..\Classes\SpineTest\SpineTest.h" />
|
||||
<ClInclude Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" />
|
||||
|
|
|
|||
|
|
@ -241,6 +241,9 @@
|
|||
<Filter Include="Classes\NewEventDispatcherTest">
|
||||
<UniqueIdentifier>{0b414789-7971-4a4c-86e3-40cc00936684}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\PhysicsTest">
|
||||
<UniqueIdentifier>{a83cb042-e3d6-4d3b-a4f6-30a4b3fcb3e9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp">
|
||||
|
|
@ -571,6 +574,9 @@
|
|||
<ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp">
|
||||
<Filter>Classes\NewEventDispatcherTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\PhysicsTest\PhysicsTest.cpp">
|
||||
<Filter>Classes\PhysicsTest</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="main.h">
|
||||
|
|
@ -1078,5 +1084,8 @@
|
|||
<ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h">
|
||||
<Filter>Classes\NewEventDispatcherTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\PhysicsTest\PhysicsTest.h">
|
||||
<Filter>Classes\PhysicsTest</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\auto-generated\lua-bindings;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\auto-generated\lua-bindings;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\extensions;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;$(ProjectDir)..\..\auto-generated\lua-bindings;$(ProjectDir)..\cocos2dx_support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;$(ProjectDir)..\..\auto-generated\lua-bindings;$(ProjectDir)..\cocos2dx_support;$(ProjectDir)..\..\external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
|
|||
Loading…
Reference in New Issue