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-05-01 13:09:38
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16313 Modified Files: collider.cpp collider.h Log Message: - use FindSpaceID() instead of GetSpaceID() in OnLink() - use GetParentSpace() in OnUnlink() to deregister from current parent space - implement GetParentSpace() using dGeomGetSpace() Index: collider.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** collider.cpp 15 Mar 2007 07:26:27 -0000 1.3 --- collider.cpp 1 May 2007 13:09:32 -0000 1.4 *************** *** 68,72 **** // if we have a space add the geom to it ! dSpaceID space = GetSpaceID(); if ( (space) && --- 68,72 ---- // if we have a space add the geom to it ! dSpaceID space = FindSpaceID(); if ( (space) && *************** *** 99,103 **** // remove collision geometry from space ! dSpaceID space = GetSpaceID(); if ( --- 99,103 ---- // remove collision geometry from space ! dSpaceID space = GetParentSpaceID(); if ( *************** *** 109,119 **** } ! if ( ! (space) && ! (dSpaceQuery(space, mODEGeom)) ! ) ! { ! dSpaceRemove(space, mODEGeom); ! } } --- 109,116 ---- } ! if (space) ! { ! dSpaceRemove(space, mODEGeom); ! } } *************** *** 225,228 **** --- 222,235 ---- } + dSpaceID Collider::GetParentSpaceID() + { + if (mODEGeom == 0) + { + return 0; + } + + return dGeomGetSpace(mODEGeom); + } + bool Collider::Intersects(boost::shared_ptr<Collider> collider) { Index: collider.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/collider.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** collider.h 15 Mar 2007 07:26:27 -0000 1.3 --- collider.h 1 May 2007 13:09:32 -0000 1.4 *************** *** 112,115 **** --- 112,118 ---- bool Intersects(boost::shared_ptr<Collider> collider); + /** returns the ODE handle ID of the containing parent space */ + virtual dSpaceID GetParentSpaceID(); + protected: /** registers the managed geom to the Space of the Scene and to |
|
From: Markus R. <rol...@us...> - 2007-05-01 13:07:35
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15535 Modified Files: odeobject.cpp odeobject.h Log Message: - renamed GetSpaceID() to FindSpaceID(). This method finds the proper space to register a new ODEObject to. - added method GetSpaceID(). This method returns the current space the ODEObject is registered to. Index: odeobject.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odeobject.cpp 15 Mar 2007 07:26:27 -0000 1.2 --- odeobject.cpp 1 May 2007 13:07:29 -0000 1.3 *************** *** 63,66 **** --- 63,74 ---- shared_ptr<Space> ODEObject::GetSpace() { + // try to find the nearest parent space object + weak_ptr<Space> parentSpace = FindParentSupportingClass<Space>(); + if (! parentSpace.expired()) + { + return parentSpace.lock(); + } + + // return the global space instance shared_ptr<Scene> scene = GetScene(); if (scene.get() == 0) *************** *** 98,102 **** } ! dSpaceID ODEObject::GetSpaceID() { shared_ptr<Space> space = GetSpace(); --- 106,110 ---- } ! dSpaceID ODEObject::FindSpaceID() { shared_ptr<Space> space = GetSpace(); *************** *** 117,120 **** --- 125,133 ---- } + dSpaceID ODEObject::GetParentSpaceID() + { + return 0; + } + void ODEObject::ConvertRotationMatrix(const salt::Matrix& rot, dMatrix3& matrix) { Index: odeobject.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odeobject.h 15 Mar 2007 07:26:27 -0000 1.2 --- odeobject.h 1 May 2007 13:07:30 -0000 1.3 *************** *** 51,56 **** dWorldID GetWorldID(); ! /** returns the ODE space handle */ ! dSpaceID GetSpaceID(); /** destroy the managed ODE object */ --- 51,59 ---- dWorldID GetWorldID(); ! /** returns the nearest parent space ODE handle */ ! dSpaceID FindSpaceID(); ! ! /** returns the ODE handle ID of the containing parent space */ ! virtual dSpaceID GetParentSpaceID(); /** destroy the managed ODE object */ *************** *** 61,65 **** boost::shared_ptr<World> GetWorld(); ! /** returns the space node */ boost::shared_ptr<Space> GetSpace(); --- 64,68 ---- boost::shared_ptr<World> GetWorld(); ! /** finds the nearest parent space node */ boost::shared_ptr<Space> GetSpace(); |
|
From: Markus R. <rol...@us...> - 2007-05-01 11:01:19
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28288 Modified Files: Tag: RSGEDIT_FILEREF propertylist.cpp Log Message: - properly suppress flicker using the wxListCtrl Freeze/Thaw Api Index: propertylist.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/propertylist.cpp,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** propertylist.cpp 22 Jan 2006 17:24:45 -0000 1.1 --- propertylist.cpp 1 May 2007 11:01:12 -0000 1.1.4.1 *************** *** 90,93 **** --- 90,94 ---- } + mCtrList->Freeze(); bool valRefresh = *************** *** 111,115 **** if (valRefresh) { ! // just refresh values to prevent flicker mCtrList->SetItem(line, 1, entry.value); } else --- 112,116 ---- if (valRefresh) { ! // just refresh values mCtrList->SetItem(line, 1, entry.value); } else *************** *** 122,124 **** --- 123,127 ---- ++line; } + + mCtrList->Thaw(); } |
|
From: Markus R. <rol...@us...> - 2007-05-01 11:00:46
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27939 Modified Files: Tag: RSGEDIT_FILEREF propertyframe.cpp rsgedit.wxg Log Message: - increase the property frame size Index: rsgedit.wxg =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.wxg,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** rsgedit.wxg 15 Mar 2007 07:26:24 -0000 1.5 --- rsgedit.wxg 1 May 2007 11:00:41 -0000 1.5.2.1 *************** *** 1,4 **** <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Tue Mar 06 22:13:36 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"> --- 1,4 ---- <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Tue May 01 10:32:21 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"> *************** *** 180,184 **** <style>wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxSYSTEM_MENU|wxRESIZE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT|wxCLIP_CHILDREN</style> <title>frame_1</title> ! <size>300, 150</size> <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 180,184 ---- <style>wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxSYSTEM_MENU|wxRESIZE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT|wxCLIP_CHILDREN</style> <title>frame_1</title> ! <size>400, 150</size> <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer"> <orient>wxVERTICAL</orient> Index: propertyframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/propertyframe.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** propertyframe.cpp 15 Mar 2007 07:26:24 -0000 1.3 --- propertyframe.cpp 1 May 2007 11:00:41 -0000 1.3.2.1 *************** *** 48,52 **** // begin wxGlade: propertyframe::set_properties SetTitle(wxT("frame_1")); ! SetSize(wxSize(300, 150)); // end wxGlade } --- 48,52 ---- // begin wxGlade: propertyframe::set_properties SetTitle(wxT("frame_1")); ! SetSize(wxSize(400, 150)); // end wxGlade } |
|
From: Markus R. <rol...@us...> - 2007-05-01 08:28:45
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6247 Modified Files: Tag: RSGEDIT_FILEREF leaf.cpp leaf.h node.cpp node.h Log Message: - added member GetNumberOfChildren() to node that returns the total number of children - modified SetParent() to care for a uniqe name among sibling nodes. If another sibling with the same name exists the current number of children is appended to the node name. If mporter classes create nodes in a stable order this also assures consistent node names through simulation restarts Index: node.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/node.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** node.h 5 Dec 2005 20:59:18 -0000 1.1 --- node.h 1 May 2007 08:28:39 -0000 1.1.6.1 *************** *** 83,86 **** --- 83,89 ---- virtual bool IsLeaf() const; + /** returns the total number of children */ + virtual int GetNumberOfChildren() const; + /** update variables from a script */ virtual void UpdateCached(); *************** *** 131,150 **** boost::shared_ptr<Node> node = boost::shared_static_cast<Node>(make_shared(GetParent())); ! while (node.get() != 0) { boost::shared_ptr<CLASS> test = boost::shared_dynamic_cast<CLASS>(node); ! if (test.get() != 0) { return test; } ! //node = boost::shared_static_cast<Node>(make_shared(node->GetParent())); node = boost::shared_static_cast<Node>(node->GetParent().lock()); ! } ! return boost::shared_ptr<CLASS>(); } --- 134,153 ---- boost::shared_ptr<Node> node = boost::shared_static_cast<Node>(make_shared(GetParent())); ! while (node.get() != 0) { boost::shared_ptr<CLASS> test = boost::shared_dynamic_cast<CLASS>(node); ! if (test.get() != 0) { return test; } ! //node = boost::shared_static_cast<Node>(make_shared(node->GetParent())); node = boost::shared_static_cast<Node>(node->GetParent().lock()); ! } ! return boost::shared_ptr<CLASS>(); } Index: leaf.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/leaf.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** leaf.cpp 15 Mar 2007 07:26:31 -0000 1.2 --- leaf.cpp 1 May 2007 08:28:39 -0000 1.2.2.1 *************** *** 23,26 **** --- 23,27 ---- #include "node.h" #include <iostream> + #include <sstream> using namespace boost; *************** *** 112,115 **** --- 113,122 ---- } + int + Leaf::GetNumberOfChildren() const + { + return 0; + } + bool Leaf::IsLeaf() const { *************** *** 199,209 **** void Leaf::SetParent(const boost::shared_ptr<Node> &newParent) { ! shared_ptr<Node> oldParent = make_shared(GetParent()); if (oldParent.get() != 0) { // we have a parent, so update our state - shared_ptr<Leaf> self - = shared_static_cast<Leaf>(make_shared(GetSelf())); - // here reference count should be > 1 (at least one in the // parent, and one in this routine) --- 206,215 ---- void Leaf::SetParent(const boost::shared_ptr<Node> &newParent) { ! shared_ptr<Node> oldParent = GetParent().lock(); ! shared_ptr<Leaf> self = shared_static_cast<Leaf>(GetSelf().lock()); ! if (oldParent.get() != 0) { // we have a parent, so update our state // here reference count should be > 1 (at least one in the // parent, and one in this routine) *************** *** 229,237 **** mParent = newParent; ! if (! mParent.expired()) { ! // we have been linked, so now we can do something :) ! OnLink(); } } --- 235,255 ---- mParent = newParent; ! if (newParent.get() == 0) { ! return; ! } ! ! // assure a unique name among our siblings ! shared_ptr<Leaf> sibling = newParent->GetChild(mName); ! ! if (sibling != self) ! { ! stringstream ss; ! ss << mName << "_" << newParent->GetNumberOfChildren() << ">"; ! mName = ss.str().c_str(); } + + // we have been linked, so now we can do something :) + OnLink(); } Index: leaf.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/leaf.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** leaf.h 15 Mar 2007 07:26:31 -0000 1.2 --- leaf.h 1 May 2007 08:28:39 -0000 1.2.2.1 *************** *** 220,223 **** --- 220,226 ---- virtual bool IsLeaf() const; + /** returns the total number of children */ + virtual int GetNumberOfChildren() const; + /** removes base from the set of children. */ virtual void RemoveChildReference(const boost::shared_ptr<Leaf> &base); Index: node.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/node.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** node.cpp 15 Mar 2007 07:26:31 -0000 1.2 --- node.cpp 1 May 2007 08:28:39 -0000 1.2.2.1 *************** *** 184,187 **** --- 184,193 ---- } + int + Node::GetNumberOfChildren() const + { + return static_cast<int>(mChildren.size()); + } + bool Node::IsLeaf() const |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:55:09
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21465 Modified Files: Tag: RSGEDIT_FILEREF mainframe.cpp Log Message: - highlight the selected scene node in the tree control Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -C2 -d -r1.16.2.3 -r1.16.2.4 *** mainframe.cpp 29 Apr 2007 16:32:15 -0000 1.16.2.3 --- mainframe.cpp 29 Apr 2007 16:55:00 -0000 1.16.2.4 *************** *** 958,967 **** case SparkContextEvent::T_SELECTION_CHANGED: ! // redraw gl canvas ! bool swapBuffers = true; ! wxClientDC dc(this); ! mCanvas->Render(dc, swapBuffers); ! mSparkTree.SelectLeaf(SparkContext::GetInstance().GetSelection()); ! break; } } --- 958,978 ---- case SparkContextEvent::T_SELECTION_CHANGED: ! { ! // redraw gl canvas ! bool swapBuffers = true; ! wxClientDC dc(this); ! mCanvas->Render(dc, swapBuffers); ! ! weak_ptr<Leaf> leaf = SparkContext::GetInstance().GetSelection(); ! if (mSparkTree.SelectLeaf(leaf)) ! { ! mSparkTree.MarkItem(mCtrTree->GetSelection()); ! } else ! { ! mSparkTree.MarkItem(wxTreeItemId()); ! } ! ! break; ! } } } |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:54:18
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21430 Modified Files: Tag: RSGEDIT_FILEREF sparktree.cpp sparktree.h Log Message: - added method MarkItem() and MarkItemInternal() - added member mLastMarkedNode - implement highlighting of a tree node to mirror the OpenGL selection Index: sparktree.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** sparktree.h 15 Apr 2007 11:48:42 -0000 1.4 --- sparktree.h 29 Apr 2007 16:54:14 -0000 1.4.2.1 *************** *** 54,60 **** --- 54,63 ---- bool SelectLeaf(boost::weak_ptr<zeitgeist::Leaf> leaf); + void MarkItem(const wxTreeItemId id); + protected: void SetItemData(wxTreeItemId id, boost::weak_ptr<zeitgeist::Leaf> leaf); ItemData* GetItemData(wxTreeItemId id); + void MarkItemInternal(const wxTreeItemId id, bool mark); protected: *************** *** 62,65 **** --- 65,69 ---- boost::shared_ptr<zeitgeist::Core> mCore; wxTreeItemId mRootId; + wxTreeItemId mLastMarkedNode; }; Index: sparktree.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** sparktree.cpp 25 Apr 2007 20:08:43 -0000 1.7 --- sparktree.cpp 29 Apr 2007 16:54:14 -0000 1.7.2.1 *************** *** 262,263 **** --- 262,287 ---- return true; } + + void SparkTree::MarkItemInternal(const wxTreeItemId id, bool mark) + { + if (! id.IsOk()) + { + return; + } + if (mark) + { + mTree->SetItemTextColour(id, wxColour(230, 26, 230)); + mTree->SetItemBold(id,true); + } else + { + mTree->SetItemTextColour(id, wxNullColour); + mTree->SetItemBold(id,false); + } + } + + void SparkTree::MarkItem(const wxTreeItemId id) + { + MarkItemInternal(mLastMarkedNode,false); + MarkItemInternal(id, true); + mLastMarkedNode = id; + } |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:32:40
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12566 Modified Files: Tag: RSGEDIT_FILEREF sparkcontext.cpp Log Message: - add copy file and node path entries to context menu Index: sparkcontext.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkcontext.cpp,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** sparkcontext.cpp 29 Apr 2007 16:14:53 -0000 1.3.2.2 --- sparkcontext.cpp 29 Apr 2007 16:32:37 -0000 1.3.2.3 *************** *** 95,109 **** long style = 0; wxMenu* menu(new wxMenu(leaf.lock()->GetFullPath(), 0)); ! menu->Append(ID_CONTEXT_PROPERTIES, wxT("&Properties")); const SceneDict::FileRef* ref = SceneDict::GetInstance().Lookup(leaf); if (ref != 0) { ! wxString entry(wxT("&Edit source file (")); ! entry += ref->fname.c_str(); ! entry += wxString::Format(":%d)",ref->line); ! menu->Append(ID_CONTEXT_EDIT_SOURCE, entry); } return menu; } --- 95,112 ---- long style = 0; wxMenu* menu(new wxMenu(leaf.lock()->GetFullPath(), 0)); ! ! menu->Append(ID_CONTEXT_COPY_PATH, wxT("&Copy node path")); const SceneDict::FileRef* ref = SceneDict::GetInstance().Lookup(leaf); if (ref != 0) { ! menu->AppendSeparator(); ! menu->Append(ID_CONTEXT_COPY_FILENAME, wxT("C&opy filename")); ! menu->Append(ID_CONTEXT_EDIT_SOURCE, wxT("&Edit source file")); } + menu->AppendSeparator(); + menu->Append(ID_CONTEXT_PROPERTIES, wxT("&Properties")); + return menu; } |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:32:18
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12531 Modified Files: Tag: RSGEDIT_FILEREF mainframe.cpp mainframe.h Log Message: - handle ID_CONTEXT_COPY_FILENAME and ID_CONTEXT_COPY_PATH - copy full node path and filename of associated rsg file to clipboard Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** mainframe.h 29 Apr 2007 16:13:10 -0000 1.12.2.2 --- mainframe.h 29 Apr 2007 16:32:15 -0000 1.12.2.3 *************** *** 28,31 **** --- 28,32 ---- #include "sparktree.h" #include "propertylist.h" + #include <oxygen/sceneserver/scenedict.h> #ifndef MAINFRAME_H *************** *** 103,106 **** --- 104,109 ---- void OnContextProperties(wxCommandEvent& event); void OnContextEditSource(wxCommandEvent& event); + void OnContextCopyFileName(wxCommandEvent& event); + void OnContextCopyPath(wxCommandEvent& event); void OnExit(wxCommandEvent& event); *************** *** 151,154 **** --- 154,163 ---- void EditFile(const wxString& fname, int line); + /** lookup the FileRef for the context node */ + const oxygen::SceneDict::FileRef* GetContextFileRef(); + + /** copy the given string to the sytem clipboard */ + void CopyToClipboard(const wxString& str) const; + protected: // begin wxGlade: mainframe::attributes Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -C2 -d -r1.16.2.2 -r1.16.2.3 *** mainframe.cpp 29 Apr 2007 16:13:09 -0000 1.16.2.2 --- mainframe.cpp 29 Apr 2007 16:32:15 -0000 1.16.2.3 *************** *** 28,31 **** --- 28,32 ---- #include <wx/mimetype.h> #include <wx/filedlg.h> + #include <wx/clipbrd.h> #include <rsgedit/res/xpm_play.xpm> *************** *** 46,50 **** #include <oxygen/sceneserver/sceneserver.h> #include <oxygen/sceneserver/fpscontroller.h> - #include <oxygen/sceneserver/scenedict.h> #include <kerosin/inputserver/inputcontrol.h> #include "simspark.h" --- 47,50 ---- *************** *** 82,85 **** --- 82,87 ---- EVT_MENU(ID_CONTEXT_PROPERTIES, mainframe::OnContextProperties) EVT_MENU(ID_CONTEXT_EDIT_SOURCE, mainframe::OnContextEditSource) + EVT_MENU(ID_CONTEXT_COPY_FILENAME, mainframe::OnContextCopyFileName) + EVT_MENU(ID_CONTEXT_COPY_PATH, mainframe::OnContextCopyPath) EVT_TIMER(TI_LOG, mainframe::OnLogTimer) *************** *** 648,651 **** --- 650,679 ---- void mainframe::OnContextEditSource(wxCommandEvent& event) { + const SceneDict::FileRef* ref = GetContextFileRef(); + if (ref == 0) + { + assert(false); + return; + } + + EditFile(ref->fname, ref->line); + } + + void mainframe::OnContextCopyFileName(wxCommandEvent& event) + { + const SceneDict::FileRef* ref = GetContextFileRef(); + if (ref == 0) + { + assert(false); + return; + } + + wxFileName fn(ref->fname.c_str()); + fn.Normalize(); + CopyToClipboard(fn.GetFullPath()); + } + + void mainframe::OnContextCopyPath(wxCommandEvent& event) + { weak_ptr<Leaf> leaf = SparkContext::GetInstance().GetContextNode(); if (leaf.expired()) *************** *** 655,667 **** } ! const SceneDict::FileRef* ref = SceneDict::GetInstance().Lookup(leaf); ! if (ref == 0) ! { ! assert(false); ! return; ! } ! EditFile(ref->fname, ref->line); } --- 683,706 ---- } + CopyToClipboard(leaf.lock()->GetFullPath()); + } ! const SceneDict::FileRef* mainframe::GetContextFileRef() ! { ! weak_ptr<Leaf> leaf = SparkContext::GetInstance().GetContextNode(); ! if (leaf.expired()) ! { ! assert(false); ! return 0; ! } ! return SceneDict::GetInstance().Lookup(leaf); ! } ! ! void mainframe::CopyToClipboard(const wxString& str) const ! { ! wxTheClipboard->Open(); ! wxTheClipboard->SetData(new wxTextDataObject(str)); ! wxTheClipboard->Close(); } |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:29:49
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11354 Modified Files: Tag: RSGEDIT_FILEREF constants.h Log Message: - add ID_CONTEXT_COPY_FILENAME and ID_CONTEXT_COPY_PATH constants Index: constants.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/constants.h,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** constants.h 29 Apr 2007 16:11:57 -0000 1.5.2.2 --- constants.h 29 Apr 2007 16:29:45 -0000 1.5.2.3 *************** *** 51,55 **** ID_CONTEXT_PROPERTIES = (wxID_HIGHEST+30), ! ID_CONTEXT_EDIT_SOURCE = (wxID_HIGHEST+31) }; --- 51,57 ---- ID_CONTEXT_PROPERTIES = (wxID_HIGHEST+30), ! ID_CONTEXT_EDIT_SOURCE = (wxID_HIGHEST+31), ! ID_CONTEXT_COPY_FILENAME = (wxID_HIGHEST+32), ! ID_CONTEXT_COPY_PATH = (wxID_HIGHEST+33) }; |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:14:56
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5351 Modified Files: Tag: RSGEDIT_FILEREF sparkcontext.cpp Log Message: - check if a rsg file is assciated with the context node and insert an 'edit file...' entry to the context menu Index: sparkcontext.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkcontext.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** sparkcontext.cpp 29 Apr 2007 15:32:36 -0000 1.3.2.1 --- sparkcontext.cpp 29 Apr 2007 16:14:53 -0000 1.3.2.2 *************** *** 23,28 **** --- 23,30 ---- #include <wx/menu.h> #include <zeitgeist/leaf.h> + #include <oxygen/sceneserver/scenedict.h> using namespace zeitgeist; + using namespace oxygen; using namespace boost; *************** *** 95,98 **** --- 97,109 ---- menu->Append(ID_CONTEXT_PROPERTIES, wxT("&Properties")); + const SceneDict::FileRef* ref = SceneDict::GetInstance().Lookup(leaf); + if (ref != 0) + { + wxString entry(wxT("&Edit source file (")); + entry += ref->fname.c_str(); + entry += wxString::Format(":%d)",ref->line); + menu->Append(ID_CONTEXT_EDIT_SOURCE, entry); + } + return menu; } |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:14:04
|
Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4920 Modified Files: Tag: RSGEDIT_FILEREF scenedict.cpp scenedict.h Log Message: - fix typo Index: scenedict.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/Attic/scenedict.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 *** scenedict.h 25 Apr 2007 20:28:31 -0000 1.1.2.1 --- scenedict.h 29 Apr 2007 16:14:00 -0000 1.1.2.2 *************** *** 50,54 **** static SceneDict& GetInstance(); ! const FileRef* Loookup(boost::weak_ptr<zeitgeist::Leaf> leaf); void Insert(boost::weak_ptr<zeitgeist::Leaf> leaf, const FileRef& ref); void Clear(); --- 50,54 ---- static SceneDict& GetInstance(); ! const FileRef* Lookup(boost::weak_ptr<zeitgeist::Leaf> leaf); void Insert(boost::weak_ptr<zeitgeist::Leaf> leaf, const FileRef& ref); void Clear(); Index: scenedict.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/Attic/scenedict.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 *** scenedict.cpp 25 Apr 2007 20:28:31 -0000 1.1.2.1 --- scenedict.cpp 29 Apr 2007 16:14:00 -0000 1.1.2.2 *************** *** 36,40 **** } ! const SceneDict::FileRef* SceneDict::Loookup(boost::weak_ptr<zeitgeist::Leaf> leaf) { if (leaf.expired()) --- 36,40 ---- } ! const SceneDict::FileRef* SceneDict::Lookup(boost::weak_ptr<zeitgeist::Leaf> leaf) { if (leaf.expired()) |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:13:55
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4901 Modified Files: Tag: RSGEDIT_FILEREF property.cpp Log Message: - fix typo Index: property.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/property.cpp,v retrieving revision 1.8.4.1 retrieving revision 1.8.4.2 diff -C2 -d -r1.8.4.1 -r1.8.4.2 *** property.cpp 25 Apr 2007 20:34:27 -0000 1.8.4.1 --- property.cpp 29 Apr 2007 16:13:52 -0000 1.8.4.2 *************** *** 120,124 **** const SceneDict::FileRef* ref ! = SceneDict::GetInstance().Loookup(leaf); if (ref == 0) --- 120,124 ---- const SceneDict::FileRef* ref ! = SceneDict::GetInstance().Lookup(leaf); if (ref == 0) |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:13:15
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4853 Modified Files: Tag: RSGEDIT_FILEREF mainframe.cpp mainframe.h Log Message: - handle ID_CONTEXT_EDIT_SOURCE event - lookup application registered for text/plain mime type and use it to open the rsg file associated with the context node Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** mainframe.h 29 Apr 2007 15:33:59 -0000 1.12.2.1 --- mainframe.h 29 Apr 2007 16:13:10 -0000 1.12.2.2 *************** *** 102,105 **** --- 102,106 ---- void OnContextProperties(wxCommandEvent& event); + void OnContextEditSource(wxCommandEvent& event); void OnExit(wxCommandEvent& event); *************** *** 147,150 **** --- 148,153 ---- void UpdateCached(); + /** edit the given file starting at the given line */ + void EditFile(const wxString& fname, int line); protected: Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -C2 -d -r1.16.2.1 -r1.16.2.2 *** mainframe.cpp 29 Apr 2007 15:33:59 -0000 1.16.2.1 --- mainframe.cpp 29 Apr 2007 16:13:09 -0000 1.16.2.2 *************** *** 26,29 **** --- 26,30 ---- #include <wx/filename.h> + #include <wx/mimetype.h> #include <wx/filedlg.h> *************** *** 45,48 **** --- 46,50 ---- #include <oxygen/sceneserver/sceneserver.h> #include <oxygen/sceneserver/fpscontroller.h> + #include <oxygen/sceneserver/scenedict.h> #include <kerosin/inputserver/inputcontrol.h> #include "simspark.h" *************** *** 79,82 **** --- 81,85 ---- EVT_MENU(ID_CONTEXT_PROPERTIES, mainframe::OnContextProperties) + EVT_MENU(ID_CONTEXT_EDIT_SOURCE, mainframe::OnContextEditSource) EVT_TIMER(TI_LOG, mainframe::OnLogTimer) *************** *** 610,614 **** return; } ! PopupMenu(context); } --- 613,617 ---- return; } ! PopupMenu(context); } *************** *** 643,646 **** --- 646,689 ---- } + void mainframe::OnContextEditSource(wxCommandEvent& event) + { + weak_ptr<Leaf> leaf = SparkContext::GetInstance().GetContextNode(); + if (leaf.expired()) + { + assert(false); + return; + } + + + const SceneDict::FileRef* ref = SceneDict::GetInstance().Lookup(leaf); + if (ref == 0) + { + assert(false); + return; + } + + EditFile(ref->fname, ref->line); + } + + void mainframe::EditFile(const wxString& fname, int line) + { + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromMimeType("text/plain"); + if (ft == 0) + { + return; + } + + wxFileName fn(fname); + fn.Normalize(); + + wxString cmd = ft->GetOpenCommand(fn.GetFullPath()); + if (cmd.IsEmpty()) + { + return; + } + + wxExecute(cmd); + } + void mainframe::RefreshProperties() { |
|
From: Markus R. <rol...@us...> - 2007-04-29 16:12:01
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4092 Modified Files: Tag: RSGEDIT_FILEREF constants.h Log Message: - add ID_CONTEXT_EDIT_SOURCE constant Index: constants.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/constants.h,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** constants.h 29 Apr 2007 15:31:17 -0000 1.5.2.1 --- constants.h 29 Apr 2007 16:11:57 -0000 1.5.2.2 *************** *** 50,54 **** ID_SPARK_CONTEXT = (wxID_HIGHEST+29), ! ID_CONTEXT_PROPERTIES = (wxID_HIGHEST+30) }; --- 50,55 ---- ID_SPARK_CONTEXT = (wxID_HIGHEST+29), ! ID_CONTEXT_PROPERTIES = (wxID_HIGHEST+30), ! ID_CONTEXT_EDIT_SOURCE = (wxID_HIGHEST+31) }; |
|
From: Markus R. <rol...@us...> - 2007-04-29 15:34:07
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21445 Modified Files: Tag: RSGEDIT_FILEREF mainframe.cpp mainframe.h Log Message: - show a context menu when the user right clicks on a node in the scene tree control Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** mainframe.h 15 Apr 2007 11:16:11 -0000 1.12 --- mainframe.h 29 Apr 2007 15:33:59 -0000 1.12.2.1 *************** *** 101,104 **** --- 101,106 ---- void OnHelpAbout(wxCommandEvent& event); + void OnContextProperties(wxCommandEvent& event); + void OnExit(wxCommandEvent& event); void OnClose( wxCloseEvent& event ); Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** mainframe.cpp 15 Apr 2007 11:49:06 -0000 1.16 --- mainframe.cpp 29 Apr 2007 15:33:59 -0000 1.16.2.1 *************** *** 78,81 **** --- 78,83 ---- EVT_MENU(ID_HELP_ABOUT, mainframe::OnHelpAbout) + EVT_MENU(ID_CONTEXT_PROPERTIES, mainframe::OnContextProperties) + EVT_TIMER(TI_LOG, mainframe::OnLogTimer) EVT_TIMER(TI_FPS, mainframe::OnFPSTimer) *************** *** 602,616 **** { shared_ptr<Leaf> leaf = mSparkTree.GetLeaf(event.GetItem()).lock(); ! if (leaf.get() == 0) { return; } ! ! wxString location(leaf->GetFullPath().c_str(), wxConvUTF8); ! ! propertyframe* frame(new propertyframe(this, wxID_ANY, location)); ! frame->SetLeaf(leaf); ! frame->SetTitle(location); ! frame->Show(); } --- 604,615 ---- { shared_ptr<Leaf> leaf = mSparkTree.GetLeaf(event.GetItem()).lock(); ! wxMenu* context = SparkContext::GetInstance().GetContextMenu(leaf); ! ! if (context == 0) { return; } ! ! PopupMenu(context); } *************** *** 626,629 **** --- 625,646 ---- } + + void mainframe::OnContextProperties(wxCommandEvent& event) + { + weak_ptr<Leaf> leaf = SparkContext::GetInstance().GetContextNode(); + if (leaf.expired()) + { + assert(false); + return; + } + + wxString location(leaf.lock()->GetFullPath().c_str(), wxConvUTF8); + + propertyframe* frame(new propertyframe(this, wxID_ANY, location)); + frame->SetLeaf(leaf); + frame->SetTitle(location); + frame->Show(); + } + void mainframe::RefreshProperties() { |
|
From: Markus R. <rol...@us...> - 2007-04-29 15:32:40
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21044 Modified Files: Tag: RSGEDIT_FILEREF sparkcontext.cpp sparkcontext.h Log Message: - added member mContextNode - added method GetContextMenu() and GetContextNode() Index: sparkcontext.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkcontext.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** sparkcontext.h 15 Apr 2007 11:17:10 -0000 1.3 --- sparkcontext.h 29 Apr 2007 15:32:36 -0000 1.3.2.1 *************** *** 30,33 **** --- 30,34 ---- class wxEvtHandler; + class wxMenu; class SparkContext *************** *** 45,48 **** --- 46,52 ---- int GetEventId(); + wxMenu* GetContextMenu(boost::weak_ptr<zeitgeist::Leaf> leaf); + boost::weak_ptr<zeitgeist::Leaf> GetContextNode() const; + private: SparkContext(); *************** *** 52,55 **** --- 56,62 ---- boost::weak_ptr<zeitgeist::Leaf> mSelectedNode; + //! the node that context menu commands refer to + boost::weak_ptr<zeitgeist::Leaf> mContextNode; + //! assigned event notification target wxEvtHandler* mEventHandler; Index: sparkcontext.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkcontext.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** sparkcontext.cpp 15 Apr 2007 11:17:08 -0000 1.3 --- sparkcontext.cpp 29 Apr 2007 15:32:36 -0000 1.3.2.1 *************** *** 20,23 **** --- 20,26 ---- #include "sparkcontext.h" #include "sparkcontextevent.h" + #include "constants.h" + #include <wx/menu.h> + #include <zeitgeist/leaf.h> using namespace zeitgeist; *************** *** 77,78 **** --- 80,103 ---- return mEventId; } + + wxMenu* SparkContext::GetContextMenu(weak_ptr<Leaf> leaf) + { + if (leaf.expired()) + { + assert(false); + return 0; + } + + mContextNode = leaf; + + long style = 0; + wxMenu* menu(new wxMenu(leaf.lock()->GetFullPath(), 0)); + menu->Append(ID_CONTEXT_PROPERTIES, wxT("&Properties")); + + return menu; + } + + weak_ptr<Leaf> SparkContext::GetContextNode() const + { + return mContextNode; + } |
|
From: Markus R. <rol...@us...> - 2007-04-29 15:31:22
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20613 Modified Files: Tag: RSGEDIT_FILEREF constants.h Log Message: - define ID_CONTEXT_PROPERTIES Index: constants.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/constants.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** constants.h 15 Apr 2007 12:18:20 -0000 1.5 --- constants.h 29 Apr 2007 15:31:17 -0000 1.5.2.1 *************** *** 48,52 **** ID_AGENT_KILL = (wxID_HIGHEST+28), ! ID_SPARK_CONTEXT = (wxID_HIGHEST+29) }; --- 48,54 ---- ID_AGENT_KILL = (wxID_HIGHEST+28), ! ID_SPARK_CONTEXT = (wxID_HIGHEST+29), ! ! ID_CONTEXT_PROPERTIES = (wxID_HIGHEST+30) }; |
|
From: Markus R. <rol...@us...> - 2007-04-26 17:54:27
|
Update of /cvsroot/simspark/simspark/simulations/parts/rsg/agent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27244 Modified Files: soccerbot.rsg Log Message: - sync with rcssserver3d cvs Index: soccerbot.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/agent/soccerbot.rsg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** soccerbot.rsg 15 Mar 2007 07:26:25 -0000 1.2 --- soccerbot.rsg 26 Apr 2007 17:54:24 -0000 1.3 *************** *** 80,84 **** ; head (define $HeadRadius 0.39) ! (define $HeadMass 0.00000001) ; neck --- 80,84 ---- ; head (define $HeadRadius 0.39) ! (define $HeadMass 0.3) ; neck *************** *** 132,136 **** (setName body) (setLocalPos $TorsoPosX $TorsoPosY $TorsoPosZ) ! (importScene rsg/boxspheres/box.rsg $TorsoBox1Length $TorsoBox1Width $TorsoBox1Height $TorsoBox1Mass matGrey) ; install a node holding agent state data --- 132,136 ---- (setName body) (setLocalPos $TorsoPosX $TorsoPosY $TorsoPosZ) ! (importScene rsg/boxspheres/box.rsg $TorsoBox1Length $TorsoBox1Width $TorsoBox1Height $TorsoBox1Mass matMagenta) ; install a node holding agent state data *************** *** 153,157 **** (setLocalRotation 0 90 0) (node CCylinder ! (setMaterial matGrey) (setParams $TorsoCylinderRadius $TorsoCylinderLength) ) --- 153,157 ---- (setLocalRotation 0 90 0) (node CCylinder ! (setMaterial matDarkGrey) (setParams $TorsoCylinderRadius $TorsoCylinderLength) ) *************** *** 162,166 **** (setLocalRotation 0 90 0) (node CCylinder ! (setMaterial matGrey) (setParams $TorsoCylinderRadius $TorsoCylinderLength) ) --- 162,166 ---- (setLocalRotation 0 90 0) (node CCylinder ! (setMaterial matDarkGrey) (setParams $TorsoCylinderRadius $TorsoCylinderLength) ) *************** *** 178,182 **** (eval $TorsoPosY + 0.05) (eval $TorsoPosZ + 0.1 + (eval $TorsoBox1Height / 2.0) + (eval $HeadRadius / 2.0))) ! (importScene rsg/boxspheres/sphere.rsg $HeadRadius $HeadMass matLightBlue) ; install hinge joint to connect to the neck --- 178,182 ---- (eval $TorsoPosY + 0.05) (eval $TorsoPosZ + 0.1 + (eval $TorsoBox1Height / 2.0) + (eval $HeadRadius / 2.0))) ! (importScene rsg/boxspheres/sphere.rsg $HeadRadius $HeadMass matGrey) ; install hinge joint to connect to the neck *************** *** 217,221 **** (setName leftshoulder) (setLocalPos $LeftShoulderPosX $LeftShoulderPosY $LeftShoulderPosZ) ! (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matRed) ; install universal joint to connect to the torso --- 217,221 ---- (setName leftshoulder) (setLocalPos $LeftShoulderPosX $LeftShoulderPosY $LeftShoulderPosZ) ! (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matDarkGrey) ; install universal joint to connect to the torso *************** *** 246,250 **** (setName rightshoulder) (setLocalPos $RightShoulderPosX $RightShoulderPosY $RightShoulderPosZ) ! (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matRed) (setLocalRotation 0 0 180) --- 246,250 ---- (setName rightshoulder) (setLocalPos $RightShoulderPosX $RightShoulderPosY $RightShoulderPosZ) ! (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matDarkGrey) (setLocalRotation 0 0 180) *************** *** 286,290 **** (setName leftupperarm) (setLocalPos $LeftUpperArmPosX $LeftUpperArmPosY $LeftUpperArmPosZ) ! (importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matLightBlue) ; install hinge joint to connect to the shoulder --- 286,290 ---- (setName leftupperarm) (setLocalPos $LeftUpperArmPosX $LeftUpperArmPosY $LeftUpperArmPosZ) ! (importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matGrey) ; install hinge joint to connect to the shoulder *************** *** 323,327 **** (setName rightupperarm) (setLocalPos $RightUpperArmPosX $RightUpperArmPosY $RightUpperArmPosZ) ! (importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matLightBlue) ;(setLocalRotation 180 0 0) --- 323,327 ---- (setName rightupperarm) (setLocalPos $RightUpperArmPosX $RightUpperArmPosY $RightUpperArmPosZ) ! (importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matGrey) ;(setLocalRotation 180 0 0) *************** *** 379,383 **** (setName leftlowerarm) (setLocalPos $LeftLowerArmPosX $LeftLowerArmPosY $LeftLowerArmPosZ) ! (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matGrey) ; install hinge joint to connect to the upper arm --- 379,383 ---- (setName leftlowerarm) (setLocalPos $LeftLowerArmPosX $LeftLowerArmPosY $LeftLowerArmPosZ) ! (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matDarkGrey) ; install hinge joint to connect to the upper arm *************** *** 441,445 **** (setLocalPos $RightLowerArmPosX $RightLowerArmPosY $RightLowerArmPosZ) ;(setLocalRotation 0 0 180) ! (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matGrey) ; install hinge joint to connect to the upper arm --- 441,445 ---- (setLocalPos $RightLowerArmPosX $RightLowerArmPosY $RightLowerArmPosZ) ;(setLocalRotation 0 0 180) ! (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matDarkGrey) ; install hinge joint to connect to the upper arm *************** *** 519,523 **** (setName lefthip) (setLocalPos $LeftHipPosX $LeftHipPosY $LeftHipPosZ) ! (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matGrey) ; install hinge joint to connect to the torso --- 519,523 ---- (setName lefthip) (setLocalPos $LeftHipPosX $LeftHipPosY $LeftHipPosZ) ! (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matDarkGrey) ; install hinge joint to connect to the torso *************** *** 546,550 **** (setName righthip) (setLocalPos $RightHipPosX $RightHipPosY $RightHipPosZ) ! (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matGrey) ; install hinge joint to connect to the torso --- 546,550 ---- (setName righthip) (setLocalPos $RightHipPosX $RightHipPosY $RightHipPosZ) ! (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matDarkGrey) ; install hinge joint to connect to the torso *************** *** 647,651 **** (setName leftshank) (setLocalPos $LeftShankPosX $LeftShankPosY $LeftShankPosZ) ! (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matGrey) ; install hinge joint to connect to the thigh --- 647,651 ---- (setName leftshank) (setLocalPos $LeftShankPosX $LeftShankPosY $LeftShankPosZ) ! (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matDarkGrey) ; install hinge joint to connect to the thigh *************** *** 674,678 **** (setName rightshank) (setLocalPos $RightShankPosX $RightShankPosY $RightShankPosZ) ! (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matGrey) ; install hinge joint to connect to the thigh --- 674,678 ---- (setName rightshank) (setLocalPos $RightShankPosX $RightShankPosY $RightShankPosZ) ! (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matDarkGrey) ; install hinge joint to connect to the thigh |
|
From: Markus R. <rol...@us...> - 2007-04-26 17:54:08
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27085 Modified Files: rsgedit.rb Log Message: - sync material definitions with rcssserver3d CVS Index: rsgedit.rb =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.rb,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rsgedit.rb 15 Apr 2007 10:49:42 -0000 1.7 --- rsgedit.rb 26 Apr 2007 17:54:05 -0000 1.8 *************** *** 44,50 **** material.setDiffuse(0.0,0.0,1.0,1.0) - material = new('kerosin/MaterialSolid', $serverPath+'material/matLightBlue'); - material.setDiffuse(0.0,0.75,1.0,1.0) - material = new('kerosin/MaterialSolid', $serverPath+'material/matWhite'); material.setDiffuse(1.0,1.0,1.0,1.0) --- 44,47 ---- *************** *** 62,66 **** material = new('kerosin/MaterialSolid', $serverPath+'material/matGrey'); ! material.setDiffuse(0.1,0.1,0.1,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matSelected'); --- 59,72 ---- material = new('kerosin/MaterialSolid', $serverPath+'material/matGrey'); ! material.setDiffuse(0.2,0.2,0.2,1.0) ! ! material = new('kerosin/MaterialSolid', $serverPath+'material/matDarkGrey'); ! material.setDiffuse(0.05,0.05,0.05,1.0) ! ! material = new('kerosin/MaterialSolid', $serverPath+'material/matLightBlue'); ! material.setDiffuse(0.0,0.75,1.0,1.0) ! ! material = new('kerosin/MaterialSolid', $serverPath+'material/matMagenta'); ! material.setDiffuse(1.0,0.0,0.75,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matSelected'); |
|
From: Markus R. <rol...@us...> - 2007-04-25 20:34:31
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13941 Modified Files: Tag: RSGEDIT_FILEREF property.cpp Log Message: - show associated ruby file and line number in property window of a node Index: property.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/property.cpp,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** property.cpp 19 Feb 2006 15:45:37 -0000 1.8 --- property.cpp 25 Apr 2007 20:34:27 -0000 1.8.4.1 *************** *** 33,36 **** --- 33,37 ---- #include <oxygen/sceneserver/basenode.h> #include <oxygen/sceneserver/transform.h> + #include <oxygen/sceneserver/scenedict.h> #include <oxygen/physicsserver/body.h> #include <oxygen/physicsserver/joint.h> *************** *** 117,120 **** --- 118,133 ---- { entries.push_back(Entry(_T("GetFullPath"), wxString(leaf->GetFullPath().c_str(), wxConvUTF8))); + + const SceneDict::FileRef* ref + = SceneDict::GetInstance().Loookup(leaf); + + if (ref == 0) + { + return; + } + + wxString strRef = wxString(ref->fname.c_str(), wxConvUTF8) + + wxString::Format(":%d",ref->line); + entries.push_back(Entry(_T("rsg file"), strRef)); } |
|
From: Markus R. <rol...@us...> - 2007-04-25 20:33:58
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13407 Modified Files: Tag: RSGEDIT_FILEREF rsgedit.rb Log Message: - enable SceneDictionary in RubySceneImporter Index: rsgedit.rb =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.rb,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** rsgedit.rb 15 Apr 2007 10:49:42 -0000 1.7 --- rsgedit.rb 25 Apr 2007 20:33:52 -0000 1.7.2.1 *************** *** 34,37 **** --- 34,41 ---- run "bindings.rb" + # register from which rsg file nodes were created + rubySceneImporter = get($serverPath+'scene/RubySceneImporter') + rubySceneImporter.enableSceneDictionary(true); + # create custom materials material = new('kerosin/MaterialSolid', $serverPath+'material/matYellow'); |
|
From: Markus R. <rol...@us...> - 2007-04-25 20:33:16
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13032 Modified Files: Tag: RSGEDIT_FILEREF simspark.sln Log Message: - added scenedict to project files Index: simspark.sln =================================================================== RCS file: /cvsroot/simspark/simspark/spark/simspark.sln,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** simspark.sln 15 Mar 2007 07:26:25 -0000 1.2 --- simspark.sln 25 Apr 2007 20:33:12 -0000 1.2.2.1 *************** *** 10,19 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest", "test\coretest\coretest.vcproj", "{FC4C3571-034B-4CB5-9CF3-3411205C9433}" ProjectSection(ProjectDependencies) = postProject - {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} - {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} - {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} EndProjectSection EndProject --- 10,19 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest", "test\coretest\coretest.vcproj", "{FC4C3571-034B-4CB5-9CF3-3411205C9433}" ProjectSection(ProjectDependencies) = postProject {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} + {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject *************** *** 35,48 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystemstd", "plugin\filesystemstd\filesystemstd.vcproj", "{4A4E1738-60BC-4BB4-AFC8-92320D769D90}" ProjectSection(ProjectDependencies) = postProject - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sexpparser", "plugin\sexpparser\sexpparser.vcproj", "{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}" ProjectSection(ProjectDependencies) = postProject - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} - {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject --- 35,48 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystemstd", "plugin\filesystemstd\filesystemstd.vcproj", "{4A4E1738-60BC-4BB4-AFC8-92320D769D90}" ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sexpparser", "plugin\sexpparser\sexpparser.vcproj", "{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}" ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} EndProjectSection EndProject *************** *** 53,63 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsgedit", "..\contrib\rsgedit\rsgedit.vcproj", "{38B680B0-B535-40F0-B5DB-FC307C40C7D6}" ProjectSection(ProjectDependencies) = postProject - {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} - {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} - {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} - {87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230} {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject --- 53,63 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsgedit", "..\contrib\rsgedit\rsgedit.vcproj", "{38B680B0-B535-40F0-B5DB-FC307C40C7D6}" ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230} + {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} EndProjectSection EndProject *************** *** 67,115 **** ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} ! {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} ! {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} {87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inputwx", "..\contrib\plugin\inputwx\inputwx.vcproj", "{038D947F-6223-4EA7-BE4E-A41984923336}" ProjectSection(ProjectDependencies) = postProject - {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soccer", "..\contrib\plugin\soccer\soccer.vcproj", "{D6BD532A-E11A-4391-A37C-2D55027EE219}" ProjectSection(ProjectDependencies) = postProject - {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} - {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparkagent", "plugin\sparkagent\sparkagent.vcproj", "{9E5D17FC-5665-48A8-9298-747A3D690787}" ProjectSection(ProjectDependencies) = postProject - {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agentspark", "..\contrib\agentspark\agentspark.vcproj", "{A544868D-F263-40AC-BEDF-FFF0660B3E32}" ProjectSection(ProjectDependencies) = postProject - {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} - {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sceneeffector", "plugin\sceneeffector\sceneeffector.vcproj", "{AE03EAFA-DFD9-43B3-8777-13A27167A692}" ProjectSection(ProjectDependencies) = postProject - {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} - {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} - {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} EndProjectSection EndProject --- 67,116 ---- ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} ! {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} {87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inputwx", "..\contrib\plugin\inputwx\inputwx.vcproj", "{038D947F-6223-4EA7-BE4E-A41984923336}" ProjectSection(ProjectDependencies) = postProject {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soccer", "..\contrib\plugin\soccer\soccer.vcproj", "{D6BD532A-E11A-4391-A37C-2D55027EE219}" ProjectSection(ProjectDependencies) = postProject {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9} + {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparkagent", "plugin\sparkagent\sparkagent.vcproj", "{9E5D17FC-5665-48A8-9298-747A3D690787}" ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agentspark", "..\contrib\agentspark\agentspark.vcproj", "{A544868D-F263-40AC-BEDF-FFF0660B3E32}" ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sceneeffector", "plugin\sceneeffector\sceneeffector.vcproj", "{AE03EAFA-DFD9-43B3-8777-13A27167A692}" ProjectSection(ProjectDependencies) = postProject {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} + {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} + {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} EndProjectSection EndProject |
|
From: Markus R. <rol...@us...> - 2007-04-25 20:33:15
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13032/oxygen Modified Files: Tag: RSGEDIT_FILEREF Makefile.am oxygen.vcproj Log Message: - added scenedict to project files Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** Makefile.am 15 Mar 2007 07:26:26 -0000 1.4 --- Makefile.am 25 Apr 2007 20:33:10 -0000 1.4.2.1 *************** *** 130,133 **** --- 130,134 ---- sceneserver/camera.cpp \ sceneserver/camera_c.cpp \ + sceneserver/scenedict.cpp \ simulationserver/simulationserver.h \ simulationserver/simulationserver.cpp \ Index: oxygen.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen.vcproj,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** oxygen.vcproj 15 Mar 2007 07:26:26 -0000 1.2 --- oxygen.vcproj 25 Apr 2007 20:33:11 -0000 1.2.2.1 *************** *** 732,735 **** --- 732,743 ---- </File> <File + RelativePath=".\sceneserver\scenedict.cpp" + > + </File> + <File + RelativePath=".\sceneserver\scenedict.h" + > + </File> + <File RelativePath=".\sceneserver\sceneimporter.h" > |
|
From: Markus R. <rol...@us...> - 2007-04-25 20:32:28
|
Update of /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12579 Modified Files: Tag: RSGEDIT_FILEREF rubysceneimporter.cpp rubysceneimporter.h rubysceneimporter_c.cpp Log Message: - maintain correct mFileName value during recursive calls - added optional registering of created nodes to the SceneDict instance (default turned off) - added and exported method EnableSceneDictionary to Ruby Index: rubysceneimporter.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** rubysceneimporter.h 15 Mar 2007 07:26:28 -0000 1.3 --- rubysceneimporter.h 25 Apr 2007 20:32:24 -0000 1.3.2.1 *************** *** 76,79 **** --- 76,82 ---- void SetUnlinkOnCompleteScenes(bool unlink); + /** registers all created nodes in the RubySceneDict */ + void EnableSceneDictionary(bool enable); + protected: virtual bool ParseScene(const char* scene, int size, *************** *** 111,114 **** --- 114,120 ---- bool mDeltaScene; + /** true, if all created nodes are registered in the RubySceneDict */ + bool mUpdateSceneDict; + /** the major version of the scen graph file */ int mVersionMajor; Index: rubysceneimporter.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** rubysceneimporter.cpp 15 Mar 2007 07:26:28 -0000 1.3 --- rubysceneimporter.cpp 25 Apr 2007 20:32:23 -0000 1.3.2.1 *************** *** 25,28 **** --- 25,29 ---- #include <zeitgeist/scriptserver/scriptserver.h> #include <oxygen/sceneserver/transform.h> + #include <oxygen/sceneserver/scenedict.h> #include <boost/scoped_array.hpp> *************** *** 74,77 **** --- 75,79 ---- mDeltaScene = false; mAutoUnlink = false; + mUpdateSceneDict = false; } *************** *** 85,88 **** --- 87,95 ---- } + void RubySceneImporter::EnableSceneDictionary(bool enable) + { + mUpdateSceneDict = enable; + } + bool RubySceneImporter::ImportScene(const std::string& fileName, shared_ptr<BaseNode> root, *************** *** 99,102 **** --- 106,110 ---- } + std::string oldFileName = mFileName; mFileName = fileName; *************** *** 106,110 **** buffer[file->Size()] = 0; ! return ParseScene(buffer.get(), file->Size(), root, parameter); } --- 114,121 ---- buffer[file->Size()] = 0; ! bool ok = ParseScene(buffer.get(), file->Size(), root, parameter); ! mFileName = oldFileName; ! ! return ok; } *************** *** 144,147 **** --- 155,168 ---- sexp = iparse_sexp(const_cast<char*>(scene),size,pcont); + if (sexp == 0) + { + GetLog()->Error() + << "(RubySceneImporter) ERROR: failed to parse S-Expressions. " + << "Last read line was " << pcont->line << "\n"; + root->UnlinkChildren(); + return false; + + } + if ( (! mDeltaScene) && *************** *** 322,325 **** --- 343,355 ---- } + if ( + (mUpdateSceneDict) && + (mSceneDict != 0) + ) + { + mSceneDict->Insert + (node, SceneDict::FileRef(mFileName,sexp->line)); + } + return node; } Index: rubysceneimporter_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** rubysceneimporter_c.cpp 13 Dec 2005 21:48:50 -0000 1.1 --- rubysceneimporter_c.cpp 25 Apr 2007 20:32:24 -0000 1.1.6.1 *************** *** 23,26 **** --- 23,42 ---- #include "rubysceneimporter.h" + FUNCTION(RubySceneImporter,enableSceneDictionary) + { + bool enable; + + if ( + (in.GetSize() != 1) || + (! in.GetValue(in[0], enable)) + ) + { + return false; + } + + obj->EnableSceneDictionary(enable); + return true; + } + FUNCTION(RubySceneImporter,setUnlinkOnCompleteScenes) { *************** *** 43,46 **** --- 59,63 ---- DEFINE_BASECLASS(oxygen/SceneImporter); DEFINE_FUNCTION(setUnlinkOnCompleteScenes); + DEFINE_FUNCTION(enableSceneDictionary); } |
