flatland-cvs Mailing List for Flatland 2D Physics Library
Status: Alpha
Brought to you by:
prideout
You can subscribe to this list here.
2005 |
Jan
|
Feb
(1) |
Mar
(20) |
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Philip R. <pri...@us...> - 2006-04-29 21:59:55
|
Update of /cvsroot/flatland/flatland/demo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23272/demo Modified Files: complex.cpp demo.cpp demo.h platform.h simple.cpp Log Message: change GetObject to GetFlatlandObject Index: demo.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/demo.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** demo.cpp 3 Jul 2005 20:00:50 -0000 1.3 --- demo.cpp 29 Apr 2006 21:59:51 -0000 1.4 *************** *** 201,205 **** { Composite::Insert(space); ! GetObject()->Rotate(theta); } --- 201,205 ---- { Composite::Insert(space); ! GetFlatlandObject()->Rotate(theta); } *************** *** 207,211 **** { Composite::InsertFront(space); ! GetObject()->Rotate(theta); } --- 207,211 ---- { Composite::InsertFront(space); ! GetFlatlandObject()->Rotate(theta); } *************** *** 747,766 **** dJointID App::Glue(Object* a, Object* b) { ! return world.Glue(*a->GetObject(), *b->GetObject()); } dJointID App::Anchor(Object* a, Object* b, vec2 p, float mu, float erp) { ! return world.Anchor(*a->GetObject(), *b->GetObject(), p, mu, erp); } dJointID App::Anchor(Object* a, vec2 p, float mu, float erp) { ! return world.Anchor(*a->GetObject(), p, mu, erp); } dJointID App::AnchorAxis(Object* a, vec2 axis) { ! return world.AnchorAxis(*a->GetObject(), axis); } --- 747,766 ---- dJointID App::Glue(Object* a, Object* b) { ! return world.Glue(*a->GetFlatlandObject(), *b->GetFlatlandObject()); } dJointID App::Anchor(Object* a, Object* b, vec2 p, float mu, float erp) { ! return world.Anchor(*a->GetFlatlandObject(), *b->GetFlatlandObject(), p, mu, erp); } dJointID App::Anchor(Object* a, vec2 p, float mu, float erp) { ! return world.Anchor(*a->GetFlatlandObject(), p, mu, erp); } dJointID App::AnchorAxis(Object* a, vec2 axis) { ! return world.AnchorAxis(*a->GetFlatlandObject(), axis); } *************** *** 785,789 **** start = end; } ! previous->GetObject()->SetCenter(end - delta / 2); } --- 785,789 ---- start = end; } ! previous->GetFlatlandObject()->SetCenter(end - delta / 2); } *************** *** 858,866 **** { arm = new Block(center, width, height); ! arm->GetObject()->SetMass(1); AppInstance.Anchor(arm, hinge); this->hinge = new Point(hinge); ! this->hinge->GetObject()->Property().collisionMask = 0; AppInstance.Anchor(this->hinge, hinge); } --- 858,866 ---- { arm = new Block(center, width, height); ! arm->GetFlatlandObject()->SetMass(1); AppInstance.Anchor(arm, hinge); this->hinge = new Point(hinge); ! this->hinge->GetFlatlandObject()->Property().collisionMask = 0; AppInstance.Anchor(this->hinge, hinge); } *************** *** 874,878 **** void Catapult::Rotate(float theta) { ! arm->GetObject()->Rotate(theta); } --- 874,878 ---- void Catapult::Rotate(float theta) { ! arm->GetFlatlandObject()->Rotate(theta); } *************** *** 880,884 **** { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[2] + vec2(offset, offset); --- 880,884 ---- { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetFlatlandObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[2] + vec2(offset, offset); *************** *** 892,896 **** { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[3] + vec2(-offset, offset); --- 892,896 ---- { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetFlatlandObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[3] + vec2(-offset, offset); *************** *** 904,908 **** { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[1] + vec2(offset, -offset); --- 904,908 ---- { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetFlatlandObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[1] + vec2(offset, -offset); *************** *** 916,920 **** { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[0] + vec2(-offset, -offset); --- 916,920 ---- { const float offset = Point::Size / 2; ! Flatland::Quad& quad = static_cast<Flatland::Quad&>(arm->GetFlatlandObject()->GetGeometry()); const vec2* corners = quad.GetCorners(); vec2 v = corners[0] + vec2(-offset, -offset); Index: demo.h =================================================================== RCS file: /cvsroot/flatland/flatland/demo/demo.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** demo.h 23 Apr 2006 17:23:50 -0000 1.4 --- demo.h 29 Apr 2006 21:59:51 -0000 1.5 *************** *** 60,64 **** virtual ~Object() {} virtual void Draw() const = 0; ! virtual Flatland::Object* GetObject() { return 0; } virtual void Insert(Space& space); virtual void InsertFront(Space& space); --- 60,64 ---- virtual ~Object() {} virtual void Draw() const = 0; ! virtual Flatland::Object* GetFlatlandObject() { return 0; } virtual void Insert(Space& space); virtual void InsertFront(Space& space); *************** *** 80,84 **** Block(vec2 center, float width, float height); void Draw() const; ! Flatland::Object* GetObject() { return &object; } private: Dynamic<Flatland::Block> object; --- 80,84 ---- Block(vec2 center, float width, float height); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } private: Dynamic<Flatland::Block> object; *************** *** 91,95 **** Wall(float left, float top, float right, float bottom); void Draw() const; ! Flatland::Object* GetObject() { return &object; } private: Static<Flatland::Block> object; --- 91,95 ---- Wall(float left, float top, float right, float bottom); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } private: Static<Flatland::Block> object; *************** *** 101,105 **** Line(vec2 a, vec2 b); void Draw() const; ! Flatland::Object* GetObject() { return &object; } private: Static<Flatland::Line> object; --- 101,105 ---- Line(vec2 a, vec2 b); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } private: Static<Flatland::Line> object; *************** *** 113,117 **** vec2 Origin() const { return object.GetGeometry().Origin(); } vec2 End() const { return object.GetGeometry().End(); } ! Flatland::Object* GetObject() { return &object; } private: Dynamic<Flatland::Line> object; --- 113,117 ---- vec2 Origin() const { return object.GetGeometry().Origin(); } vec2 End() const { return object.GetGeometry().End(); } ! Flatland::Object* GetFlatlandObject() { return &object; } private: Dynamic<Flatland::Line> object; *************** *** 143,147 **** void Insert(Space& space); void Draw() const; ! Flatland::Object* GetObject() { return &object; } Line* InsertWestBorder(Space& space) const; Line* InsertEastBorder(Space& space) const; --- 143,147 ---- void Insert(Space& space); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } Line* InsertWestBorder(Space& space) const; Line* InsertEastBorder(Space& space) const; *************** *** 159,163 **** Ball(vec2 center, float radius); void Draw() const; ! Flatland::Object* GetObject() { return &object; } private: Dynamic<Flatland::Circle> object; --- 159,163 ---- Ball(vec2 center, float radius); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } private: Dynamic<Flatland::Circle> object; *************** *** 169,173 **** Point(vec2 center); void Draw() const; ! Flatland::Object* GetObject() { return &object; } static const float Size; private: --- 169,173 ---- Point(vec2 center); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } static const float Size; private: *************** *** 181,185 **** void Draw() const; void SetTexture(Texture t) { texture = t; } ! Flatland::Object* GetObject() { return &object; } private: Dynamic<Flatland::Circle> object; --- 181,185 ---- void Draw() const; void SetTexture(Texture t) { texture = t; } ! Flatland::Object* GetFlatlandObject() { return &object; } private: Dynamic<Flatland::Circle> object; *************** *** 208,212 **** Composite(vec2 centroid); void Draw() const; ! Flatland::Object* GetObject() { return &object; } virtual void Insert(Space& space); virtual void InsertFront(Space& space); --- 208,212 ---- Composite(vec2 centroid); void Draw() const; ! Flatland::Object* GetFlatlandObject() { return &object; } virtual void Insert(Space& space); virtual void InsertFront(Space& space); Index: simple.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/simple.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** simple.cpp 23 Apr 2006 17:23:50 -0000 1.3 --- simple.cpp 29 Apr 2006 21:59:51 -0000 1.4 *************** *** 66,70 **** { Wheel* wheel = new Wheel(vec2(390, 550), 50); ! wheel->GetObject()->SetMass(5000); wheel->Property().outlineThickness = 1; wheel->Insert(space); --- 66,70 ---- { Wheel* wheel = new Wheel(vec2(390, 550), 50); ! wheel->GetFlatlandObject()->SetMass(5000); wheel->Property().outlineThickness = 1; wheel->Insert(space); Index: complex.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/complex.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** complex.cpp 3 Jul 2005 20:00:50 -0000 1.3 --- complex.cpp 29 Apr 2006 21:59:51 -0000 1.4 *************** *** 239,243 **** if (wheel) ! SetTarget(wheel->GetObject()->GetGeometry().Center() - vec2(width / 2, height * 0.75)); if (keystate[SDLK_INSERT]) --- 239,243 ---- if (wheel) ! SetTarget(wheel->GetFlatlandObject()->GetGeometry().Center() - vec2(width / 2, height * 0.75)); if (keystate[SDLK_INSERT]) *************** *** 348,352 **** void ComplexApp::boostCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetObject()) return; --- 348,352 ---- void ComplexApp::boostCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetFlatlandObject()) return; *************** *** 360,364 **** void ComplexApp::rope1Callback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetObject()) return; --- 360,364 ---- void ComplexApp::rope1Callback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetFlatlandObject()) return; *************** *** 391,395 **** void ComplexApp::cannonCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetObject() || !app.cannonAnchor) return; --- 391,395 ---- void ComplexApp::cannonCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetFlatlandObject() || !app.cannonAnchor) return; *************** *** 401,405 **** void ComplexApp::bubbleCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetObject() || !app.bubbleAnchor) return; --- 401,405 ---- void ComplexApp::bubbleCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetFlatlandObject() || !app.bubbleAnchor) return; *************** *** 407,412 **** app.bubbleAnchor = 0; ! Flatland::Object& front = *app.wheel->GetObject(); ! Flatland::Object& back = *app.wheel2->GetObject(); front.Move(); back.Move(); --- 407,412 ---- app.bubbleAnchor = 0; ! Flatland::Object& front = *app.wheel->GetFlatlandObject(); ! Flatland::Object& back = *app.wheel2->GetFlatlandObject(); front.Move(); back.Move(); *************** *** 414,425 **** vec2 end = back.GetGeometry().Center(); Beam* beam = new Beam(start, end, 2); ! beam->GetObject()->Property().collisionMask = 0; ! beam->GetObject()->SetMass(0.01); beam->Property().outlineThickness = 0; beam->Property().fillColor = Color(0.25, 0.35, 0.6, 1); beam->InsertFront(app.space); ! app.world.Anchor(*beam->GetObject(), front, start, 0, 0.01); ! app.world.Anchor(*beam->GetObject(), back, end, 0, 0.01); } --- 414,425 ---- vec2 end = back.GetGeometry().Center(); Beam* beam = new Beam(start, end, 2); ! beam->GetFlatlandObject()->Property().collisionMask = 0; ! beam->GetFlatlandObject()->SetMass(0.01); beam->Property().outlineThickness = 0; beam->Property().fillColor = Color(0.25, 0.35, 0.6, 1); beam->InsertFront(app.space); ! app.world.Anchor(*beam->GetFlatlandObject(), front, start, 0, 0.01); ! app.world.Anchor(*beam->GetFlatlandObject(), back, end, 0, 0.01); } *************** *** 427,431 **** void ComplexApp::feederCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetObject() && contacts.Other() != app.wheel2->GetObject()) return; --- 427,431 ---- void ComplexApp::feederCallback(ContactList& contacts) { ! if (contacts.Other() != app.wheel->GetFlatlandObject() && contacts.Other() != app.wheel2->GetFlatlandObject()) return; *************** *** 453,460 **** wheel = new Wheel(vec2(400, 475), radius); wheel->SetTexture(wheelTexture); ! wheel->GetObject()->Property().frictionMask = 15; ! wheel->GetObject()->Property().collisionMask = ~7; wheel->Insert(space); ! motor = world.AddMotor(*wheel->GetObject()); // Create the back wheel. --- 453,460 ---- wheel = new Wheel(vec2(400, 475), radius); wheel->SetTexture(wheelTexture); ! wheel->GetFlatlandObject()->Property().frictionMask = 15; ! wheel->GetFlatlandObject()->Property().collisionMask = ~7; wheel->Insert(space); ! motor = world.AddMotor(*wheel->GetFlatlandObject()); // Create the back wheel. *************** *** 462,468 **** vec2 center(3500, 890 - carLength); wheel2 = new Wheel(center, radius); ! wheel2->GetObject()->SetMass(0.01); ! wheel2->GetObject()->Property().frictionMask = 7; ! wheel2->GetObject()->Property().collisionMask = ~7; wheel2->SetTexture(wheelTexture); wheel2->Insert(space); --- 462,468 ---- vec2 center(3500, 890 - carLength); wheel2 = new Wheel(center, radius); ! wheel2->GetFlatlandObject()->SetMass(0.01); ! wheel2->GetFlatlandObject()->Property().frictionMask = 7; ! wheel2->GetFlatlandObject()->Property().collisionMask = ~7; wheel2->SetTexture(wheelTexture); wheel2->Insert(space); *************** *** 470,476 **** bubble->Property().outlineThickness = 3; bubble->Property().fillColor = Color(1,0,0,.1); ! bubble->GetObject()->Property().collisionMask = 4; ! bubble->GetObject()->Property().friction = dInfinity; ! bubble->GetObject()->Property().callback = bubbleCallback; bubble->Insert(space); bubbleAnchor = Glue(bubble, wheel2); --- 470,476 ---- bubble->Property().outlineThickness = 3; bubble->Property().fillColor = Color(1,0,0,.1); ! bubble->GetFlatlandObject()->Property().collisionMask = 4; ! bubble->GetFlatlandObject()->Property().friction = dInfinity; ! bubble->GetFlatlandObject()->Property().callback = bubbleCallback; bubble->Insert(space); bubbleAnchor = Glue(bubble, wheel2); *************** *** 489,493 **** t->Add(vec2(2500, 400)); t->Add(vec2(4100, 400)); ! t->GetObject()->Property().friction = dInfinity; t->Insert(space); --- 489,493 ---- t->Add(vec2(2500, 400)); t->Add(vec2(4100, 400)); ! t->GetFlatlandObject()->Property().friction = dInfinity; t->Insert(space); *************** *** 508,512 **** t->Add(vec2(4000, 890)); t->Insert(space); ! t->GetObject()->Property().collisionMask = ~3; // Hang a rope between the two previous terrains. --- 508,512 ---- t->Add(vec2(4000, 890)); t->Insert(space); ! t->GetFlatlandObject()->Property().collisionMask = ~3; // Hang a rope between the two previous terrains. *************** *** 550,556 **** tether->Add(cannonball); ! tether->GetObject()->Property().callback = cannonCallback; ! tether->GetObject()->SetMass(100); ! tether->GetObject()->Property().frictionMask = 0; Anchor(tether, start); --- 550,556 ---- tether->Add(cannonball); ! tether->GetFlatlandObject()->Property().callback = cannonCallback; ! tether->GetFlatlandObject()->SetMass(100); ! tether->GetFlatlandObject()->Property().frictionMask = 0; Anchor(tether, start); *************** *** 570,575 **** c.a = 0.9; block->Property().fillColor = c; ! block->GetObject()->SetMass(40); ! block->GetObject()->Property().frictionMask = 1 + i % 2; block->Insert(space); } --- 570,575 ---- c.a = 0.9; block->Property().fillColor = c; ! block->GetFlatlandObject()->SetMass(40); ! block->GetFlatlandObject()->Property().frictionMask = 1 + i % 2; block->Insert(space); } *************** *** 588,593 **** center += vec2(90, -50); Block* b = new Block(center, 10, 10); ! b->GetObject()->SetMass(0.5); ! b->GetObject()->Property().friction = dInfinity; b->Property().fillColor = Color::PaleYellow; b->Property().outlineColor = Color::PaleYellow; --- 588,593 ---- center += vec2(90, -50); Block* b = new Block(center, 10, 10); ! b->GetFlatlandObject()->SetMass(0.5); ! b->GetFlatlandObject()->Property().friction = dInfinity; b->Property().fillColor = Color::PaleYellow; b->Property().outlineColor = Color::PaleYellow; *************** *** 596,601 **** center.x -= 14; b = new Block(center, 10, 10); ! b->GetObject()->SetMass(0.5); ! b->GetObject()->Property().friction = dInfinity; b->Property().fillColor = Color::PaleYellow; b->Property().outlineColor = Color::PaleYellow; --- 596,601 ---- center.x -= 14; b = new Block(center, 10, 10); ! b->GetFlatlandObject()->SetMass(0.5); ! b->GetFlatlandObject()->Property().friction = dInfinity; b->Property().fillColor = Color::PaleYellow; b->Property().outlineColor = Color::PaleYellow; *************** *** 620,626 **** Wheel* w = new Wheel(end, 100); w->Insert(space); ! w->GetObject()->Property().collisionMask = 0; ! Anchor(w, w->GetObject()->GetGeometry().Center()); ! blockFeeder = world.AddMotor(*w->GetObject()); Object::Default().outlineThickness = 4; --- 620,626 ---- Wheel* w = new Wheel(end, 100); w->Insert(space); ! w->GetFlatlandObject()->Property().collisionMask = 0; ! Anchor(w, w->GetFlatlandObject()->GetGeometry().Center()); ! blockFeeder = world.AddMotor(*w->GetFlatlandObject()); Object::Default().outlineThickness = 4; *************** *** 628,632 **** // Pusher Beam* pusher = new Beam(start - vec2(length, 0), start, 50); ! pusher->GetObject()->Property().collisionMask = 8; pusher->Insert(space); AnchorAxis(pusher, vec2(1, 0)); --- 628,632 ---- // Pusher Beam* pusher = new Beam(start - vec2(length, 0), start, 50); ! pusher->GetFlatlandObject()->Property().collisionMask = 8; pusher->Insert(space); AnchorAxis(pusher, vec2(1, 0)); *************** *** 636,640 **** Beam* transmission = new Beam(start, end, 20); transmission->Insert(space); ! transmission->GetObject()->Property().collisionMask = 0; Anchor(transmission, w, end); Anchor(transmission, pusher, start); --- 636,640 ---- Beam* transmission = new Beam(start, end, 20); transmission->Insert(space); ! transmission->GetFlatlandObject()->Property().collisionMask = 0; Anchor(transmission, w, end); Anchor(transmission, pusher, start); *************** *** 667,674 **** Flatland::Object::PopProperties(); ! buffer6->GetObject()->Property().callback = feederCallback; Line* l = new Line(vec2(4000, 890), vec2(4000, 1640)); ! l->GetObject()->Property().frictionMask = 2; l->Insert(space); } --- 667,674 ---- Flatland::Object::PopProperties(); ! buffer6->GetFlatlandObject()->Property().callback = feederCallback; Line* l = new Line(vec2(4000, 890), vec2(4000, 1640)); ! l->GetFlatlandObject()->Property().frictionMask = 2; l->Insert(space); } *************** *** 695,700 **** b->Property().fillColor = Color::Black; b->Insert(space); ! b->GetObject()->Property().friction = dInfinity; ! squareWheelMotor = world.AddMotor(*b->GetObject()); // West block --- 695,700 ---- b->Property().fillColor = Color::Black; b->Insert(space); ! b->GetFlatlandObject()->Property().friction = dInfinity; ! squareWheelMotor = world.AddMotor(*b->GetFlatlandObject()); // West block *************** *** 758,764 **** t->Add(vec2(4100, 0)); t->Add(vec2(5000, 0)); ! t->GetObject()->Property().friction = dInfinity; ! t->GetObject()->Property().collisionMask = ~8; ! t->GetObject()->Property().frictionMask = 4; t->Insert(space); --- 758,764 ---- t->Add(vec2(4100, 0)); t->Add(vec2(5000, 0)); ! t->GetFlatlandObject()->Property().friction = dInfinity; ! t->GetFlatlandObject()->Property().collisionMask = ~8; ! t->GetFlatlandObject()->Property().frictionMask = 4; t->Insert(space); *************** *** 774,779 **** // Speed boost Point* boost = new Point(vec2(1000 + 32, 3425 + 32)); ! boost->GetObject()->Property().callback = boostCallback; ! boost->GetObject()->Property().collisionMask = 0; boost->Insert(space); Anchor(boost, vec2(1000 + 32, 3425 + 32)); --- 774,779 ---- // Speed boost Point* boost = new Point(vec2(1000 + 32, 3425 + 32)); ! boost->GetFlatlandObject()->Property().callback = boostCallback; ! boost->GetFlatlandObject()->Property().collisionMask = 0; boost->Insert(space); Anchor(boost, vec2(1000 + 32, 3425 + 32)); Index: platform.h =================================================================== RCS file: /cvsroot/flatland/flatland/demo/platform.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** platform.h 3 Jul 2005 20:00:50 -0000 1.3 --- platform.h 29 Apr 2006 21:59:51 -0000 1.4 *************** *** 18,22 **** #include <GL/wglext.h> void fatalf(const char* format, ...); - #undef GetObject #undef min --- 18,21 ---- |
From: Philip R. <pri...@us...> - 2006-04-29 21:59:55
|
Update of /cvsroot/flatland/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23272/flatland Modified Files: flatland.h Log Message: change GetObject to GetFlatlandObject Index: flatland.h =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/flatland.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** flatland.h 23 Apr 2006 17:23:50 -0000 1.4 --- flatland.h 29 Apr 2006 21:59:52 -0000 1.5 *************** *** 195,199 **** /// - Container::begin() /// - Container::end() ! /// The objects in the container must have a GetObject() method. template<class Container> void World::GenerateContacts(const Container& space) --- 195,199 ---- /// - Container::begin() /// - Container::end() ! /// The objects in the container must have a GetFlatlandObject() method. template<class Container> void World::GenerateContacts(const Container& space) *************** *** 204,208 **** for (o1 = space.begin(); o1 != space.end(); ++o1) { ! Object* object1 = (*o1)->GetObject(); if (!object1) continue; --- 204,208 ---- for (o1 = space.begin(); o1 != space.end(); ++o1) { ! Object* object1 = (*o1)->GetFlatlandObject(); if (!object1) continue; *************** *** 211,215 **** for (++o2; o2 != space.end(); ++o2) { ! Object* object2 = (*o2)->GetObject(); if (!object2) continue; --- 211,215 ---- for (++o2; o2 != space.end(); ++o2) { ! Object* object2 = (*o2)->GetFlatlandObject(); if (!object2) continue; *************** *** 248,252 **** /// - Container::begin() /// - Container::end() ! /// The objects in the container must have a GetObject() method. template<class Container> bool World::IsCorrupt(const Container& space) const --- 248,252 ---- /// - Container::begin() /// - Container::end() ! /// The objects in the container must have a GetFlatlandObject() method. template<class Container> bool World::IsCorrupt(const Container& space) const *************** *** 255,259 **** for (o = space.begin(); o != space.end(); ++o) { ! Object* object = (*o)->GetObject(); if (!object) continue; --- 255,259 ---- for (o = space.begin(); o != space.end(); ++o) { ! Object* object = (*o)->GetFlatlandObject(); if (!object) continue; |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/installer Modified Files: flatland.nsi Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flatland.nsi 3 Jul 2005 21:07:34 -0000 1.10 --- flatland.nsi 23 Apr 2006 17:23:50 -0000 1.11 *************** *** 17,20 **** --- 17,21 ---- ; Note that the exe is i386 win32 and the zip is a platform-independent "source" zip. ; 11. putty shell.sf.net and add a news item to html\index.html. + ; 12. Add a news item to the project page. ; |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/flatland Modified Files: aabb.h flatland.cpp flatland.h Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: aabb.h =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/aabb.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aabb.h 27 Feb 2005 22:16:32 -0000 1.2 --- aabb.h 23 Apr 2006 17:23:50 -0000 1.3 *************** *** 1,5 **** // $Header$ // Summary: Define a small class for 2D axis-aligned bounding boxes. ! // Copyright: 2005 Philip Rideout. All rights reserved. // License: see bsd-license.txt #pragma once --- 1,7 ---- // $Header$ // Summary: Define a small class for 2D axis-aligned bounding boxes. ! // Copyright: 2005 Philip Rideout. All rights reserved. ! // License: see bsd-license.txt ! #pragma once Index: flatland.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/flatland.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flatland.cpp 27 Feb 2005 22:16:32 -0000 1.2 --- flatland.cpp 23 Apr 2006 17:23:50 -0000 1.3 *************** *** 49,53 **** { // TODO this assumes that there was no previous rotation ! const float degreesToRadians = atan(1) / 45; dMatrix3 R; dRFromAxisAndAngle(R, 0, 0, 1, theta * degreesToRadians); --- 49,53 ---- { // TODO this assumes that there was no previous rotation ! const float degreesToRadians = atan(1.0f) / 45; dMatrix3 R; dRFromAxisAndAngle(R, 0, 0, 1, theta * degreesToRadians); Index: flatland.h =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/flatland.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** flatland.h 3 Jul 2005 20:00:50 -0000 1.3 --- flatland.h 23 Apr 2006 17:23:50 -0000 1.4 *************** *** 5,10 **** #pragma once ! #include <ode/common.h> ! #include <ode/contact.h> #include <flatland/aabb.h> #include <flatland/vector.h> --- 5,10 ---- #pragma once ! #include <ode/ode.h> ! #include <ode/src/objects.h> #include <flatland/aabb.h> #include <flatland/vector.h> *************** *** 76,79 **** --- 76,80 ---- public: Object(); + virtual ~Object() {} virtual Geometry& GetGeometry() = 0; virtual const Geometry& GetGeometry() const = 0; *************** *** 267,274 **** if (is_nan(lvel[0])) return true; if (is_nan(lvel[1])) return true; - if (is_nan(lvel[2])) return true; if (is_nan(avel[0])) return true; if (is_nan(avel[1])) return true; - if (is_nan(avel[2])) return true; } return false; --- 268,273 ---- |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/build/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/build/VisualStudio Modified Files: complex-demo.vcproj flatland.sln flatland.vcproj resource.h simple-demo.vcproj Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: flatland.sln =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/flatland.sln,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** flatland.sln 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- flatland.sln 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,35 **** ! Microsoft Visual Studio Solution File, Format Version 7.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex-demo", "complex-demo.vcproj", "{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-demo", "simple-demo.vcproj", "{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatland", "flatland.vcproj", "{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! ConfigName.0 = Debug ! ConfigName.1 = Release ! EndGlobalSection ! GlobalSection(ProjectDependencies) = postSolution ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.0 = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.0 = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug.ActiveCfg = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug.Build.0 = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release.ActiveCfg = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release.Build.0 = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug.ActiveCfg = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug.Build.0 = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release.ActiveCfg = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release.Build.0 = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug.ActiveCfg = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug.Build.0 = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release.ActiveCfg = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal --- 1,37 ---- ! Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex-demo", "complex-demo.vcproj", "{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! ProjectSection(ProjectDependencies) = postProject ! {885D23A9-8136-4E65-BC65-436A6D63DFE4} = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-demo", "simple-demo.vcproj", "{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! ProjectSection(ProjectDependencies) = postProject ! {885D23A9-8136-4E65-BC65-436A6D63DFE4} = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatland", "flatland.vcproj", "{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! EndProject ! Global ! GlobalSection(SolutionConfigurationPlatforms) = preSolution ! Debug|Win32 = Debug|Win32 ! Release|Win32 = Release|Win32 ! EndGlobalSection ! GlobalSection(ProjectConfigurationPlatforms) = postSolution ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug|Win32.ActiveCfg = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug|Win32.Build.0 = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release|Win32.ActiveCfg = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release|Win32.Build.0 = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug|Win32.ActiveCfg = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug|Win32.Build.0 = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release|Win32.ActiveCfg = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release|Win32.Build.0 = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug|Win32.ActiveCfg = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug|Win32.Build.0 = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release|Win32.ActiveCfg = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release|Win32.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(SolutionProperties) = preSolution ! HideSolutionNode = FALSE ! EndGlobalSection ! EndGlobal Index: simple-demo.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/simple-demo.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** simple-demo.vcproj 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- simple-demo.vcproj 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,141 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="simple-demo" ! ProjectGUID="{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="SimpleDebug" ! IntermediateDirectory="SimpleDebug" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="TRUE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="5" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(OutDir)/simple-demo.pdb" ! SubSystem="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="SimpleRelease" ! IntermediateDirectory="SimpleRelease" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="TRUE" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="TRUE" ! RuntimeLibrary="4" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="FALSE" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> ! <File ! RelativePath="..\..\demo\demo.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\simple.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc"> ! <File ! RelativePath="..\..\demo\demo.h"> ! </File> ! <File ! RelativePath="..\..\demo\platform.h"> ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> ! <File ! RelativePath="demo.rc"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,228 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="simple-demo" ! ProjectGUID="{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="SimpleDebug" ! IntermediateDirectory="SimpleDebug" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/simple-demo.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="SimpleRelease" ! IntermediateDirectory="SimpleRelease" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="false" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\demo\demo.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\simple.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\demo\demo.h" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath="demo.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: flatland.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/flatland.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** flatland.vcproj 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- flatland.vcproj 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,220 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="flatland" ! ProjectGUID="{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="4" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB" ! MinimalRebuild="TRUE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="5" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="4" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="TRUE" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" ! StringPooling="TRUE" ! RuntimeLibrary="4" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> ! <File ! RelativePath="..\..\flatland\circle-circle.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\composite-all.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\flatland.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\intersection.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\quad-circle.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\quad-quad.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\shapes.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\terrain-all.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\vector.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc"> ! <File ! RelativePath="..\..\flatland\aabb.h"> ! </File> ! <File ! RelativePath="..\..\flatland\enums.h"> ! </File> ! <File ! RelativePath="..\..\flatland\flatland.h"> ! </File> ! <File ! RelativePath="..\..\flatland\intersection.h"> ! </File> ! <File ! RelativePath="..\..\flatland\shapes.h"> ! </File> ! <File ! RelativePath="..\..\flatland\vector.h"> ! </File> ! </Filter> ! <Filter ! Name="ode" ! Filter=""> ! <File ! RelativePath="..\..\ode\src\array.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\error.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastdot.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastldlt.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastlsolve.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastltsolve.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\joint.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\lcp.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\mass.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\mat.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\matrix.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\memory.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\misc.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\obstack.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\ode.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\odemath.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\quickstep.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\rotation.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\step.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\stepfast.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\testing.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\timer.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\util.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,324 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="flatland" ! ProjectGUID="{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="4" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="4" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\flatland\circle-circle.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\composite-all.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\flatland.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\intersection.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\quad-circle.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\quad-quad.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\shapes.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\terrain-all.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\vector.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\flatland\aabb.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\enums.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\flatland.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\intersection.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\shapes.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\vector.h" ! > ! </File> ! </Filter> ! <Filter ! Name="ode" ! > ! <File ! RelativePath="..\..\ode\src\array.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\error.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastdot.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastldlt.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastlsolve.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastltsolve.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\joint.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\lcp.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\mass.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\mat.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\matrix.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\memory.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\misc.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\obstack.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\ode.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\odemath.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\quickstep.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\rotation.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\step.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\stepfast.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\testing.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\timer.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\util.cpp" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: resource.h =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/resource.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** resource.h 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- resource.h 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,17 **** ! //{{NO_DEPENDENCIES}} ! // Microsoft Visual C++ generated include file. ! // Used by complex-demo.rc ! // ! #define IDI_BIG 101 ! #define IDI_SMALL 102 ! ! // Next default values for new objects ! // ! #ifdef APSTUDIO_INVOKED ! #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 103 ! #define _APS_NEXT_COMMAND_VALUE 40001 ! #define _APS_NEXT_CONTROL_VALUE 1001 ! #define _APS_NEXT_SYMED_VALUE 101 ! #endif ! #endif --- 1,34 ---- ! //{{NO_DEPENDENCIES}} ! ! // Microsoft Visual C++ generated include file. ! ! // Used by complex-demo.rc ! ! // ! ! #define IDI_BIG 101 ! ! #define IDI_SMALL 102 ! ! ! ! // Next default values for new objects ! ! // ! ! #ifdef APSTUDIO_INVOKED ! ! #ifndef APSTUDIO_READONLY_SYMBOLS ! ! #define _APS_NEXT_RESOURCE_VALUE 103 ! ! #define _APS_NEXT_COMMAND_VALUE 40001 ! ! #define _APS_NEXT_CONTROL_VALUE 1001 ! ! #define _APS_NEXT_SYMED_VALUE 101 ! ! #endif ! ! #endif ! Index: complex-demo.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/complex-demo.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** complex-demo.vcproj 3 Jul 2005 20:00:49 -0000 1.2 --- complex-demo.vcproj 23 Apr 2006 17:23:50 -0000 1.3 *************** *** 1 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="complex-demo" ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="ComplexDebug" IntermediateDirectory="ComplexDebug" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="ComplexRelease" IntermediateDirectory="ComplexRelease" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="0" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="1" GenerateDebugInformation="FALSE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> <File RelativePath="..\..\demo\complex.cpp"> </File> <File RelativePath="..\..\demo\demo.cpp"> </File> <File RelativePath="..\..\demo\platform.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc"> <File RelativePath="..\..\demo\demo.h"> </File> <File RelativePath="..\..\demo\platform.h"> </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> <File RelativePath="demo.rc"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> \ No newline at end of file --- 1,228 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="complex-demo" ! ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="ComplexDebug" ! IntermediateDirectory="ComplexDebug" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="ComplexRelease" ! IntermediateDirectory="ComplexRelease" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="false" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\demo\complex.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\demo.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\demo\demo.h" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath="demo.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296 Modified Files: readme.html Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: readme.html =================================================================== RCS file: /cvsroot/flatland/flatland/readme.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** readme.html 3 Jul 2005 21:08:46 -0000 1.5 --- readme.html 23 Apr 2006 17:23:50 -0000 1.6 *************** *** 20,29 **** <h1 id="build">Build Instructions</h1> ! <h2>Windows (Visual Studio 2002 or later)</h2> <pre> 1) Install SDL (Simple DirectMedia Layer) from libsdl.org 2) Make sure Visual Studio knows where SDL lives by going to: ! Tools | Options, Projects | Directories, Include Files and Library Files 3) Make sure the SDL.dll is accessible by doing one of these: --- 20,29 ---- <h1 id="build">Build Instructions</h1> ! <h2>Windows (Visual Studio 2005)</h2> <pre> 1) Install SDL (Simple DirectMedia Layer) from libsdl.org 2) Make sure Visual Studio knows where SDL lives by going to: ! Tools | Options, Projects and Solutions | VC++ Directories, Include Files and Library Files 3) Make sure the SDL.dll is accessible by doing one of these: *************** *** 32,39 **** c) copy SDL.dll into build\Visual Studio ! 3) Open up build\Visual Studio\flatland.sln. If you have a version of VStudio ! newer than 2002, it'll ask if it's okay to convert. Say yes. ! 4) Press Ctrl+Shift+B to build. Then press F5 to run the demo! </pre> --- 32,40 ---- c) copy SDL.dll into build\Visual Studio ! 4) Add wglext.h to your GL folder. You can get wglext.h from the <a href="http://oss.sgi.com/projects/ogl-sample/registry/">SGI website</a>. Your GL folder is probably <b>Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\Include\gl</b> ! 5) Open up build\Visual Studio\flatland.sln. ! ! 6) Press Ctrl+Shift+B to build. Then press F5 to run the demo! </pre> |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/ode/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/ode/src Modified Files: quickstep.cpp Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: quickstep.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/ode/src/quickstep.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** quickstep.cpp 26 Feb 2005 19:26:48 -0000 1.1.1.1 --- quickstep.cpp 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 92,100 **** int b2 = jb[i*2+1]; dReal k = body[b1]->invMass; ! for (j=0; j<3; j++) iMJ_ptr[j] = k*J_ptr[j]; dMULTIPLY0_331 (iMJ_ptr + 3, invI + 12*b1, J_ptr + 3); if (b2 >= 0) { k = body[b2]->invMass; ! for (j=0; j<3; j++) iMJ_ptr[j+6] = k*J_ptr[j+6]; dMULTIPLY0_331 (iMJ_ptr + 9, invI + 12*b2, J_ptr + 9); } --- 92,100 ---- int b2 = jb[i*2+1]; dReal k = body[b1]->invMass; ! for (j=0; j<3; j++) iMJ_ptr[j] = k*J_ptr[j]; // Philip dMULTIPLY0_331 (iMJ_ptr + 3, invI + 12*b1, J_ptr + 3); if (b2 >= 0) { k = body[b2]->invMass; ! for (j=0; j<3; j++) iMJ_ptr[j+6] = k*J_ptr[j+6]; // Philip dMULTIPLY0_331 (iMJ_ptr + 9, invI + 12*b2, J_ptr + 9); } *************** *** 166,277 **** //*************************************************************************** - // conjugate gradient method with jacobi preconditioner - // THIS IS EXPERIMENTAL CODE that doesn't work too well, so it is ifdefed out. - // - // adding CFM seems to be critically important to this method. - - #if 0 - - static inline dReal dot (int n, dRealPtr x, dRealPtr y) - { - dReal sum=0; - for (int i=0; i<n; i++) sum += x[i]*y[i]; - return sum; - } - - - // x = y + z*alpha - - static inline void add (int n, dRealMutablePtr x, dRealPtr y, dRealPtr z, dReal alpha) - { - for (int i=0; i<n; i++) x[i] = y[i] + z[i]*alpha; - } - - - static void CG_LCP (int m, int nb, dRealMutablePtr J, int *jb, dxBody * const *body, - dRealPtr invI, dRealMutablePtr lambda, dRealMutablePtr fc, dRealMutablePtr b, - dRealMutablePtr lo, dRealMutablePtr hi, dRealPtr cfm, int *findex, - dxQuickStepParameters *qs) - { - int i,j; - const int num_iterations = qs->num_iterations; - - // precompute iMJ = inv(M)*J' - dRealAllocaArray (iMJ,m*12); - compute_invM_JT (m,J,iMJ,jb,body,invI); - - dReal last_rho = 0; - dRealAllocaArray (r,m); - dRealAllocaArray (z,m); - dRealAllocaArray (p,m); - dRealAllocaArray (q,m); - - // precompute 1 / diagonals of A - dRealAllocaArray (Ad,m); - dRealPtr iMJ_ptr = iMJ; - dRealPtr J_ptr = J; - for (i=0; i<m; i++) { - dReal sum = 0; - for (j=0; j<6; j++) sum += iMJ_ptr[j] * J_ptr[j]; - if (jb[i*2+1] >= 0) { - for (j=6; j<12; j++) sum += iMJ_ptr[j] * J_ptr[j]; - } - iMJ_ptr += 12; - J_ptr += 12; - Ad[i] = REAL(1.0) / (sum + cfm[i]); - } - - #ifdef WARM_STARTING - // compute residual r = b - A*lambda - multiply_J_invM_JT (m,nb,J,iMJ,jb,cfm,fc,lambda,r); - for (i=0; i<m; i++) r[i] = b[i] - r[i]; - #else - dSetZero (lambda,m); - memcpy (r,b,m*sizeof(dReal)); // residual r = b - A*lambda - #endif - - for (int iteration=0; iteration < num_iterations; iteration++) { - for (i=0; i<m; i++) z[i] = r[i]*Ad[i]; // z = inv(M)*r - dReal rho = dot (m,r,z); // rho = r'*z - - // @@@ - // we must check for convergence, otherwise rho will go to 0 if - // we get an exact solution, which will introduce NaNs into the equations. - if (rho < 1e-10) { - printf ("CG returned at iteration %d\n",iteration); - break; - } - - if (iteration==0) { - memcpy (p,z,m*sizeof(dReal)); // p = z - } - else { - add (m,p,z,p,rho/last_rho); // p = z + (rho/last_rho)*p - } - - // compute q = (J*inv(M)*J')*p - multiply_J_invM_JT (m,nb,J,iMJ,jb,cfm,fc,p,q); - - dReal alpha = rho/dot (m,p,q); // alpha = rho/(p'*q) - add (m,lambda,lambda,p,alpha); // lambda = lambda + alpha*p - add (m,r,r,q,-alpha); // r = r - alpha*q - last_rho = rho; - } - - // compute fc = inv(M)*J'*lambda - multiply_invM_JT (m,nb,iMJ,jb,lambda,fc); - - #if 0 - // measure solution error - multiply_J_invM_JT (m,nb,J,iMJ,jb,cfm,fc,lambda,r); - dReal error = 0; - for (i=0; i<m; i++) error += dFabs(r[i] - b[i]); - printf ("lambda error = %10.6e\n",error); - #endif - } - - #endif - - //*************************************************************************** // SOR-LCP method --- 166,169 ---- *************** *** 562,566 **** body[i]->facc[0] += body[i]->mass.mass * world->gravity[0]; body[i]->facc[1] += body[i]->mass.mass * world->gravity[1]; ! body[i]->facc[2] += body[i]->mass.mass * world->gravity[2]; } } --- 454,459 ---- body[i]->facc[0] += body[i]->mass.mass * world->gravity[0]; body[i]->facc[1] += body[i]->mass.mass * world->gravity[1]; ! //body[i]->facc[2] += body[i]->mass.mass * world->gravity[2]; // Philip ! body[i]->facc[2] = 0; } } *************** *** 663,669 **** for (i=0; i<nb; i++) { dReal body_invMass = body[i]->invMass; ! for (j=0; j<3; j++) tmp1[i*6+j] = body[i]->facc[j] * body_invMass + body[i]->lvel[j] * stepsize1; dMULTIPLY0_331 (tmp1 + i*6 + 3,invI + i*12,body[i]->tacc); ! for (j=0; j<3; j++) tmp1[i*6+3+j] += body[i]->avel[j] * stepsize1; } --- 556,562 ---- for (i=0; i<nb; i++) { dReal body_invMass = body[i]->invMass; ! for (j=0; j<3; j++) tmp1[i*6+j] = body[i]->facc[j] * body_invMass + body[i]->lvel[j] * stepsize1; // Philip dMULTIPLY0_331 (tmp1 + i*6 + 3,invI + i*12,body[i]->tacc); ! for (j=0; j<3; j++) tmp1[i*6+3+j] += body[i]->avel[j] * stepsize1; // Philip } *************** *** 706,711 **** // add stepsize * cforce to the body velocity for (i=0; i<nb; i++) { ! for (j=0; j<3; j++) body[i]->lvel[j] += stepsize * cforce[i*6+j]; ! for (j=0; j<3; j++) body[i]->avel[j] += stepsize * cforce[i*6+3+j]; } --- 599,604 ---- // add stepsize * cforce to the body velocity for (i=0; i<nb; i++) { ! for (j=0; j<3; j++) body[i]->lvel[j] += stepsize * cforce[i*6+j]; // Philip ! for (j=0; j<3; j++) body[i]->avel[j] += stepsize * cforce[i*6+3+j]; // Philip } *************** *** 722,731 **** cforce [i*6+0] *= k; cforce [i*6+1] *= k; ! cforce [i*6+2] *= k; dVector3 tmp; dMULTIPLY0_331 (tmp, I + 12*i, cforce + i*6 + 3); cforce [i*6+3] = tmp[0]; cforce [i*6+4] = tmp[1]; ! cforce [i*6+5] = tmp[2]; } // compute feedback for this and all remaining joints --- 615,626 ---- cforce [i*6+0] *= k; cforce [i*6+1] *= k; ! //cforce [i*6+2] *= k; // Philip ! cforce [i*6+2] *= 0; dVector3 tmp; dMULTIPLY0_331 (tmp, I + 12*i, cforce + i*6 + 3); cforce [i*6+3] = tmp[0]; cforce [i*6+4] = tmp[1]; ! //cforce [i*6+5] = tmp[2]; // Philip ! cforce [i*6+5] = 0; // Philip } // compute feedback for this and all remaining joints *************** *** 753,775 **** for (i=0; i<nb; i++) { dReal body_invMass = body[i]->invMass; ! for (j=0; j<3; j++) body[i]->lvel[j] += stepsize * body_invMass * body[i]->facc[j]; ! for (j=0; j<3; j++) body[i]->tacc[j] *= stepsize; dMULTIPLYADD0_331 (body[i]->avel,invI + i*12,body[i]->tacc); } - #if 0 - // check that the updated velocity obeys the constraint (this check needs unmodified J) - dRealAllocaArray (vel,nb*6); - for (i=0; i<nb; i++) { - for (j=0; j<3; j++) vel[i*6+j] = body[i]->lvel[j]; - for (j=0; j<3; j++) vel[i*6+3+j] = body[i]->avel[j]; - } - dRealAllocaArray (tmp,m); - multiply_J (m,J,jb,vel,tmp); - dReal error = 0; - for (i=0; i<m; i++) error += dFabs(tmp[i]); - printf ("velocity error = %10.6e\n",error); - #endif - // update the position and orientation from the new linear/angular velocity // (over the given timestep) --- 648,656 ---- for (i=0; i<nb; i++) { dReal body_invMass = body[i]->invMass; ! for (j=0; j<3; j++) body[i]->lvel[j] += stepsize * body_invMass * body[i]->facc[j]; // Philip ! for (j=0; j<3; j++) body[i]->tacc[j] *= stepsize; // Philip dMULTIPLYADD0_331 (body[i]->avel,invI + i*12,body[i]->tacc); } // update the position and orientation from the new linear/angular velocity // (over the given timestep) *************** *** 781,786 **** // zero all force accumulators for (i=0; i<nb; i++) { ! dSetZero (body[i]->facc,3); ! dSetZero (body[i]->tacc,3); } --- 662,667 ---- // zero all force accumulators for (i=0; i<nb; i++) { ! dSetZero (body[i]->facc,3); // Philip ! dSetZero (body[i]->tacc,3); // Philip } |
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/demo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/demo Modified Files: demo.h simple.cpp Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: demo.h =================================================================== RCS file: /cvsroot/flatland/flatland/demo/demo.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** demo.h 7 Mar 2005 00:27:36 -0000 1.3 --- demo.h 23 Apr 2006 17:23:50 -0000 1.4 *************** *** 58,61 **** --- 58,62 ---- public: Object() : properties(defaults) {} + virtual ~Object() {} virtual void Draw() const = 0; virtual Flatland::Object* GetObject() { return 0; } Index: simple.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/simple.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** simple.cpp 6 Mar 2005 14:48:05 -0000 1.2 --- simple.cpp 23 Apr 2006 17:23:50 -0000 1.3 *************** *** 1,5 **** // $Header$ // Summary: Very simple demo program for flatland. ! // Copyright: 2005 Philip Rideout. All rights reserved. // License: see bsd-license.txt #include <ode/ode.h> #include <SDL.h> --- 1,7 ---- // $Header$ // Summary: Very simple demo program for flatland. ! // Copyright: 2005 Philip Rideout. All rights reserved. ! // License: see bsd-license.txt ! #include <ode/ode.h> #include <SDL.h> |
From: Philip R. <pri...@us...> - 2005-07-03 21:09:16
|
Update of /cvsroot/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31256 Modified Files: readme.html Log Message: Index: readme.html =================================================================== RCS file: /cvsroot/flatland/flatland/readme.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme.html 3 Jul 2005 20:00:51 -0000 1.4 --- readme.html 3 Jul 2005 21:08:46 -0000 1.5 *************** *** 49,52 **** --- 49,53 ---- Search for "TODO" and fix up all those spots. Provide a win32 makefile for people who use Microsoft's free vc compiler, and write build instructions. + Installer should include a shortcut for the Flatland home page. Optimize line collisions. Add debug code for detection of non-quiescence and disabling, useful for performance tuning. |
From: Philip R. <pri...@us...> - 2005-07-03 21:07:43
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30531 Modified Files: flatland.nsi Log Message: Added notes to the release procedure. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** flatland.nsi 3 Jul 2005 20:38:16 -0000 1.9 --- flatland.nsi 3 Jul 2005 21:07:34 -0000 1.10 *************** *** 12,16 **** ; 8. make a zip called flatland-v0-0.zip ; 9. Run installer\make.bat ! ; 10. Add the zip and the exe to the released files on the SourceForge projects page. ; 11. putty shell.sf.net and add a news item to html\index.html. ; --- 12,19 ---- ; 8. make a zip called flatland-v0-0.zip ; 9. Run installer\make.bat ! ; 10. FTP upload.sf.net using anonymous. ! ; Use "bin" and "cd incoming" and "put <filename>" for the zip and the exe. ! ; Go to the project page, Admin, File Releases and create a new release called "v0-0" with these two files. ! ; Note that the exe is i386 win32 and the zip is a platform-independent "source" zip. ; 11. putty shell.sf.net and add a news item to html\index.html. ; |
From: Philip R. <pri...@us...> - 2005-07-03 20:38:27
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14239/installer Modified Files: flatland.nsi Log Message: fix shortcut icons Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** flatland.nsi 3 Jul 2005 20:16:57 -0000 1.8 --- flatland.nsi 3 Jul 2005 20:38:16 -0000 1.9 *************** *** 51,56 **** ; link.lnk target.file [parameters [icon.file [icon_index_number [start_options [keyboard_shortcut [description]]]]]] ! CreateShortCut "$SMPROGRAMS\Flatland\Complex Demo.lnk" "$INSTDIR\bin\win32\complex-demo.exe" "" "$INSTDIR\complex-demo.exe" ! CreateShortCut "$SMPROGRAMS\Flatland\Simple Demo.lnk" "$INSTDIR\bin\win32\simple-demo.exe" "" "$INSTDIR\simple-demo.exe" CreateShortCut "$SMPROGRAMS\Flatland\Flatland Solution.lnk" "$INSTDIR\build\VisualStudio\flatland.sln" "" "$INSTDIR\build\VisualStudio\flatland.sln" CreateShortCut "$SMPROGRAMS\Flatland\Program Folder.lnk" "$INSTDIR" "" "" --- 51,56 ---- ; link.lnk target.file [parameters [icon.file [icon_index_number [start_options [keyboard_shortcut [description]]]]]] ! CreateShortCut "$SMPROGRAMS\Flatland\Complex Demo.lnk" "$INSTDIR\bin\win32\complex-demo.exe" "" ! CreateShortCut "$SMPROGRAMS\Flatland\Simple Demo.lnk" "$INSTDIR\bin\win32\simple-demo.exe" "" CreateShortCut "$SMPROGRAMS\Flatland\Flatland Solution.lnk" "$INSTDIR\build\VisualStudio\flatland.sln" "" "$INSTDIR\build\VisualStudio\flatland.sln" CreateShortCut "$SMPROGRAMS\Flatland\Program Folder.lnk" "$INSTDIR" "" "" |
From: Philip R. <pri...@us...> - 2005-07-03 20:17:07
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2969/installer Modified Files: flatland.nsi Log Message: v1-3 Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** flatland.nsi 7 Mar 2005 05:32:24 -0000 1.7 --- flatland.nsi 3 Jul 2005 20:16:57 -0000 1.8 *************** *** 2,5 **** --- 2,6 ---- ; Release procedure: ; + ; 0. Build Release and copy the executables into "bin\win32". ; 1. Modify readme.html appropriately. ; 2. cvs commit |
From: Philip R. <pri...@us...> - 2005-07-03 20:17:07
|
Update of /cvsroot/flatland/flatland/bin/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2969/bin/win32 Modified Files: complex-demo.exe simple-demo.exe Log Message: v1-3 Index: complex-demo.exe =================================================================== RCS file: /cvsroot/flatland/flatland/bin/win32/complex-demo.exe,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsLQOSa8 and /tmp/cvsgjtuOV differ Index: simple-demo.exe =================================================================== RCS file: /cvsroot/flatland/flatland/bin/win32/simple-demo.exe,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6Nnks8 and /tmp/cvsSemQ9V differ |
From: Philip R. <pri...@us...> - 2005-07-03 20:00:59
|
Update of /cvsroot/flatland/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27049/flatland Modified Files: flatland.h quad-circle.cpp vector.cpp vector.h Added Files: bsd-license.txt Removed Files: license-bsd.txt Log Message: Nuked dependency on GLU. Fixed spelling error "Southernmost" in complex.cpp. Added World::IsCorrupt() method for detecting singularities. Fixed a singularity that was sometimes seen with the catapult. Renamed license-bsd.txt to bsd-license.txt. Fixed aliasing in wheel spokes in complex-demo by using linear filtering. Index: quad-circle.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/quad-circle.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** quad-circle.cpp 27 Feb 2005 22:16:32 -0000 1.2 --- quad-circle.cpp 3 Jul 2005 20:00:51 -0000 1.3 *************** *** 97,105 **** qq.y = dot(t, b); r = p - qq; ! float depth = c.Radius() - r.length(); if (depth < 0) return; ! r.normalize(); contacts.AddContact(qq + q.Center(), -r, depth); } --- 97,111 ---- qq.y = dot(t, b); r = p - qq; ! ! float distance = r.length(); ! float depth = c.Radius() - distance; if (depth < 0) return; ! if (distance) ! r.normalize(); ! else ! r = vec2(1, 0); ! contacts.AddContact(qq + q.Center(), -r, depth); } Index: vector.h =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/vector.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vector.h 27 Feb 2005 22:16:32 -0000 1.2 --- vector.h 3 Jul 2005 20:00:51 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- { const float pi = 3.1415926535897932384626433832795; + bool is_nan(float f); struct vec2; Index: flatland.h =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/flatland.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flatland.h 27 Feb 2005 05:04:57 -0000 1.2 --- flatland.h 3 Jul 2005 20:00:50 -0000 1.3 *************** *** 160,163 **** --- 160,164 ---- Body BodyCreate(); template<class S> void GenerateContacts(const S& space); + template<class S> bool IsCorrupt(const S& space) const; int ContactCount() const { return contactCount; } void SetCFM(float); *************** *** 238,241 **** --- 239,279 ---- } + /// Corruption detection in a scene. + // + /// IsCorrupt is a template function that takes any object that acts + /// like an STL container of pointers. + /// The given container does not need to be an actual STL container; it only needs to have these properties: + /// - Container::const_iterator + /// - Container::begin() + /// - Container::end() + /// The objects in the container must have a GetObject() method. + template<class Container> + bool World::IsCorrupt(const Container& space) const + { + typename Container::const_iterator o; + for (o = space.begin(); o != space.end(); ++o) + { + Object* object = (*o)->GetObject(); + if (!object) + continue; + + Body body = object->GetBody(); + if (!body) + continue; + + const dReal* lvel = dBodyGetLinearVel(body); + const dReal* avel = dBodyGetAngularVel(body); + + if (is_nan(lvel[0])) return true; + if (is_nan(lvel[1])) return true; + if (is_nan(lvel[2])) return true; + if (is_nan(avel[0])) return true; + if (is_nan(avel[1])) return true; + if (is_nan(avel[2])) return true; + } + return false; + } + + template<class G> Dynamic<G>::Dynamic(G* g, Body b) : geometry(g), body(b) --- license-bsd.txt DELETED --- Index: vector.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/flatland/vector.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vector.cpp 27 Feb 2005 22:16:32 -0000 1.2 --- vector.cpp 3 Jul 2005 20:00:51 -0000 1.3 *************** *** 13,14 **** --- 13,44 ---- vec2 vec2::rotate(float d) const { return rotate(vec2(cosf(d2r * d), sinf(d2r * d))); } float vec2::length() const { return sqrtf(dot(*this, *this)); } + + + // returns true for IEEE floats that are infinity or a not-a-number + bool Flatland::is_nan(float f) + { + unsigned long bits = *((unsigned long*) &f); + + // quiet -NaN + if (bits >= 0xffc00001 && bits <= 0xffffffff) return true; + + // indeterminate + if (bits == 0xffc00000) return true; + + // signaling -NaN + if (bits >= 0xff800001 && bits <= 0xffbfffff) return true; + + // minus infinity + if (bits == 0xff800000) return true; + + // positive infinity + if (bits == 0x7f800000) return true; + + // signaling +NaN + if (bits >= 0x7f800001 && bits <= 0x7fbfffff) return true; + + // signaling +NaN + if (bits >= 0x7fc00000 && bits <= 0x7fffffff) return true; + + return false; + } --- NEW FILE: bsd-license.txt --- This is the BSD-style license for Flatland ------------------------------------------ Flatland Copyright (c) 2005, Philip Rideout. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the names of Flatland's copyright owner nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
From: Philip R. <pri...@us...> - 2005-07-03 20:00:59
|
Update of /cvsroot/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27049 Modified Files: readme.html Log Message: Nuked dependency on GLU. Fixed spelling error "Southernmost" in complex.cpp. Added World::IsCorrupt() method for detecting singularities. Fixed a singularity that was sometimes seen with the catapult. Renamed license-bsd.txt to bsd-license.txt. Fixed aliasing in wheel spokes in complex-demo by using linear filtering. Index: readme.html =================================================================== RCS file: /cvsroot/flatland/flatland/readme.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.html 7 Mar 2005 02:55:21 -0000 1.3 --- readme.html 3 Jul 2005 20:00:51 -0000 1.4 *************** *** 1,3 **** ! <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> *************** *** 48,52 **** --- 48,54 ---- <pre> Search for "TODO" and fix up all those spots. + Provide a win32 makefile for people who use Microsoft's free vc compiler, and write build instructions. Optimize line collisions. + Add debug code for detection of non-quiescence and disabling, useful for performance tuning. Features for the next release: *************** *** 66,69 **** --- 68,80 ---- <h1 id="changes">Change History</h1> <pre> + 1.3 + Nuked dependency on GLU. + Fixed spelling error "Southernmost" in complex.cpp. + Added World::IsCorrupt() method for detecting singularities. + Fixed a singularity that was sometimes seen with the catapult. + Renamed license-bsd.txt to bsd-license.txt. + Fixed aliasing in wheel spokes in complex-demo by using linear filtering. + Fixed shortcut icons. + 1.2 First SourceForge release. |
From: Philip R. <pri...@us...> - 2005-07-03 20:00:59
|
Update of /cvsroot/flatland/flatland/demo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27049/demo Modified Files: complex.cpp demo.cpp platform.h Log Message: Nuked dependency on GLU. Fixed spelling error "Southernmost" in complex.cpp. Added World::IsCorrupt() method for detecting singularities. Fixed a singularity that was sometimes seen with the catapult. Renamed license-bsd.txt to bsd-license.txt. Fixed aliasing in wheel spokes in complex-demo by using linear filtering. Index: demo.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/demo.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** demo.cpp 6 Mar 2005 14:48:05 -0000 1.2 --- demo.cpp 3 Jul 2005 20:00:50 -0000 1.3 *************** *** 23,27 **** Color Color::PaleGreen(0.75,0.85,0.75,1); ! const float Point::Size = 5; void Demo::glColor(const Color& color) { glColor4fv((float*) &color); } --- 23,27 ---- Color Color::PaleGreen(0.75,0.85,0.75,1); ! const float Point::Size = 10; void Demo::glColor(const Color& color) { glColor4fv((float*) &color); } *************** *** 682,697 **** glPixelStorei(GL_UNPACK_LSB_FIRST, GL_TRUE); glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_TRUE); ! if (const bool mipmapping = false) ! { ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); ! glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); ! } ! else ! { ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); ! gluBuild2DMipmaps(GL_TEXTURE_2D, 4, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data); ! } return texId; } --- 682,688 ---- glPixelStorei(GL_UNPACK_LSB_FIRST, GL_TRUE); glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_TRUE); ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); ! glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); ! glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); return texId; } *************** *** 702,705 **** --- 693,697 ---- world.GenerateContacts(space); world.QuickStep(delta); + assert(!world.IsCorrupt(space)); } Index: platform.h =================================================================== RCS file: /cvsroot/flatland/flatland/demo/platform.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** platform.h 6 Mar 2005 14:48:05 -0000 1.2 --- platform.h 3 Jul 2005 20:00:50 -0000 1.3 *************** *** 16,20 **** #include <windows.h> #include <GL/gl.h> - #include <GL/glu.h> #include <GL/wglext.h> void fatalf(const char* format, ...); --- 16,19 ---- *************** *** 25,29 **** #include <GL/gl.h> - #include <GL/glu.h> #define fatalf(...) { fprintf(stderr, __VA_ARGS__); exit(1); } --- 24,27 ---- Index: complex.cpp =================================================================== RCS file: /cvsroot/flatland/flatland/demo/complex.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** complex.cpp 6 Mar 2005 14:48:05 -0000 1.2 --- complex.cpp 3 Jul 2005 20:00:50 -0000 1.3 *************** *** 735,739 **** } ! // Southermost, easternmost, westernmost terrain t = new Terrain(vec2(-250, 400), 5000); for (float x = 0.5 + 0.1; x < 10; x += 0.1) --- 735,739 ---- } ! // Southernmost, easternmost, westernmost terrain t = new Terrain(vec2(-250, 400), 5000); for (float x = 0.5 + 0.1; x < 10; x += 0.1) |
From: Philip R. <pri...@us...> - 2005-07-03 20:00:58
|
Update of /cvsroot/flatland/flatland/build/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27049/build/VisualStudio Modified Files: complex-demo.vcproj Log Message: Nuked dependency on GLU. Fixed spelling error "Southernmost" in complex.cpp. Added World::IsCorrupt() method for detecting singularities. Fixed a singularity that was sometimes seen with the catapult. Renamed license-bsd.txt to bsd-license.txt. Fixed aliasing in wheel spokes in complex-demo by using linear filtering. Index: complex-demo.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/complex-demo.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** complex-demo.vcproj 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- complex-demo.vcproj 3 Jul 2005 20:00:49 -0000 1.2 *************** *** 1,141 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="complex-demo" ! ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="ComplexDebug" ! IntermediateDirectory="ComplexDebug" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="TRUE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="5" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" ! SubSystem="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="ComplexRelease" ! IntermediateDirectory="ComplexRelease" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="TRUE" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="TRUE" ! RuntimeLibrary="4" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="FALSE" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> ! <File ! RelativePath="..\..\demo\complex.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\demo.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc"> ! <File ! RelativePath="..\..\demo\demo.h"> ! </File> ! <File ! RelativePath="..\..\demo\platform.h"> ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> ! <File ! RelativePath="demo.rc"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="complex-demo" ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="ComplexDebug" IntermediateDirectory="ComplexDebug" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="ComplexRelease" IntermediateDirectory="ComplexRelease" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="0" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="1" GenerateDebugInformation="FALSE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> <File RelativePath="..\..\demo\complex.cpp"> </File> <File RelativePath="..\..\demo\demo.cpp"> </File> <File RelativePath="..\..\demo\platform.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc"> <File RelativePath="..\..\demo\demo.h"> </File> <File RelativePath="..\..\demo\platform.h"> </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> <File RelativePath="demo.rc"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> \ No newline at end of file |
From: Philip R. <pri...@us...> - 2005-03-07 05:32:33
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18973 Modified Files: flatland.nsi Log Message: Still trying to nail down the installer. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** flatland.nsi 7 Mar 2005 04:34:26 -0000 1.6 --- flatland.nsi 7 Mar 2005 05:32:24 -0000 1.7 *************** *** 75,79 **** Section Uninstall ! RMDir /r $INSTDIR RMDir /r $SMPROGRAMS\Flatland DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Flatland" --- 75,80 ---- Section Uninstall ! SetOutPath $PROGRAMFILES ! RMDir /r $PROGRAMFILES\Flatland RMDir /r $SMPROGRAMS\Flatland DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Flatland" |
From: Philip R. <pri...@us...> - 2005-03-07 04:34:37
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6668 Modified Files: flatland.nsi Log Message: Another working folder fix. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** flatland.nsi 7 Mar 2005 04:30:49 -0000 1.5 --- flatland.nsi 7 Mar 2005 04:34:26 -0000 1.6 *************** *** 45,49 **** Section "" ;No components page, name is not important - ; Set output path to the installation directory. SetOutPath $INSTDIR\bin\win32 --- 45,48 ---- *************** *** 56,63 **** CreateShortCut "$SMPROGRAMS\Flatland\Program Folder.lnk" "$INSTDIR" "" "" CreateShortCut "$SMPROGRAMS\Flatland\Remove Flatland.lnk" "$INSTDIR\bin\win32\uninstall.exe" "" "" ! ; Create the uninstaller. WriteUninstaller "$INSTDIR\bin\win32\uninstall.exe" ; Put files there File /r /x installer ..\*.* --- 55,64 ---- CreateShortCut "$SMPROGRAMS\Flatland\Program Folder.lnk" "$INSTDIR" "" "" CreateShortCut "$SMPROGRAMS\Flatland\Remove Flatland.lnk" "$INSTDIR\bin\win32\uninstall.exe" "" "" ! ; Create the uninstaller. WriteUninstaller "$INSTDIR\bin\win32\uninstall.exe" + SetOutPath $INSTDIR + ; Put files there File /r /x installer ..\*.* |
From: Philip R. <pri...@us...> - 2005-03-07 04:30:59
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5935 Modified Files: flatland.nsi Log Message: Fixed working directory. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** flatland.nsi 7 Mar 2005 02:55:22 -0000 1.4 --- flatland.nsi 7 Mar 2005 04:30:49 -0000 1.5 *************** *** 46,50 **** ; Set output path to the installation directory. ! SetOutPath $INSTDIR CreateDirectory "$SMPROGRAMS\Flatland" --- 46,50 ---- ; Set output path to the installation directory. ! SetOutPath $INSTDIR\bin\win32 CreateDirectory "$SMPROGRAMS\Flatland" |
From: Philip R. <pri...@us...> - 2005-03-07 02:55:35
|
Update of /cvsroot/flatland/flatland/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14038/doc Modified Files: make.bat Log Message: Still trying to nail down a release procedure. Index: make.bat =================================================================== RCS file: /cvsroot/flatland/flatland/doc/make.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** make.bat 6 Mar 2005 23:50:33 -0000 1.7 --- make.bat 7 Mar 2005 02:55:21 -0000 1.8 *************** *** 7,8 **** --- 7,10 ---- pscp -r doxygen pri...@sh...:html rmdir /s /q doxygen + del main-page. + del file_list.html \ No newline at end of file |
From: Philip R. <pri...@us...> - 2005-03-07 02:55:35
|
Update of /cvsroot/flatland/flatland In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14038 Modified Files: readme.html Log Message: Still trying to nail down a release procedure. Index: readme.html =================================================================== RCS file: /cvsroot/flatland/flatland/readme.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.html 6 Mar 2005 14:48:04 -0000 1.2 --- readme.html 7 Mar 2005 02:55:21 -0000 1.3 *************** *** 66,75 **** <h1 id="changes">Change History</h1> <pre> ! 1.1 First SourceForge release. - 1.0 - First SourceForge check-in. - 0.32 Added Linux makefile. --- 66,72 ---- <h1 id="changes">Change History</h1> <pre> ! 1.2 First SourceForge release. 0.32 Added Linux makefile. |
From: Philip R. <pri...@us...> - 2005-03-07 02:55:34
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14038/installer Modified Files: flatland.nsi Log Message: Still trying to nail down a release procedure. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** flatland.nsi 7 Mar 2005 00:42:46 -0000 1.3 --- flatland.nsi 7 Mar 2005 02:55:22 -0000 1.4 *************** *** 7,11 **** ; 4. cvs release -d flatland ; 5. make sure flatland is totally nuked ! ; 6. cvs export -r v0-0 -kv flatland ; 7. doc\make.bat ; 8. make a zip called flatland-v0-0.zip --- 7,11 ---- ; 4. cvs release -d flatland ; 5. make sure flatland is totally nuked ! ; 6. cvs export -D now flatland ; 7. doc\make.bat ; 8. make a zip called flatland-v0-0.zip *************** *** 15,24 **** ; ! Caption "Flatland TestVersion" ! OutFile "flatland-TestVersion.exe" Name "flatland" AutoCloseWindow true ! ;VIProductVersion "1.1.1.1" ;VIAddVersionKey /LANG=1033-English "ProductName" "Flatland" ;VIAddVersionKey /LANG=$LANG_ENGLISH "Comments" "Flatland Physics Library" --- 15,28 ---- ; ! ; NOTE: rename installer to include version number (eg, flatland-v0-0.exe) ! OutFile "flatland.exe" ! Name "flatland" AutoCloseWindow true ! ; ! ; NSIS insists on a version number like X.X.X.X. ! ; ! ;VIProductVersion "0.0.0.0" ;VIAddVersionKey /LANG=1033-English "ProductName" "Flatland" ;VIAddVersionKey /LANG=$LANG_ENGLISH "Comments" "Flatland Physics Library" *************** *** 26,30 **** ;VIAddVersionKey /LANG=$LANG_ENGLISH "LegalCopyright" "Copyright 2005 by Philip Rideout" ;VIAddVersionKey /LANG=$LANG_ENGLISH "FileDescription" "Flatland Installer" ! ;VIAddVersionKey /LANG=$LANG_ENGLISH "FileVersion" "1.1.1.1" ; The default installation directory --- 30,34 ---- ;VIAddVersionKey /LANG=$LANG_ENGLISH "LegalCopyright" "Copyright 2005 by Philip Rideout" ;VIAddVersionKey /LANG=$LANG_ENGLISH "FileDescription" "Flatland Installer" ! ;VIAddVersionKey /LANG=$LANG_ENGLISH "FileVersion" "0.0.0.0" ; The default installation directory |
From: Philip R. <pri...@us...> - 2005-03-07 00:42:54
|
Update of /cvsroot/flatland/flatland/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13403 Modified Files: flatland.nsi Log Message: Updating the release procedure. Index: flatland.nsi =================================================================== RCS file: /cvsroot/flatland/flatland/installer/flatland.nsi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flatland.nsi 6 Mar 2005 23:50:34 -0000 1.2 --- flatland.nsi 7 Mar 2005 00:42:46 -0000 1.3 *************** *** 6,15 **** ; 3. cvs tag v0-0 ; 4. cvs release -d flatland ! ; 5. cvs export -r v0-0 -kv flatland ! ; 6. doc\make.bat ! ; 7. make a zip called flatland-v0-0.zip ! ; 8. Run installer\make.bat ! ; 9. Add the zip and the exe to the released files on the SourceForge projects page. ! ; 10. putty shell.sf.net and add a news item to html\index.html. ; --- 6,16 ---- ; 3. cvs tag v0-0 ; 4. cvs release -d flatland ! ; 5. make sure flatland is totally nuked ! ; 6. cvs export -r v0-0 -kv flatland ! ; 7. doc\make.bat ! ; 8. make a zip called flatland-v0-0.zip ! ; 9. Run installer\make.bat ! ; 10. Add the zip and the exe to the released files on the SourceForge projects page. ! ; 11. putty shell.sf.net and add a news item to html\index.html. ; |
From: Philip R. <pri...@us...> - 2005-03-07 00:41:34
|
Update of /cvsroot/flatland/flatland/build/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13166/build/VisualStudio Modified Files: flatland.ico small.ico Log Message: Fixed binary corruption of icons. Index: small.ico =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/small.ico,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsxgZUwk and /tmp/cvsQkb4y5 differ Index: flatland.ico =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/flatland.ico,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsKyG98r and /tmp/cvsMkaThd differ |