diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp old mode 100755 new mode 100644 diff --git a/src/common/utf8.h b/src/common/utf8.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Box2D.h b/src/libraries/Box2D/Box2D.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2CircleShape.h b/src/libraries/Box2D/Collision/Shapes/b2CircleShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h b/src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp b/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h b/src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/Shapes/b2Shape.h b/src/libraries/Box2D/Collision/Shapes/b2Shape.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2BroadPhase.cpp b/src/libraries/Box2D/Collision/b2BroadPhase.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2BroadPhase.h b/src/libraries/Box2D/Collision/b2BroadPhase.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollideCircle.cpp b/src/libraries/Box2D/Collision/b2CollideCircle.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollideEdge.cpp b/src/libraries/Box2D/Collision/b2CollideEdge.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2CollidePolygon.cpp b/src/libraries/Box2D/Collision/b2CollidePolygon.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Collision.cpp b/src/libraries/Box2D/Collision/b2Collision.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Collision.h b/src/libraries/Box2D/Collision/b2Collision.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Distance.cpp b/src/libraries/Box2D/Collision/b2Distance.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2Distance.h b/src/libraries/Box2D/Collision/b2Distance.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2DynamicTree.cpp b/src/libraries/Box2D/Collision/b2DynamicTree.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2DynamicTree.h b/src/libraries/Box2D/Collision/b2DynamicTree.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2TimeOfImpact.cpp b/src/libraries/Box2D/Collision/b2TimeOfImpact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Collision/b2TimeOfImpact.h b/src/libraries/Box2D/Collision/b2TimeOfImpact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2BlockAllocator.cpp b/src/libraries/Box2D/Common/b2BlockAllocator.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2BlockAllocator.h b/src/libraries/Box2D/Common/b2BlockAllocator.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Draw.cpp b/src/libraries/Box2D/Common/b2Draw.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Draw.h b/src/libraries/Box2D/Common/b2Draw.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2GrowableStack.h b/src/libraries/Box2D/Common/b2GrowableStack.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Math.cpp b/src/libraries/Box2D/Common/b2Math.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Math.h b/src/libraries/Box2D/Common/b2Math.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Settings.cpp b/src/libraries/Box2D/Common/b2Settings.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Settings.h b/src/libraries/Box2D/Common/b2Settings.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2StackAllocator.cpp b/src/libraries/Box2D/Common/b2StackAllocator.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2StackAllocator.h b/src/libraries/Box2D/Common/b2StackAllocator.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Timer.cpp b/src/libraries/Box2D/Common/b2Timer.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Common/b2Timer.h b/src/libraries/Box2D/Common/b2Timer.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2Contact.h b/src/libraries/Box2D/Dynamics/Contacts/b2Contact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h b/src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h b/src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2Joint.h b/src/libraries/Box2D/Dynamics/Joints/b2Joint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp b/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h b/src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Body.cpp b/src/libraries/Box2D/Dynamics/b2Body.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Body.h b/src/libraries/Box2D/Dynamics/b2Body.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2ContactManager.cpp b/src/libraries/Box2D/Dynamics/b2ContactManager.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2ContactManager.h b/src/libraries/Box2D/Dynamics/b2ContactManager.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Fixture.cpp b/src/libraries/Box2D/Dynamics/b2Fixture.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Fixture.h b/src/libraries/Box2D/Dynamics/b2Fixture.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Island.cpp b/src/libraries/Box2D/Dynamics/b2Island.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2Island.h b/src/libraries/Box2D/Dynamics/b2Island.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2TimeStep.h b/src/libraries/Box2D/Dynamics/b2TimeStep.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2World.cpp b/src/libraries/Box2D/Dynamics/b2World.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2World.h b/src/libraries/Box2D/Dynamics/b2World.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp b/src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Dynamics/b2WorldCallbacks.h b/src/libraries/Box2D/Dynamics/b2WorldCallbacks.h old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Rope/b2Rope.cpp b/src/libraries/Box2D/Rope/b2Rope.cpp old mode 100755 new mode 100644 diff --git a/src/libraries/Box2D/Rope/b2Rope.h b/src/libraries/Box2D/Rope/b2Rope.h old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4.c b/src/libraries/lz4/lz4.c old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4.h b/src/libraries/lz4/lz4.h old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4hc.c b/src/libraries/lz4/lz4hc.c old mode 100755 new mode 100644 diff --git a/src/libraries/lz4/lz4hc.h b/src/libraries/lz4/lz4hc.h old mode 100755 new mode 100644 diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 6998a3a11..3d7ad1b5f 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -98,6 +98,9 @@ Graphics::Graphics() { transformStack.reserve(16); transformStack.push_back(Matrix4()); + + pixelScaleStack.reserve(16); + pixelScaleStack.push_back(1); } Graphics::~Graphics() diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index f059950a7..7c03916b5 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -294,10 +294,6 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b // Restore the graphics state. restoreState(states.back()); - pixelScaleStack.clear(); - pixelScaleStack.reserve(5); - pixelScaleStack.push_back(1); - int gammacorrect = isGammaCorrect() ? 1 : 0; // We always need a default shader. diff --git a/src/modules/math/BezierCurve.cpp b/src/modules/math/BezierCurve.cpp index 122d1d0da..eb4172c77 100644 --- a/src/modules/math/BezierCurve.cpp +++ b/src/modules/math/BezierCurve.cpp @@ -107,6 +107,9 @@ BezierCurve BezierCurve::getDerivative() const const Vector &BezierCurve::getControlPoint(int i) const { + if (controlPoints.size() == 0) + throw Exception("Curve contains no control points."); + while (i < 0) i += controlPoints.size(); @@ -118,6 +121,9 @@ const Vector &BezierCurve::getControlPoint(int i) const void BezierCurve::setControlPoint(int i, const Vector &point) { + if (controlPoints.size() == 0) + throw Exception("Curve contains no control points."); + while (i < 0) i += controlPoints.size(); @@ -129,6 +135,9 @@ void BezierCurve::setControlPoint(int i, const Vector &point) void BezierCurve::insertControlPoint(const Vector &point, int i) { + if (controlPoints.size() == 0) + i = 0; + while (i < 0) i += controlPoints.size(); @@ -140,6 +149,9 @@ void BezierCurve::insertControlPoint(const Vector &point, int i) void BezierCurve::removeControlPoint(int i) { + if (controlPoints.size() == 0) + throw Exception("No control points to remove."); + while (i < 0) i += controlPoints.size(); diff --git a/src/modules/system/System.cpp b/src/modules/system/System.cpp old mode 100755 new mode 100644 diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 1b8e24370..3a4498522 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1194,9 +1194,7 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x09, 0x63, 0x6f, 0x70, 0x79, 0x54, 0x6f, 0x43, 0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x28, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x6f, - 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x20, 0x3d, - 0x3d, 0x20, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x0a, + 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x67, 0x65, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x28, 0x29, 0x0a,