Menu
▾
▴
[simspark-cvs] simspark/contrib/rsgedit main.cpp, 1.6, 1.6.2.1 main.h, 1.2, 1.2.2.1 mainframe.cpp, 1.8, 1.8.2.1 mainframe.h, 1.7, 1.7.2.1 property.h, 1.5, 1.5.2.1 rsgedit.rb, 1.4, 1.4.2.1 sparkglcanvas.cpp, 1.4, 1.4.2.1 sparkglcanvas.h, 1.3, 1.3.2.1 sparkglrender.h, 1.2, 1.2.2.1 sparktree.cpp, 1.3, 1.3.2.1 sparktree.h, 1.2, 1.2.2.1
|
From: Markus R. <rol...@us...> - 2007-02-10 19:02:12
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28179 Modified Files: Tag: WIN32 main.cpp main.h mainframe.cpp mainframe.h property.h rsgedit.rb sparkglcanvas.cpp sparkglcanvas.h sparkglrender.h sparktree.cpp sparktree.h Log Message: - compile fixes Index: main.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** main.cpp 22 Jan 2006 12:19:28 -0000 1.6 --- main.cpp 10 Feb 2007 19:01:53 -0000 1.6.2.1 *************** *** 18,21 **** --- 18,22 ---- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include "main.h" #if defined(__GNUG__) && !defined(__APPLE__) *************** *** 39,43 **** #endif - #include "main.h" #include "mainframe.h" #include "sparkglcanvas.h" --- 40,43 ---- Index: sparkglrender.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkglrender.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** sparkglrender.h 2 Jan 2006 20:28:49 -0000 1.2 --- sparkglrender.h 10 Feb 2007 19:01:54 -0000 1.2.2.1 *************** *** 21,24 **** --- 21,28 ---- #define SPARKGLRENDER_H__ + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <boost/shared_ptr.hpp> Index: sparkglcanvas.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkglcanvas.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** sparkglcanvas.cpp 19 Feb 2006 13:21:56 -0000 1.4 --- sparkglcanvas.cpp 10 Feb 2007 19:01:54 -0000 1.4.2.1 *************** *** 18,24 **** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <wx/dcclient.h> #include "main.h" ! #include "sparkglcanvas.h" #include "simspark.h" --- 18,25 ---- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include "sparkglcanvas.h" #include <wx/dcclient.h> #include "main.h" ! #include "simspark.h" *************** *** 68,75 **** } ! void SparkGLCanvas::Render() { - wxPaintDC dc(this); - #ifndef __WXMOTIF__ if (!GetContext()) return; --- 69,74 ---- } ! void SparkGLCanvas::Render(wxDC& dc) { #ifndef __WXMOTIF__ if (!GetContext()) return; *************** *** 95,99 **** void SparkGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) ) { ! Render(); } --- 94,99 ---- void SparkGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) ) { ! wxPaintDC dc(this); ! Render(dc); } Index: sparktree.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** sparktree.cpp 22 Jan 2006 12:19:28 -0000 1.3 --- sparktree.cpp 10 Feb 2007 19:01:54 -0000 1.3.2.1 *************** *** 136,143 **** --- 136,150 ---- } } + + return true; } weak_ptr<Leaf> SparkTree::GetLeaf(const wxTreeItemId id) { + if (! id.IsOk()) + { + return weak_ptr<Leaf>(); + } + ItemData* data = GetItemData(id); if (data == 0) Index: property.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/property.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** property.h 18 Feb 2006 19:50:03 -0000 1.5 --- property.h 10 Feb 2007 19:01:54 -0000 1.5.2.1 *************** *** 21,24 **** --- 21,28 ---- #define PROPERTY_H__ + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <list> #include <map> Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** mainframe.h 22 Jan 2006 17:25:23 -0000 1.7 --- mainframe.h 10 Feb 2007 19:01:54 -0000 1.7.2.1 *************** *** 19,22 **** --- 19,26 ---- */ // -*- C++ -*- generated by wxGlade 0.4 on Wed Jan 4 20:26:10 2006 + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <wx/wx.h> #include <wx/image.h> Index: rsgedit.rb =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.rb,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** rsgedit.rb 2 Jan 2006 20:28:49 -0000 1.4 --- rsgedit.rb 10 Feb 2007 19:01:54 -0000 1.4.2.1 *************** *** 60,65 **** # scene = get($scenePath) ! #scene = get($scenePath) ! #scene.importScene('rsg/boxspheres/simspark.rsg') # create an arena to test various joint bodies --- 60,65 ---- # scene = get($scenePath) ! # scene = get($scenePath) ! # scene.importScene('rsg/boxspheres/simspark.rsg') # create an arena to test various joint bodies *************** *** 67,71 **** scene.importScene('rsg/jointtest/simspark.rsg') - - - --- 67,68 ---- Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** mainframe.cpp 22 Jan 2006 17:25:23 -0000 1.8 --- mainframe.cpp 10 Feb 2007 19:01:53 -0000 1.8.2.1 *************** *** 105,109 **** 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|wxTE_LINEWRAP); set_properties(); --- 105,109 ---- 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(); *************** *** 373,377 **** // refresh the display RefreshProperties(); ! mCanvas->Render(); // pump the wxWidgets message loop --- 373,379 ---- // refresh the display RefreshProperties(); ! ! wxClientDC dc(this); ! mCanvas->Render(dc); // pump the wxWidgets message loop Index: main.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** main.h 22 Jan 2006 12:19:28 -0000 1.2 --- main.h 10 Feb 2007 19:01:53 -0000 1.2.2.1 *************** *** 21,24 **** --- 21,28 ---- #define MAIN_H__ + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <wx/glcanvas.h> #include <wx/app.h> Index: sparktree.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** sparktree.h 22 Jan 2006 12:19:28 -0000 1.2 --- sparktree.h 10 Feb 2007 19:01:55 -0000 1.2.2.1 *************** *** 21,24 **** --- 21,28 ---- #define SPARKTREE_H__ + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <zeitgeist/core.h> #include <wx/treectrl.h> Index: sparkglcanvas.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparkglcanvas.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** sparkglcanvas.h 8 Jan 2006 14:15:27 -0000 1.3 --- sparkglcanvas.h 10 Feb 2007 19:01:54 -0000 1.3.2.1 *************** *** 21,24 **** --- 21,28 ---- #define SPARKGLCANVAS_H__ + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <wx/glcanvas.h> #include "sparkglrender.h" *************** *** 59,63 **** void OnMouseMove(wxMouseEvent& event); ! void Render(); protected: --- 63,67 ---- void OnMouseMove(wxMouseEvent& event); ! void Render(wxDC& dc); protected: |
