Menu
▾
▴
simspark-cvs — CVS Commit Notifications via Email
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(153) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(46) |
Mar
(12) |
Apr
(4) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(263) |
Mar
(235) |
Apr
(66) |
May
(42) |
Jun
(270) |
Jul
(65) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus R. <rol...@us...> - 2007-02-15 21:02:36
|
Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24649 Modified Files: Tag: WIN32 inputcontrol.cpp inputcontrol.h Log Message: - drop cacehd mFPSController in UpdateCached Index: inputcontrol.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** inputcontrol.h 5 Dec 2005 21:38:22 -0000 1.1 --- inputcontrol.h 15 Feb 2007 21:02:33 -0000 1.1.2.1 *************** *** 111,114 **** --- 111,117 ---- bool RegisterInputItem(const std::string& inputItem, const std::string& name); + /** update variables from a script */ + virtual void UpdateCached(); + protected: virtual void OnLink(); Index: inputcontrol.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** inputcontrol.cpp 10 Feb 2007 16:14:50 -0000 1.2.2.1 --- inputcontrol.cpp 15 Feb 2007 21:02:33 -0000 1.2.2.2 *************** *** 315,316 **** --- 315,321 ---- return true; } + + void InputControl::UpdateCached() + { + mFPSController.reset(); + } |
|
From: Markus R. <rol...@us...> - 2007-02-15 21:02:02
|
Update of /cvsroot/simspark/simspark/spark/kerosin/renderserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24216 Modified Files: Tag: WIN32 renderserver.cpp renderserver.h Log Message: - drop cached mActivScene reference in UpdateCached() Index: renderserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/renderserver/renderserver.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** renderserver.h 18 Feb 2006 19:43:13 -0000 1.2 --- renderserver.h 15 Feb 2007 21:01:57 -0000 1.2.2.1 *************** *** 77,80 **** --- 77,83 ---- void SetAmbientColor(const RGBA& ambient); + /** update variables from a script */ + virtual void UpdateCached(); + protected: /** get the active scene node from the sceneServer */ Index: renderserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/renderserver/renderserver.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** renderserver.cpp 18 Feb 2006 19:43:13 -0000 1.2 --- renderserver.cpp 15 Feb 2007 21:01:57 -0000 1.2.2.1 *************** *** 345,346 **** --- 345,351 ---- mAmbientColor = ambient; } + + void RenderServer::UpdateCached() + { + mActiveScene.reset(); + } |
|
From: Markus R. <rol...@us...> - 2007-02-15 21:00:33
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23683 Modified Files: Tag: WIN32 body.cpp body.h bodycontroller.cpp bodycontroller.h collider.cpp collider.h joint.cpp joint.h space.cpp space.h world.cpp world.h Log Message: - implement DestroyODEObject() Index: world.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** world.h 12 Feb 2007 19:33:54 -0000 1.2.2.1 --- world.h 15 Feb 2007 21:00:19 -0000 1.2.2.2 *************** *** 97,105 **** zero. Increasing this to some small value (e.g. 0.001) can help prevent jittering problems due to contacts being repeatedly made ! and broken. */ ! void SetContactSurfaceLayer(float depth); float GetContactSurfaceLayer() const; protected: /** creates them managed ODE world */ --- 97,108 ---- zero. Increasing this to some small value (e.g. 0.001) can help prevent jittering problems due to contacts being repeatedly made ! and broken. */ ! void SetContactSurfaceLayer(float depth); float GetContactSurfaceLayer() const; + /** destroy the managed ODE object */ + virtual void DestroyODEObject(); + protected: /** creates them managed ODE world */ Index: body.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/body.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** body.cpp 14 Apr 2006 16:27:27 -0000 1.2 --- body.cpp 15 Feb 2007 21:00:18 -0000 1.2.2.1 *************** *** 35,43 **** Body::~Body() { - if (mODEBody) - { - dBodyDestroy(mODEBody); - mODEBody = 0; - } } --- 35,38 ---- *************** *** 106,109 **** --- 101,115 ---- } + void Body::DestroyODEObject() + { + if (mODEBody == 0) + { + return; + } + + dBodyDestroy(mODEBody); + mODEBody = 0; + } + void Body::OnLink() { Index: body.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/body.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** body.h 14 Apr 2006 16:27:26 -0000 1.2 --- body.h 15 Feb 2007 21:00:18 -0000 1.2.2.1 *************** *** 176,179 **** --- 176,182 ---- salt::Vector3f GetPosition() const; + /** destroy the managed ODE object */ + virtual void DestroyODEObject(); + protected: /** creates the managed ODE body and moves it to the position of Index: collider.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** collider.h 14 Apr 2006 16:27:27 -0000 1.2 --- collider.h 15 Feb 2007 21:00:18 -0000 1.2.2.1 *************** *** 128,131 **** --- 128,134 ---- virtual void PrePhysicsUpdateInternal(float deltaTime); + /** destroy the managed ODE object */ + virtual void DestroyODEObject(); + // // Members Index: collider.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** collider.cpp 14 Apr 2006 16:27:27 -0000 1.2 --- collider.cpp 15 Feb 2007 21:00:18 -0000 1.2.2.1 *************** *** 38,46 **** Collider::~Collider() { - if (mODEGeom) - { - dGeomDestroy(mODEGeom); - mODEGeom = 0; - } } --- 38,41 ---- *************** *** 252,253 **** --- 247,258 ---- } + void Collider::DestroyODEObject() + { + if (! mODEGeom) + { + return; + } + + dGeomDestroy(mODEGeom); + mODEGeom = 0; + } Index: bodycontroller.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/bodycontroller.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** bodycontroller.h 5 Dec 2005 21:16:49 -0000 1.1 --- bodycontroller.h 15 Feb 2007 21:00:18 -0000 1.1.2.1 *************** *** 38,41 **** --- 38,44 ---- virtual ~BodyController() {} + /** update variables from a script */ + virtual void UpdateCached(); + protected: /** sets up the reference to the controlled body */ Index: bodycontroller.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/bodycontroller.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** bodycontroller.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- bodycontroller.cpp 15 Feb 2007 21:00:18 -0000 1.1.2.1 *************** *** 30,33 **** --- 30,45 ---- void BodyController::OnLink() { + UpdateCached(); + } + + void BodyController::OnUnlink() + { + mBody.reset(); + } + + void BodyController::UpdateCached() + { + mBody.reset(); + mBody = shared_dynamic_cast<Body> (make_shared(GetParentSupportingClass("Body"))); *************** *** 39,45 **** } } - - void BodyController::OnUnlink() - { - mBody.reset(); - } --- 51,52 ---- Index: joint.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/joint.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** joint.cpp 9 Feb 2007 20:11:56 -0000 1.4.2.1 --- joint.cpp 15 Feb 2007 21:00:18 -0000 1.4.2.2 *************** *** 33,42 **** Joint::~Joint() { - EnableFeedback(false); - if (mODEJoint) - { - dJointDestroy(mODEJoint); - mODEJoint = 0; - } } --- 33,36 ---- *************** *** 424,429 **** } ! ! ! --- 418,430 ---- } + void Joint::DestroyODEObject() + { + if (! mODEJoint) + { + return; + } ! EnableFeedback(false); ! dJointDestroy(mODEJoint); ! mODEJoint = 0; ! } Index: space.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** space.h 5 Dec 2005 21:16:49 -0000 1.1 --- space.h 15 Feb 2007 21:00:19 -0000 1.1.2.1 *************** *** 65,68 **** --- 65,71 ---- virtual void HandleCollide(dGeomID obj1, dGeomID obj2); + /** destroy the managed ODE object */ + virtual void DestroyODEObject(); + protected: /** creates them managed ODE space and a contact joint group */ *************** *** 72,75 **** --- 75,83 ---- virtual void PostPhysicsUpdateInternal(); + /** destroys the ODE bodies managed by all Body objects that are + registered to this Space + */ + void DestroySpaceObjects(); + // // Members Index: joint.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/joint.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** joint.h 12 Feb 2006 11:36:52 -0000 1.2 --- joint.h 15 Feb 2007 21:00:19 -0000 1.2.2.1 *************** *** 66,69 **** --- 66,72 ---- virtual ~Joint(); + /** destroy the managed ODE object */ + virtual void DestroyODEObject(); + /** attaches the joint to some new bodies. If the joint is already attached, it will be detached from the old bodies first. To Index: space.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** space.cpp 12 Feb 2007 19:32:54 -0000 1.1.2.1 --- space.cpp 15 Feb 2007 21:00:19 -0000 1.1.2.2 *************** *** 35,39 **** } ! Space::Space() : mODESpace(0), mODEContactGroup(0) { } --- 35,39 ---- } ! Space::Space() : ODEObject(), mODESpace(0), mODEContactGroup(0) { } *************** *** 46,56 **** mODEContactGroup = 0; } - - // release the ODE space - if (mODESpace) - { - dSpaceDestroy(mODESpace); - mODESpace = 0; - } } --- 46,49 ---- *************** *** 141,142 **** --- 134,188 ---- } + void Space::DestroySpaceObjects() + { + shared_ptr<Scene> scene = GetScene(); + if (scene.get() == 0) + { + return; + } + + TLeafList objects; + + const bool recursive = true; + scene->ListChildrenSupportingClass<ODEObject>(objects, recursive); + + for ( + TLeafList::iterator iter = objects.begin(); + iter != objects.end(); + ++iter + ) + { + shared_ptr<ODEObject> object = shared_static_cast<ODEObject>(*iter); + if (object->GetSpaceID() != mODESpace) + { + continue; + } + + object->DestroyODEObject(); + } + } + + void Space::DestroyODEObject() + { + static bool recurseLock = false; + + if ( + (recurseLock) || + (! mODESpace) + ) + { + return; + } + + recurseLock = true; + + // make sure that all objects registered to this space are destroyed + // before this space. Any other order provokes a segfault in ODE. + DestroySpaceObjects(); + + // release the ODE space + dSpaceDestroy(mODESpace); + mODESpace = 0; + + recurseLock = false; + } Index: world.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world.cpp,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** world.cpp 13 Feb 2007 19:39:35 -0000 1.2.2.2 --- world.cpp 15 Feb 2007 21:00:19 -0000 1.2.2.3 *************** *** 21,29 **** #include "world.h" using namespace oxygen; using namespace salt; ! World::World() : mODEWorld(0) { } --- 21,32 ---- #include "world.h" + #include "space.h" + #include <oxygen/sceneserver/scene.h> + using namespace boost; using namespace oxygen; using namespace salt; ! World::World() : ODEObject(), mODEWorld(0) { } *************** *** 31,40 **** World::~World() { - // release the ODE world - if (mODEWorld) - { - dWorldDestroy(mODEWorld); - mODEWorld = 0; - } } --- 34,37 ---- *************** *** 112,113 **** --- 109,138 ---- return (mODEWorld != 0); } + + void World::DestroyODEObject() + { + static bool recurseLock = false; + if (recurseLock) + { + return; + } + + recurseLock = true; + + shared_ptr<Space> space = GetSpace(); + if (space.get() != 0) + { + space->DestroyODEObject(); + } + + if (mODEWorld == 0) + { + return; + } + + // release the ODE world + dWorldDestroy(mODEWorld); + mODEWorld = 0; + + recurseLock = false; + } |
|
From: Markus R. <rol...@us...> - 2007-02-15 20:59:45
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23290 Modified Files: Tag: WIN32 odeobject.cpp odeobject.h Log Message: - make GetWorldID and GetWorldID public - add DestroyODEObject() that destructs the managed ODE handle. This method is required as the sequence in which UnlinkChildren destroys nodes (bottom up) is not sufficient for the ODE library. Rather all objects registered to an ODE space should be destroyed before the space is destroyed. Otherwise the ODE handles of bodies and joints within that space become stale and at ODE throws a segfault. Index: odeobject.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** odeobject.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- odeobject.cpp 15 Feb 2007 20:59:41 -0000 1.1.2.1 *************** *** 29,33 **** using namespace boost; ! /** returns the world node */ shared_ptr<World> ODEObject::GetWorld() { --- 29,45 ---- using namespace boost; ! ODEObject::ODEObject() : BaseNode() ! { ! } ! ! ODEObject::~ODEObject() ! { ! } ! ! void ODEObject::OnUnlink() ! { ! DestroyODEObject(); ! } ! shared_ptr<World> ODEObject::GetWorld() { *************** *** 120,123 **** matrix[11] = 0; } - - --- 132,133 ---- Index: odeobject.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** odeobject.h 13 Feb 2007 19:52:34 -0000 1.1.2.1 --- odeobject.h 15 Feb 2007 20:59:41 -0000 1.1.2.2 *************** *** 39,51 **** // Functions // ! ODEObject() : BaseNode() {}; ! virtual ~ODEObject() {}; ! ! protected: ! /** returns the world node */ ! boost::shared_ptr<World> GetWorld(); ! /** returns the space node */ ! boost::shared_ptr<Space> GetSpace(); /** returns the ODE world handle */ --- 39,50 ---- // Functions // ! ODEObject(); ! virtual ~ODEObject(); ! /** This rountine is called, before the hierarchy object is ! removed from the parent. It can be overridden to support ! custom 'unlink' behavior. ! */ ! virtual void OnUnlink(); /** returns the ODE world handle */ *************** *** 55,58 **** --- 54,67 ---- dSpaceID GetSpaceID(); + /** destroy the managed ODE object */ + virtual void DestroyODEObject() = 0; + + protected: + /** returns the world node */ + boost::shared_ptr<World> GetWorld(); + + /** returns the space node */ + boost::shared_ptr<Space> GetSpace(); + /** converts the rotation part of a salt::Matrix to an ODE dMatrix3 */ |
|
From: Markus R. <rol...@us...> - 2007-02-15 20:54:25
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21239 Modified Files: Tag: WIN32 scriptserver.h scriptserver_c.cpp Log Message: - export UpdateCachedAllNodes to ruby Index: scriptserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** scriptserver.h 16 May 2006 10:17:32 -0000 1.2 --- scriptserver.h 15 Feb 2007 20:54:22 -0000 1.2.2.1 *************** *** 112,115 **** --- 112,116 ---- bool Eval(const std::string &command, GCValue& value); + /** notify all notes to update their cached references */ void UpdateCachedAllNodes(); Index: scriptserver_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** scriptserver_c.cpp 5 Dec 2005 21:05:01 -0000 1.1 --- scriptserver_c.cpp 15 Feb 2007 20:54:22 -0000 1.1.2.1 *************** *** 25,30 **** --- 25,37 ---- using namespace zeitgeist; + FUNCTION(ScriptServer,updateCachedAllNodes) + { + obj->UpdateCachedAllNodes(); + return true; + } + void CLASS(ScriptServer)::DefineClass() { DEFINE_BASECLASS(zeitgeist/Leaf); + DEFINE_FUNCTION(updateCachedAllNodes); } |
|
From: Markus R. <rol...@us...> - 2007-02-15 20:53:37
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20828 Modified Files: Tag: WIN32 node.cpp node_c.cpp Log Message: - clean up and export UnlinkChildren to ruby Index: node_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/node_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** node_c.cpp 5 Dec 2005 20:59:18 -0000 1.1 --- node_c.cpp 15 Feb 2007 20:53:33 -0000 1.1.2.1 *************** *** 25,30 **** --- 25,37 ---- using namespace zeitgeist; + FUNCTION(Node,unlinkChildren) + { + obj->UnlinkChildren(); + return true; + } + void CLASS(Node)::DefineClass() { + DEFINE_FUNCTION(unlinkChildren); DEFINE_BASECLASS(zeitgeist/Leaf); } Index: node.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/node.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** node.cpp 5 Dec 2005 20:59:18 -0000 1.1 --- node.cpp 15 Feb 2007 20:53:33 -0000 1.1.2.1 *************** *** 199,217 **** Node::UnlinkChildren() { - string cname; - if (GetClass().get() != 0) - { - cname = GetClass()->GetName(); - } - while (! mChildren.empty()) { shared_ptr<Leaf> node = mChildren.front(); - - string className; - if (node->GetClass().get()!= 0) - { - className=node->GetClass()->GetName(); - } node->UnlinkChildren(); node->Unlink(); --- 199,205 ---- |
|
From: Markus R. <rol...@us...> - 2007-02-15 10:58:44
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv970 Modified Files: Tag: WIN32 main.cpp rsgedit.vcproj Added Files: Tag: WIN32 rsgedit.rc Log Message: - use the spark icon for rsgedit Index: rsgedit.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/rsgedit.vcproj,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** rsgedit.vcproj 14 Feb 2007 12:35:49 -0000 1.1.2.4 --- rsgedit.vcproj 15 Feb 2007 10:58:39 -0000 1.1.2.5 *************** *** 176,179 **** --- 176,183 ---- <Files> <File + RelativePath=".\icon1.ico" + > + </File> + <File RelativePath=".\inputwx.cpp" > *************** *** 224,227 **** --- 228,235 ---- </File> <File + RelativePath=".\rsgedit.rc" + > + </File> + <File RelativePath=".\simspark.cpp" > *************** *** 232,235 **** --- 240,247 ---- </File> <File + RelativePath="..\..\spark\win32\spark.ico" + > + </File> + <File RelativePath=".\sparkglcanvas.cpp" > Index: main.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.cpp,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** main.cpp 10 Feb 2007 19:01:53 -0000 1.6.2.1 --- main.cpp 15 Feb 2007 10:58:39 -0000 1.6.2.2 *************** *** 59,65 **** mProperty = shared_ptr<Property>(new Property); - mainframe* frame = new mainframe(NULL, wxID_ANY, _T("RsgEdit")); // Show the frame frame->Show(true); --- 59,68 ---- mProperty = shared_ptr<Property>(new Property); mainframe* frame = new mainframe(NULL, wxID_ANY, _T("RsgEdit")); + #ifdef __WXMSW__ + frame->SetIcon(wxIcon("Spark", wxBITMAP_TYPE_ICO_RESOURCE)); + #endif + // Show the frame frame->Show(true); --- NEW FILE: rsgedit.rc --- Spark ICON DISCARDABLE "../../spark/win32/spark.ico" |
|
From: Markus R. <rol...@us...> - 2007-02-15 10:58:25
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv934 Added Files: Tag: WIN32 spark.ico Log Message: - added simspark logo as windows icon --- NEW FILE: spark.ico --- (This appears to be a binary file; contents omitted.) |
|
From: Markus R. <rol...@us...> - 2007-02-15 10:57:38
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv485 Modified Files: Tag: WIN32 mainframe.cpp mainframe.h propertyframe.cpp propertyframe.h rsgedit.wxg Log Message: - regenerate ui code with more recent wxglad version - fix ui update bug (play/pause icon state) Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** mainframe.h 10 Feb 2007 19:01:54 -0000 1.7.2.1 --- mainframe.h 15 Feb 2007 10:57:27 -0000 1.7.2.2 *************** *** 52,55 **** --- 52,56 ---- mainframe(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE); + virtual ~mainframe(); private: *************** *** 106,112 **** wxStatusBar* MainFrame_statusbar; wxListCtrl* mCtrPropList; ! wxPanel* mLeftTopPane; wxTreeCtrl* mCtrTree; ! wxPanel* mLeftBottomPane; wxSplitterWindow* window_1; wxPanel* mLeftPane; --- 107,113 ---- wxStatusBar* MainFrame_statusbar; wxListCtrl* mCtrPropList; ! wxPanel* window_1_pane_1; wxTreeCtrl* mCtrTree; ! wxPanel* window_1_pane_2; wxSplitterWindow* window_1; wxPanel* mLeftPane; Index: propertyframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/propertyframe.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** propertyframe.h 22 Jan 2006 17:25:23 -0000 1.2 --- propertyframe.h 15 Feb 2007 10:57:28 -0000 1.2.2.1 *************** *** 58,62 **** protected: // begin wxGlade: propertyframe::attributes ! wxListCtrl* mCtrList; // end wxGlade --- 58,62 ---- protected: // begin wxGlade: propertyframe::attributes ! wxListCtrl* mCtrPropList; // end wxGlade Index: rsgedit.wxg =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.wxg,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** rsgedit.wxg 22 Jan 2006 12:19:28 -0000 1.4 --- rsgedit.wxg 15 Feb 2007 10:57:28 -0000 1.4.2.1 *************** *** 1,6 **** <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4 on Sun Jan 22 13:15:36 2006 --> ! <application path="/home/markus/cvs/simspark/contrib/rsgedit/" name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> <object class="mainframe" name="MainFrame" base="EditFrame"> <style>wxICONIZE|wxCAPTION|wxMINIMIZE|wxCLOSE_BOX|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxSYSTEM_MENU|wxRESIZE_BORDER|wxCLIP_CHILDREN</style> --- 1,6 ---- <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Thu Feb 15 10:38:44 2007 --> ! <application path="." name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> <object class="mainframe" name="MainFrame" base="EditFrame"> <style>wxICONIZE|wxCAPTION|wxMINIMIZE|wxCLOSE_BOX|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxSYSTEM_MENU|wxRESIZE_BORDER|wxCLIP_CHILDREN</style> *************** *** 66,82 **** <orient>wxVERTICAL</orient> <object class="sizeritem"> - <flag>wxEXPAND|wxADJUST_MINSIZE</flag> - <border>0</border> - <option>0</option> - <object class="wxTextCtrl" name="mCtrLocation" base="EditTextCtrl"> - </object> - </object> - <object class="sizeritem"> <flag>wxEXPAND</flag> <border>0</border> <option>1</option> ! <object class="wxTreeCtrl" name="mCtrTree" base="EditTreeCtrl"> ! <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER</style> ! <id>1</id> </object> </object> --- 66,106 ---- <orient>wxVERTICAL</orient> <object class="sizeritem"> <flag>wxEXPAND</flag> <border>0</border> <option>1</option> ! <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow"> ! <style>wxSP_3D|wxSP_BORDER</style> ! <orientation>wxSPLIT_HORIZONTAL</orientation> ! <window_2>window_1_pane_2</window_2> ! <window_1>window_1_pane_1</window_1> ! <object class="wxPanel" name="window_1_pane_1" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> ! <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer"> ! <orient>wxVERTICAL</orient> ! <object class="sizeritem"> ! <flag>wxEXPAND</flag> ! <border>0</border> ! <option>1</option> ! <object class="wxListCtrl" name="mCtrPropList" base="EditListCtrl"> ! <style>wxLC_REPORT|wxSUNKEN_BORDER</style> ! </object> ! </object> ! </object> ! </object> ! <object class="wxPanel" name="window_1_pane_2" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> ! <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer"> ! <orient>wxVERTICAL</orient> ! <object class="sizeritem"> ! <flag>wxEXPAND</flag> ! <border>0</border> ! <option>1</option> ! <object class="wxTreeCtrl" name="mCtrTree" base="EditTreeCtrl"> ! <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER</style> ! <id>1</id> ! </object> ! </object> ! </object> ! </object> </object> </object> *************** *** 145,149 **** <border>0</border> <option>1</option> ! <object class="wxListCtrl" name="mCtrList" base="EditListCtrl"> <style>wxLC_REPORT|wxSUNKEN_BORDER</style> </object> --- 169,173 ---- <border>0</border> <option>1</option> ! <object class="wxListCtrl" name="mCtrPropList" base="EditListCtrl"> <style>wxLC_REPORT|wxSUNKEN_BORDER</style> </object> Index: propertyframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/propertyframe.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** propertyframe.cpp 22 Jan 2006 17:25:23 -0000 1.2 --- propertyframe.cpp 15 Feb 2007 10:57:27 -0000 1.2.2.1 *************** *** 35,39 **** { // begin wxGlade: propertyframe::propertyframe ! mCtrList = new wxListCtrl(this, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); set_properties(); --- 35,39 ---- { // begin wxGlade: propertyframe::propertyframe ! mCtrPropList = new wxListCtrl(this, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); set_properties(); *************** *** 56,60 **** // begin wxGlade: propertyframe::do_layout wxBoxSizer* sizer_3 = new wxBoxSizer(wxVERTICAL); ! sizer_3->Add(mCtrList, 1, wxEXPAND, 0); SetAutoLayout(true); SetSizer(sizer_3); --- 56,60 ---- // begin wxGlade: propertyframe::do_layout wxBoxSizer* sizer_3 = new wxBoxSizer(wxVERTICAL); ! sizer_3->Add(mCtrPropList, 1, wxEXPAND, 0); SetAutoLayout(true); SetSizer(sizer_3); *************** *** 66,70 **** { mLeaf = leaf; ! mPropList.Init(mLeaf,mCtrList); RefreshProperties(); } --- 66,70 ---- { mLeaf = leaf; ! mPropList.Init(mLeaf,mCtrPropList); RefreshProperties(); } Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** mainframe.cpp 10 Feb 2007 19:01:53 -0000 1.8.2.1 --- mainframe.cpp 15 Feb 2007 10:57:26 -0000 1.8.2.2 *************** *** 78,81 **** --- 78,83 ---- mTimer(this,1) { + mToolBar = 0; + // begin wxGlade: mainframe::mainframe mCtrVertSplitter = new wxSplitterWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); *************** *** 86,91 **** mLeftPane = new wxPanel(mCtrVertSplitter, -1); window_1 = new wxSplitterWindow(mLeftPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); ! mLeftBottomPane = new wxPanel(window_1, -1); ! mLeftTopPane = new wxPanel(window_1, -1); MainFrame_menubar = new wxMenuBar(); SetMenuBar(MainFrame_menubar); --- 88,93 ---- mLeftPane = new wxPanel(mCtrVertSplitter, -1); window_1 = new wxSplitterWindow(mLeftPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); ! window_1_pane_2 = new wxPanel(window_1, -1); ! window_1_pane_1 = new wxPanel(window_1, -1); MainFrame_menubar = new wxMenuBar(); SetMenuBar(MainFrame_menubar); *************** *** 102,109 **** MainFrame_menubar->Append(wxglade_tmp_menu_3, wxT("&Simulation")); MainFrame_statusbar = CreateStatusBar(1, 0); ! mCtrPropList = new wxListCtrl(mLeftTopPane, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); ! mCtrTree = new wxTreeCtrl(mLeftBottomPane, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL); set_properties(); --- 104,111 ---- MainFrame_menubar->Append(wxglade_tmp_menu_3, wxT("&Simulation")); MainFrame_statusbar = CreateStatusBar(1, 0); ! mCtrPropList = new wxListCtrl(window_1_pane_1, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); ! mCtrTree = new wxTreeCtrl(window_1_pane_2, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxTE_LINEWRAP); set_properties(); *************** *** 112,117 **** // create toolbar ! mToolBar = new wxToolBar(this,-1); ! SetToolBar(mToolBar); mToolBar->AddTool(ID_SIM_START, wxT("Start"), wxBitmap(xpm_play)); --- 114,118 ---- // create toolbar ! mToolBar = CreateToolBar( wxTB_FLAT|wxTB_HORIZONTAL, wxID_ANY ); mToolBar->AddTool(ID_SIM_START, wxT("Start"), wxBitmap(xpm_play)); *************** *** 119,122 **** --- 120,124 ---- mToolBar->Realize(); + SetToolBar(mToolBar); // *************** *** 139,142 **** --- 141,148 ---- } + mainframe::~mainframe() + { + } + void mainframe::SplitHor() { *************** *** 144,148 **** mCtrHorSplitter->SetSashPosition(mLastHorSashPosition); - mCtrHorSplitter->SetSashGravity(1.0); } --- 150,153 ---- *************** *** 181,197 **** wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer_7 = new wxBoxSizer(wxVERTICAL); ! wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL); ! wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL); sizer_4->Add(mCtrPropList, 1, wxEXPAND, 0); ! mLeftTopPane->SetAutoLayout(true); ! mLeftTopPane->SetSizer(sizer_4); ! sizer_4->Fit(mLeftTopPane); ! sizer_4->SetSizeHints(mLeftTopPane); sizer_8->Add(mCtrTree, 1, wxEXPAND, 0); ! mLeftBottomPane->SetAutoLayout(true); ! mLeftBottomPane->SetSizer(sizer_8); ! sizer_8->Fit(mLeftBottomPane); ! sizer_8->SetSizeHints(mLeftBottomPane); ! window_1->SplitHorizontally(mLeftTopPane, mLeftBottomPane); sizer_7->Add(window_1, 1, wxEXPAND, 0); mLeftPane->SetAutoLayout(true); --- 186,202 ---- wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer_7 = new wxBoxSizer(wxVERTICAL); ! wxBoxSizer* sizer_8 = new wxBoxSizer(wxVERTICAL); ! wxBoxSizer* sizer_4 = new wxBoxSizer(wxVERTICAL); sizer_4->Add(mCtrPropList, 1, wxEXPAND, 0); ! window_1_pane_1->SetAutoLayout(true); ! window_1_pane_1->SetSizer(sizer_4); ! sizer_4->Fit(window_1_pane_1); ! sizer_4->SetSizeHints(window_1_pane_1); sizer_8->Add(mCtrTree, 1, wxEXPAND, 0); ! window_1_pane_2->SetAutoLayout(true); ! window_1_pane_2->SetSizer(sizer_8); ! sizer_8->Fit(window_1_pane_2); ! sizer_8->SetSizeHints(window_1_pane_2); ! window_1->SplitHorizontally(window_1_pane_1, window_1_pane_2); sizer_7->Add(window_1, 1, wxEXPAND, 0); mLeftPane->SetAutoLayout(true); *************** *** 247,251 **** event.Skip(); - Destroy(); } --- 252,255 ---- *************** *** 361,364 **** --- 365,371 ---- wxLongLong tLast = wxGetLocalTimeMillis(); + // force update of ui state + UpdateWindowUI(wxUPDATE_UI_RECURSE); + while (! sim->WantsToQuit()) { *************** *** 384,387 **** --- 391,397 ---- spark->SetSimState(SimSpark::S_PAUSED); spark->GetLog()->Normal() << "(RsgEdit) simulation paused\n"; + + // force update of ui state + UpdateWindowUI(wxUPDATE_UI_RECURSE); } |
|
From: Markus R. <rol...@us...> - 2007-02-15 09:51:58
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7526 Modified Files: Tag: WIN32 simspark.iss Log Message: - set proper working directory for desktop icon Index: simspark.iss =================================================================== RCS file: /cvsroot/simspark/simspark/spark/win32/Attic/simspark.iss,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** simspark.iss 14 Feb 2007 18:09:53 -0000 1.1.2.1 --- simspark.iss 15 Feb 2007 09:51:54 -0000 1.1.2.2 *************** *** 70,73 **** Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL} Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe} ! Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon ! Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon --- 70,73 ---- Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL} Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe} ! Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: desktopicon ! Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: quicklaunchicon |
|
From: Markus R. <rol...@us...> - 2007-02-14 18:10:02
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6465 Added Files: Tag: WIN32 simspark.iss Log Message: - added an Inno Setup script for SimSpark --- NEW FILE: simspark.iss --- ; ; This is an Inno Setup Script for SimSpark. Use the Inno Compiler ; available at http://www.jrsoftware.org/isinfo.php to create a ; setup.exe for Windows. This script uses the Inno preprocessor addon ; that has to be installed additionally ; #define MyAppName "SimSpark" #define MyAppVerName "SimSpark" #define MyAppPublisher "RoboCup Soccer Server 3D Maintenance Group" #define MyAppURL "http://sourceforge.net/projects/simspark" #define MyAppExeName "rsgedit.exe" #define MyVcReleaseDir "..\vcrelease" #define MyRsgEditDir "..\..\contrib\rsgedit" #define MyZeitgeistDir "..\zeitgeist" #define MyOxygenDir "..\oxygen" #define MyKerosinDir "..\kerosin" #define MySparkDir "..\spark" [Setup] AppName={#MyAppName} AppVerName={#MyAppVerName} AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\simspark DefaultGroupName={#MyAppName} DisableProgramGroupPage=yes LicenseFile=..\COPYING OutputBaseFilename=setup Compression=lzma SolidCompression=yes [Languages] Name: english; MessagesFile: compiler:Default.isl [Tasks] Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked [Files] ; applications Source: {#MyVcReleaseDir}\rsgedit.exe; DestDir: {app}; Flags: ignoreversion ; plugins Source: {#MyVcReleaseDir}\inputwx.dll; DestDir: {app}; Flags: ignoreversion Source: {#MyVcReleaseDir}\rubysceneimporter.dll; DestDir: {app}; Flags: ignoreversion Source: {#MyVcReleaseDir}\sexpparser.dll; DestDir: {app}; Flags: ignoreversion Source: {#MyVcReleaseDir}\filesystemstd.dll; DestDir: {app}; Flags: ignoreversion ; ruby scripts Source: {#MyZeitgeistDir}\zeitgeist.rb; DestDir: {app}; Flags: ignoreversion Source: {#MyOxygenDir}\oxygen.rb; DestDir: {app}; Flags: ignoreversion Source: {#MyKerosinDir}\kerosin.rb; DestDir: {app}; Flags: ignoreversion Source: {#MySparkDir}\spark.rb; DestDir: {app}; Flags: ignoreversion Source: {#MyRsgEditDir}\bindings.rb; DestDir: {app}; Flags: ignoreversion Source: {#MyRsgEditDir}\german.scan.rb; DestDir: {app}; Flags: ignoreversion Source: {#MyRsgEditDir}\rsgedit.rb; DestDir: {app}; Flags: ignoreversion ; rsg files Source: C:\develop\x\simspark\simulations\parts\rsg\*.rsg; DestDir: {app}\rsg; Flags: recursesubdirs ; support dlls Source: C:\ode\lib\releasedll\ode.dll; DestDir: {app}; Flags: ignoreversion Source: C:\ruby\bin\msvcrt-ruby18.dll; DestDir: {app}; Flags: ignoreversion [Icons] Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app} Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL} Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe} Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:37:09
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11871 Modified Files: Tag: WIN32 coretest.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: coretest.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/coretest/Attic/coretest.vcproj,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** coretest.vcproj 13 Feb 2007 19:42:39 -0000 1.1.2.5 --- coretest.vcproj 14 Feb 2007 12:37:03 -0000 1.1.2.6 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\debugdll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="2" AdditionalLibraryDirectories="" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="2" AdditionalLibraryDirectories="" *************** *** 119,123 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 119,123 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 138,142 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 138,142 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:56
|
Update of /cvsroot/simspark/simspark/spark/plugin/sexpparser In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11784/sexpparser Modified Files: Tag: WIN32 sexpparser.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: sexpparser.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sexpparser/Attic/sexpparser.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** sexpparser.vcproj 11 Feb 2007 10:41:42 -0000 1.1.2.2 --- sexpparser.vcproj 14 Feb 2007 12:36:51 -0000 1.1.2.3 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" *************** *** 118,122 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 118,122 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 137,141 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 137,141 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:55
|
Update of /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11784/rubysceneimporter Modified Files: Tag: WIN32 rubysceneimporter.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: rubysceneimporter.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/Attic/rubysceneimporter.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** rubysceneimporter.vcproj 11 Feb 2007 10:41:41 -0000 1.1.2.2 --- rubysceneimporter.vcproj 14 Feb 2007 12:36:51 -0000 1.1.2.3 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" *************** *** 118,122 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 118,122 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 137,141 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 137,141 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:55
|
Update of /cvsroot/simspark/simspark/spark/plugin/filesystemstd In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11784/filesystemstd Modified Files: Tag: WIN32 filesystemstd.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: filesystemstd.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/filesystemstd/Attic/filesystemstd.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** filesystemstd.vcproj 11 Feb 2007 10:41:41 -0000 1.1.2.2 --- filesystemstd.vcproj 14 Feb 2007 12:36:51 -0000 1.1.2.3 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,65 **** --- 62,66 ---- <Tool Name="VCLinkerTool" + AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" *************** *** 117,121 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 118,122 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 136,140 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 137,141 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:44
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11298/kerosin Modified Files: Tag: WIN32 kerosin.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: kerosin.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/Attic/kerosin.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** kerosin.vcproj 11 Feb 2007 10:40:52 -0000 1.1.2.2 --- kerosin.vcproj 14 Feb 2007 12:36:05 -0000 1.1.2.3 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 104,108 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:16
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11298/zeitgeist Modified Files: Tag: WIN32 zeitgeist.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: zeitgeist.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/Attic/zeitgeist.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** zeitgeist.vcproj 11 Feb 2007 10:41:00 -0000 1.1.2.3 --- zeitgeist.vcproj 14 Feb 2007 12:36:12 -0000 1.1.2.4 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;"C:\ruby\lib\ruby\1.8\i386-mswin32"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;"C:\ruby\lib\ruby\1.8\i386-mswin32"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 104,108 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:16
|
Update of /cvsroot/simspark/simspark/spark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11298/spark Modified Files: Tag: WIN32 spark.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: spark.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/spark/Attic/spark.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** spark.vcproj 11 Feb 2007 10:40:56 -0000 1.1.2.2 --- spark.vcproj 14 Feb 2007 12:36:12 -0000 1.1.2.3 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 104,108 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:36:16
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11298/oxygen Modified Files: Tag: WIN32 oxygen.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: oxygen.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/Attic/oxygen.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** oxygen.vcproj 13 Feb 2007 19:52:34 -0000 1.1.2.3 --- oxygen.vcproj 14 Feb 2007 12:36:06 -0000 1.1.2.4 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;..\utility" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 104,108 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\win32;..\;..\utility" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:35:54
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11173 Modified Files: Tag: WIN32 rsgedit.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: rsgedit.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/rsgedit.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** rsgedit.vcproj 13 Feb 2007 19:38:42 -0000 1.1.2.3 --- rsgedit.vcproj 14 Feb 2007 12:35:49 -0000 1.1.2.4 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\spark\win32;..\..\spark;..\..\spark\utility;..\;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\spark\win32;..\..\spark;..\..\spark\utility;..\" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\debugdll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxbase28d_xml.lib wxexpatd.lib wxmsw28d_aui.lib wxmsw28d_gl.lib wxzlibd.lib wxpngd.lib" LinkIncremental="2" AdditionalLibraryDirectories="" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib msvcrt-ruby18.lib ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxbase28d_xml.lib wxexpatd.lib wxmsw28d_aui.lib wxmsw28d_gl.lib wxzlibd.lib wxpngd.lib" LinkIncremental="2" AdditionalLibraryDirectories="" *************** *** 119,123 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\spark\win32;..\..\spark;..\..\spark\utility;..\;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 119,123 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\spark\win32;..\..\spark;..\..\spark\utility;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 138,142 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib glu32.lib glaux.lib c:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedll\ode.lib wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 138,142 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib glu32.lib glaux.lib c:\ruby\lib\msvcrt-ruby18.lib ode.lib wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:35:38
|
Update of /cvsroot/simspark/simspark/contrib/plugin/inputwx In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11113 Modified Files: Tag: WIN32 inputwx.vcproj Log Message: - remove absolute paths (ode, ruby libs and includes). Rely on local installation to propely set up these path in the IDE Index: inputwx.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/plugin/inputwx/Attic/inputwx.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** inputwx.vcproj 11 Feb 2007 10:17:37 -0000 1.1.2.1 --- inputwx.vcproj 14 Feb 2007 12:35:34 -0000 1.1.2.2 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" *************** *** 118,122 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 118,122 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 137,141 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 137,141 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-14 12:34:14
|
Update of /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9977 Modified Files: Tag: WIN32 rubysceneimporter.cpp rubysceneimporter.h Log Message: - fix type casts - make mVersionMajor and mVersionMinor int types Index: rubysceneimporter.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** rubysceneimporter.h 10 Feb 2007 19:00:55 -0000 1.2.2.1 --- rubysceneimporter.h 14 Feb 2007 12:34:09 -0000 1.2.2.2 *************** *** 112,119 **** /** the major version of the scen graph file */ ! float mVersionMajor; /** the minor version of the scen graph file */ ! float mVersionMinor; /** the last supplied fileName */ --- 112,119 ---- /** the major version of the scen graph file */ ! int mVersionMajor; /** the minor version of the scen graph file */ ! int mVersionMinor; /** the last supplied fileName */ Index: rubysceneimporter.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** rubysceneimporter.cpp 10 Feb 2007 19:00:55 -0000 1.2.2.1 --- rubysceneimporter.cpp 14 Feb 2007 12:34:08 -0000 1.2.2.2 *************** *** 114,118 **** { mFileName = S_FROMSTRING; ! return ParseScene(scene.c_str(),scene.size(),root,parameter); } --- 114,118 ---- { mFileName = S_FROMSTRING; ! return ParseScene(scene.c_str(),static_cast<int>(scene.size()),root,parameter); } *************** *** 645,649 **** // create a new variable env.parameter->AddValue(value); ! env.parameterMap[varname] = (env.parameterMap.size() - 1); } else { --- 645,649 ---- // create a new variable env.parameter->AddValue(value); ! env.parameterMap[varname] = (static_cast<int>(env.parameterMap.size()) - 1); } else { *************** *** 701,705 **** } ! int idx = env.parameterMap.size(); env.parameterMap[param] = idx; sexp = sexp->next; --- 701,705 ---- } ! int idx = static_cast<int>(env.parameterMap.size()); env.parameterMap[param] = idx; sexp = sexp->next; |
|
From: Markus R. <rol...@us...> - 2007-02-13 20:02:23
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11518 Modified Files: Tag: WIN32 odewrapper.h Log Message: - add gpl header - fix include guard - mute compiler warnings about redefined macros Index: odewrapper.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/Attic/odewrapper.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** odewrapper.h 13 Feb 2007 19:52:34 -0000 1.1.2.1 --- odewrapper.h 13 Feb 2007 20:02:14 -0000 1.1.2.2 *************** *** 1,4 **** ! #ifndef ODEWRAPPER_H ! #define ODEWRAPPER_H #undef PACKAGE --- 1,25 ---- ! /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- ! ! this file is part of rcssserver3D ! Fri May 9 2003 ! Copyright (C) 2002,2003 Koblenz University ! Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group ! $Id$ ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; version 2 of the License. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! */ ! #ifndef OXYGEN_ODEWRAPPER_H ! #define OXYGEN_ODEWRAPPER_H #undef PACKAGE *************** *** 10,13 **** --- 31,46 ---- #undef PACKAGE_BUGREPORT + #ifdef WIN32 + + #ifdef copysignf + #undef copysignf + #endif + + #ifdef copysign + #undef copysign + #endif + + #endif // WIN32 + #include <ode/ode.h> *************** *** 20,24 **** #undef PACKAGE_BUGREPORT #include <config.h> - #endif --- 53,59 ---- #undef PACKAGE_BUGREPORT + #ifdef HAVE_CONFIG_H #include <config.h> #endif + + #endif // OXYGEN_ODEWRAPPER |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:52:54
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7487/physicsserver Modified Files: Tag: WIN32 collisionhandler.h odeobject.h physicsserver.cpp physicsserver.h Added Files: Tag: WIN32 odewrapper.h Log Message: - use a wrapper to include ode.h Index: physicsserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/physicsserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** physicsserver.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- physicsserver.cpp 13 Feb 2007 19:52:34 -0000 1.1.2.1 *************** *** 21,25 **** #include "physicsserver.h" - #include <ode/ode.h> using namespace oxygen; --- 21,24 ---- Index: collisionhandler.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collisionhandler.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** collisionhandler.h 5 Dec 2005 21:16:49 -0000 1.1 --- collisionhandler.h 13 Feb 2007 19:52:34 -0000 1.1.2.1 *************** *** 24,28 **** #include <oxygen/sceneserver/basenode.h> ! #include <ode/ode.h> namespace oxygen --- 24,28 ---- #include <oxygen/sceneserver/basenode.h> ! #include "odewrapper.h" namespace oxygen --- NEW FILE: odewrapper.h --- #ifndef ODEWRAPPER_H #define ODEWRAPPER_H #undef PACKAGE #undef PACKAGE_VERSION #undef VERSION #undef PACKAGE_TARNAME #undef PACKAGE_STRING #undef PACKAGE_NAME #undef PACKAGE_BUGREPORT #include <ode/ode.h> #undef PACKAGE #undef PACKAGE_VERSION #undef VERSION #undef PACKAGE_TARNAME #undef PACKAGE_STRING #undef PACKAGE_NAME #undef PACKAGE_BUGREPORT #include <config.h> #endif Index: odeobject.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** odeobject.h 5 Dec 2005 21:16:49 -0000 1.1 --- odeobject.h 13 Feb 2007 19:52:34 -0000 1.1.2.1 *************** *** 24,28 **** #include <oxygen/sceneserver/basenode.h> ! #include <ode/ode.h> namespace oxygen --- 24,28 ---- #include <oxygen/sceneserver/basenode.h> ! #include "odewrapper.h" namespace oxygen Index: physicsserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/physicsserver.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** physicsserver.h 5 Dec 2005 21:16:49 -0000 1.1 --- physicsserver.h 13 Feb 2007 19:52:34 -0000 1.1.2.1 *************** *** 25,29 **** #include <zeitgeist/class.h> #include <zeitgeist/leaf.h> ! #include <ode/ode.h> namespace oxygen --- 25,29 ---- #include <zeitgeist/class.h> #include <zeitgeist/leaf.h> ! #include "odewrapper.h" namespace oxygen |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:52:38
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7487 Modified Files: Tag: WIN32 oxygen.vcproj Log Message: - use a wrapper to include ode.h Index: oxygen.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/Attic/oxygen.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** oxygen.vcproj 11 Feb 2007 10:40:53 -0000 1.1.2.2 --- oxygen.vcproj 13 Feb 2007 19:52:34 -0000 1.1.2.3 *************** *** 544,547 **** --- 544,551 ---- </File> <File + RelativePath=".\physicsserver\odewrapper.h" + > + </File> + <File RelativePath=".\physicsserver\physicsserver.cpp" > |
