ogretoolbox-cvscommits Mailing List for Ogre Toolbox
Status: Pre-Alpha
Brought to you by:
pmylemans
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(2) |
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: MadLion <ma...@us...> - 2005-04-23 22:21:35
|
Update of /cvsroot/ogretoolbox/OgreToolbox/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20508/src Modified Files: PanelSceneNodes.cpp PanelEnvironment.cpp OgreManager.cpp PanelObjects.cpp ApplicationOgreToolbox.cpp DialogNodeProperties.cpp DialogAbout.cpp DialogAddLight.cpp FrameOgreToolbox.cpp DialogAddEntity.cpp Added Files: WxOgreRenderWindow.cpp Log Message: changes for linux port - mouse events don't work - maybe windows build is broken - maybe mouse events don't work on windows Index: DialogNodeProperties.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/DialogNodeProperties.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogNodeProperties.cpp 9 Mar 2005 21:22:47 -0000 1.1 --- DialogNodeProperties.cpp 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 37,41 **** END_EVENT_TABLE() ! DialogNodeProperties::DialogNodeProperties(wxWindow *parent, wxPoint &pos, wxSize &size) : wxDialog(parent,-1,"Node Properties",pos,size) { --- 37,41 ---- END_EVENT_TABLE() ! DialogNodeProperties::DialogNodeProperties(wxWindow *parent, const wxPoint &pos, const wxSize &size) : wxDialog(parent,-1,"Node Properties",pos,size) { *************** *** 188,191 **** --- 188,193 ---- void DialogNodeProperties::OnComboBoxChange(wxCommandEvent &e) { + wxCommandEvent event = wxCommandEvent(); + if(cbTypes->GetStringSelection() == "Entity"){ if(mOgreApp) *************** *** 193,197 **** _HideLightObjects(); _ShowEntityObjects(); ! OnActionEntityChange(wxCommandEvent()); } } --- 195,199 ---- _HideLightObjects(); _ShowEntityObjects(); ! OnActionEntityChange(event); } } *************** *** 201,205 **** _HideEntityObjects();; _ShowLightObjects(); ! OnActionLightChange(wxCommandEvent()); } } --- 203,207 ---- _HideEntityObjects();; _ShowLightObjects(); ! OnActionLightChange(event); } } *************** *** 386,388 **** ckbCastShadows->Show(); ckbVisible->Show(); ! } \ No newline at end of file --- 388,390 ---- ckbCastShadows->Show(); ckbVisible->Show(); ! } Index: DialogAddLight.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/DialogAddLight.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogAddLight.cpp 13 Mar 2005 14:51:32 -0000 1.1 --- DialogAddLight.cpp 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 27,31 **** END_EVENT_TABLE() ! DialogAddLight::DialogAddLight(wxWindow *parent,wxPoint &pos,wxSize &size) : wxDialog(parent,-1,"Add a light",pos,size) { --- 27,31 ---- END_EVENT_TABLE() ! DialogAddLight::DialogAddLight(wxWindow *parent,const wxPoint &pos,const wxSize &size) : wxDialog(parent,-1,"Add a light",pos,size) { *************** *** 85,87 **** tclLightName->Clear(); } ! } \ No newline at end of file --- 85,87 ---- tclLightName->Clear(); } ! } Index: DialogAddEntity.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/DialogAddEntity.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogAddEntity.cpp 13 Mar 2005 14:51:32 -0000 1.1 --- DialogAddEntity.cpp 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 27,31 **** END_EVENT_TABLE() ! DialogAddEntity::DialogAddEntity(wxWindow *parent,wxPoint &pos,wxSize &size) : wxDialog(parent,-1,"Add a 3d object (entity)",pos,size) { --- 27,31 ---- END_EVENT_TABLE() ! DialogAddEntity::DialogAddEntity(wxWindow *parent,const wxPoint &pos,const wxSize &size) : wxDialog(parent,-1,"Add a 3d object (entity)",pos,size) { *************** *** 93,95 **** lbxEntityFile->DeselectAll(); } ! } \ No newline at end of file --- 93,95 ---- lbxEntityFile->DeselectAll(); } ! } Index: OgreManager.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/OgreManager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OgreManager.cpp 13 Mar 2005 14:51:32 -0000 1.2 --- OgreManager.cpp 23 Apr 2005 22:20:48 -0000 1.3 *************** *** 23,26 **** --- 23,34 ---- #include <wx/wx.h> #include <wx/msgdlg.h> + //#include <wx/gtk/win_gtk.h> + + #ifndef __WXMSW__ + + #include "GLX/OgreGLXWindowInterface.h" + + #endif + #include "OgreManager.h" *************** *** 46,52 **** // Init // ! void OgreManager::Init(HWND handle, SceneType type /* = ST_GENERIC */) { ! mHandle = handle; // Make the root mRoot = new Root(); --- 54,64 ---- // Init // ! //void OgreManager::Init(HWND handle, SceneType type /* = ST_GENERIC */) ! void OgreManager::Init(wxWindow *renderWindow, SceneType type /* = ST_GENERIC */) { ! //mHandle = handle; ! #ifdef __WXMSW__ ! mHandle = (HWND)(renderWindow->GetHandle()); ! #endif // Make the root mRoot = new Root(); *************** *** 85,89 **** --- 97,123 ---- mRoot->initialise(false); NameValuePairList misc; + + #ifdef __WXMSW__ + misc["externalWindowHandle"] = StringConverter::toString((uint)handle); + + #else + + GdkWindow *handle = GTK_WIDGET(renderWindow->GetHandle())->window; + wxSize size = renderWindow->GetSize(); + wxPoint point = renderWindow->GetPosition(); + + std::cout << "OgreManager - GetHandle : " << renderWindow->GetHandle() << "\n"; + std::cout << "OgreManager - handle : " << handle << "\n"; + std::cout << "\t point.x : " << point.x << " point.y : " << point.y << "\n"; + std::cout << "\t width : " << size.GetWidth() << " height : " << size.GetHeight() << "\n\n"; + + misc["externalWindowHandle"] = Ogre::StringConverter::toString((unsigned long)GDK_WINDOW_XID(handle)); + misc["left"] = Ogre::StringConverter::toString(point.x); + misc["top"] = Ogre::StringConverter::toString(point.y); + + //gtk_pizza_set_clear( GTK_PIZZA(renderWindow->GetHandle()), FALSE ); + #endif + mWnd = mRoot->createRenderWindow("My sub render window", 900, 700, false, &misc); mScene = mRoot->getSceneManager(ST_GENERIC); *************** *** 142,145 **** --- 176,185 ---- mWnd->resize(w,h); //mCam->setAspectRatio(Real(mView->getActualWidth()) / Real(mView->getActualHeight())); + + #ifndef __WXMSW__ + GLXWindowInterface* interface = NULL; + mWnd->getCustomAttribute("GLXWINDOWINTERFACE", &interface); + interface->resized(w,h); + #endif } *************** *** 149,153 **** if(mReady) { ! mRoot->renderOneFrame(); } } --- 189,196 ---- if(mReady) { ! //mRoot->renderOneFrame(); ! Ogre::Root::getSingletonPtr()->_fireFrameStarted(); ! mWnd->update(); ! Ogre::Root::getSingletonPtr()->_fireFrameEnded(); } } *************** *** 216,218 **** Camera* OgreManager::getCamera(){ return mCam; ! } \ No newline at end of file --- 259,261 ---- Camera* OgreManager::getCamera(){ return mCam; ! } Index: PanelEnvironment.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/PanelEnvironment.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PanelEnvironment.cpp 9 Mar 2005 21:22:47 -0000 1.1 --- PanelEnvironment.cpp 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 1,5 **** #include "PanelEnvironment.h" ! PanelEnvironment::PanelEnvironment(wxWindow *parent,wxPoint &pos, wxSize &size) : wxPanel(parent,-1,pos,size) { --- 1,5 ---- #include "PanelEnvironment.h" ! PanelEnvironment::PanelEnvironment(wxWindow *parent,const wxPoint &pos, const wxSize &size) : wxPanel(parent,-1,pos,size) { *************** *** 9,11 **** new wxStaticText(sbSkyBoxSettings,-1,"Skybox:",wxPoint(10,20)); new wxComboBox(sbSkyBoxSettings,-1,wxEmptyString,wxPoint(60,20),wxSize(160,20));*/ ! } \ No newline at end of file --- 9,11 ---- new wxStaticText(sbSkyBoxSettings,-1,"Skybox:",wxPoint(10,20)); new wxComboBox(sbSkyBoxSettings,-1,wxEmptyString,wxPoint(60,20),wxSize(160,20));*/ ! } --- NEW FILE: WxOgreRenderWindow.cpp --- /*----------------------------------------------------------------------------- This source file is part of Ogre Toolbox. Copyright (C) 2005 The Ogre Toolbox Team Also see acknowledgements in Readme.html 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; either version 2 of the License, or (at your option) any later version. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. or go to http://www.gnu.org/licenses/gpl.txt -----------------------------------------------------------------------------*/ #include "WxOgreRenderWindow.h" // Event Table // BEGIN_EVENT_TABLE(WxOgreRenderWindow, wxWindow) //BEGIN_EVENT_TABLE(WxOgreRenderWindow, wxScrolledWindow) EVT_SIZE(WxOgreRenderWindow::OnSize) EVT_PAINT(WxOgreRenderWindow::OnPaint) EVT_TIMER(1, WxOgreRenderWindow::OnTimer) EVT_MOUSE_EVENTS(WxOgreRenderWindow::OnMouse) EVT_KEY_DOWN(WxOgreRenderWindow::OnKey) EVT_KEY_UP(WxOgreRenderWindow::OnKeyUp) EVT_ENTER_WINDOW(WxOgreRenderWindow::OnEnterWindow) END_EVENT_TABLE() WxOgreRenderWindow::WxOgreRenderWindow(wxFrame *parentFrame, const wxString title, const wxPoint &pos, const wxSize &size) : wxWindow((wxWindow *)parentFrame, -1, pos, size, -1, title) //wxScrolledWindow((wxWindow *)parentFrame, -1, pos, size, -1, title) { // No Ogre app until it's given to us. mOgreApp = 0; // Kick off the timer. mTimer = new wxTimer(this, 1); mTimer->Start(10); } // Frame Destructor WxOgreRenderWindow::~WxOgreRenderWindow() { delete mTimer; } // On Resize void WxOgreRenderWindow::OnSize(wxSizeEvent &event) { std::cout << "WxOgreRenderWindow::OnSize\n"; if(mOgreApp) { wxSize s = this->GetSize(); mOgreApp->Resize(s.GetWidth(),s.GetHeight()); /*mOgreApp->getCamera()->setAspectRatio(Ogre::Real(s.GetWidth()) / Ogre::Real(s.GetHeight())); //mOgreApp->getWindow()->getViewport(0)->_updateDimensions(); mOgreApp->getWindow()->getViewport(0)->update();*/ } } void WxOgreRenderWindow::OnPaint(wxPaintEvent &event) { wxPaintDC dc(this); std::cout << "WxOgreRenderWindow::OnPaint\n"; //wxClientDC dc(this); //wxPaintDC dc(this); //PrepareDC(dc); //dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); //dc.Clear(); // Tell OGRE to redraw. if(mOgreApp) { mOgreApp->Update(); } else { // Make an OGRE application object. mOgreApp = new OgreManager(); mOgreApp->Init(this); // Update! mOgreApp->Update(); } //event.Skip(); } // Timer tick void WxOgreRenderWindow::OnTimer(wxTimerEvent &event) { //std::cout << "OgreRenderWindow::OnTimer\n"; if(mOgreApp) { //std::cout << "OgreRenderWindow::OnTimer -> in\n"; // Updates animations, etc. mOgreApp->Tick(event.GetInterval() / 1000.0f); // Update the display mOgreApp->Update(); } //event.Skip(); } // On Mouse void WxOgreRenderWindow::OnMouse(wxMouseEvent &e) { std::cout << "WxOgreRenderWindow::OnMouse\n"; wxClientDC dc(this); PrepareDC(dc); e.Skip(); } // Key event void WxOgreRenderWindow::OnKey(wxKeyEvent &e) { std::cout << "WxOgreRenderWindow::OnKey\n"; e.Skip(); } void WxOgreRenderWindow::OnKeyUp(wxKeyEvent &e) { std::cout << "WxOgreRenderWindow::OnKeyUp\n"; e.Skip(); } void WxOgreRenderWindow::OnEnterWindow(wxMouseEvent& WXUNUSED(event)) { std::cout << "WxOgreRenderWindow::OnEnterWindow\n"; SetFocus(); } Index: FrameOgreToolbox.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/FrameOgreToolbox.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrameOgreToolbox.cpp 13 Mar 2005 14:51:32 -0000 1.2 --- FrameOgreToolbox.cpp 23 Apr 2005 22:20:48 -0000 1.3 *************** *** 52,57 **** EVT_TOOL(OTB_TOOLBAR_ADDLIGHT,FrameOgreToolbox::OnAddLight) ! EVT_TIMER(wxTest_Timer, FrameOgreToolbox::OnTimer) ! EVT_PAINT(FrameOgreToolbox::OnPaint) EVT_SIZE(FrameOgreToolbox::OnSize) --- 52,57 ---- EVT_TOOL(OTB_TOOLBAR_ADDLIGHT,FrameOgreToolbox::OnAddLight) ! /*EVT_TIMER(wxTest_Timer, FrameOgreToolbox::OnTimer) ! EVT_PAINT(FrameOgreToolbox::OnPaint)*/ EVT_SIZE(FrameOgreToolbox::OnSize) *************** *** 64,68 **** // Frame Constructor ! FrameOgreToolbox::FrameOgreToolbox(const wxChar *title,wxPoint &pos, wxSize &size) : wxFrame((wxFrame *)NULL, -1, title, pos, size) { --- 64,68 ---- // Frame Constructor ! FrameOgreToolbox::FrameOgreToolbox(const wxChar *title,const wxPoint &pos, const wxSize &size) : wxFrame((wxFrame *)NULL, -1, title, pos, size) { *************** *** 94,101 **** SetMenuBar(menuBar); - // Status Bar - CreateStatusBar(2); - SetStatusText("Welcome!"); - // Kick off the timer. mTimer = new wxTimer(this, wxTest_Timer); --- 94,97 ---- *************** *** 134,138 **** wxTabPages->AddPage((wxNotebookPage *)pnEnvironment,"Environment",false); ! sizerV = new wxBoxSizer(wxVERTICAL); sizerV->Add(wxTabPages,0,wxALIGN_LEFT,0); this->SetSizer(sizerV); --- 130,134 ---- wxTabPages->AddPage((wxNotebookPage *)pnEnvironment,"Environment",false); ! /*sizerV = new wxBoxSizer(wxVERTICAL); sizerV->Add(wxTabPages,0,wxALIGN_LEFT,0); this->SetSizer(sizerV); *************** *** 141,145 **** sizerH->Add(wxTabPages,0,wxEXPAND); this->SetSizer(sizerH); ! sizerH->SetDimension(0,0,800,540); mState = NONE; --- 137,158 ---- sizerH->Add(wxTabPages,0,wxEXPAND); this->SetSizer(sizerH); ! sizerH->SetDimension(0,0,800,540);*/ ! ! ! ! sizerH = new wxBoxSizer(wxHORIZONTAL); ! sizerH->Add(wxTabPages,0,wxALIGN_LEFT | wxEXPAND); ! ! mOgreRenderWindow = new WxOgreRenderWindow(this, _T("Ogre Toolbox Render Window"), pos, size); //wxSize(1280, 1024)); ! sizerH->Add(mOgreRenderWindow,1,wxALL | wxALIGN_RIGHT | wxEXPAND, 5); ! ! this->SetSizer(sizerH); ! ! //sizerH->SetSizeHints(this); ! sizerH->SetDimension(0,0,800,540); ! ! // Status Bar ! CreateStatusBar(2); ! SetStatusText("Welcome!"); mState = NONE; *************** *** 182,187 **** wxSize s = this->GetSize(); ! if(mOgreApp) ! mOgreApp->Resize(s.GetWidth(), s.GetHeight()); if(mReady==true){ --- 195,200 ---- wxSize s = this->GetSize(); ! /*if(mOgreApp) ! mOgreApp->Resize(s.GetWidth(), s.GetHeight());*/ if(mReady==true){ *************** *** 192,196 **** // On Paint ! void FrameOgreToolbox::OnPaint(wxPaintEvent &WXUNUSED(e)) { // Make DC (for no reason). --- 205,209 ---- // On Paint ! /*void FrameOgreToolbox::OnPaint(wxPaintEvent &WXUNUSED(e)) { // Make DC (for no reason). *************** *** 200,208 **** if(mOgreApp) mOgreApp->Update(); ! } // On Mouse void FrameOgreToolbox::OnMouse(wxMouseEvent &e) { wxSize csize = this->GetSize(); int width = csize.GetWidth(); --- 213,226 ---- if(mOgreApp) mOgreApp->Update(); ! }*/ // On Mouse void FrameOgreToolbox::OnMouse(wxMouseEvent &e) { + std::cout << "FrameOgreToolbox::OnMouse\n"; + + wxClientDC dc(this); + PrepareDC(dc); + wxSize csize = this->GetSize(); int width = csize.GetWidth(); *************** *** 344,348 **** if(mOgreApp) mOgreApp->Update(); ! } --- 362,366 ---- if(mOgreApp) mOgreApp->Update(); ! e.Skip(); } *************** *** 350,353 **** --- 368,372 ---- void FrameOgreToolbox::OnKey(wxKeyEvent &e) { + std::cout << "FrameOgreToolbox::OnKey\n"; if(e.KeyCode() == WXK_ESCAPE){ *************** *** 356,364 **** mState = NONE; } ! } void FrameOgreToolbox::OnKeyUp(wxKeyEvent& e) { if(e.GetKeyCode() == 82) // 82 = r { --- 375,385 ---- mState = NONE; } ! e.Skip(); } void FrameOgreToolbox::OnKeyUp(wxKeyEvent& e) { + std::cout << "FrameOgreToolbox::OnKeyUp\n"; + if(e.GetKeyCode() == 82) // 82 = r { *************** *** 433,439 **** } } } // Timer tick ! void FrameOgreToolbox::OnTimer(wxTimerEvent &e) { if(mOgreApp) --- 454,462 ---- } } + + e.Skip(); } // Timer tick ! /*void FrameOgreToolbox::OnTimer(wxTimerEvent &e) { if(mOgreApp) *************** *** 445,449 **** mOgreApp->Update(); } ! } void FrameOgreToolbox::OnOpen(wxCommandEvent &e) --- 468,472 ---- mOgreApp->Update(); } ! }*/ void FrameOgreToolbox::OnOpen(wxCommandEvent &e) *************** *** 474,478 **** } ! void FrameOgreToolbox::OpenScene(wxString &file) { TiXmlDocument doc(file.c_str()); --- 497,501 ---- } ! void FrameOgreToolbox::OpenScene(const wxString &file) { TiXmlDocument doc(file.c_str()); *************** *** 655,657 **** } return NULL; ! } \ No newline at end of file --- 678,680 ---- } return NULL; ! } Index: PanelObjects.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/PanelObjects.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PanelObjects.cpp 13 Mar 2005 14:51:32 -0000 1.2 --- PanelObjects.cpp 23 Apr 2005 22:20:48 -0000 1.3 *************** *** 12,16 **** END_EVENT_TABLE() ! PanelObjects::PanelObjects(wxWindow *parent,wxPoint &pos, wxSize &size): wxPanel(parent,-1,pos,size) { --- 12,16 ---- END_EVENT_TABLE() ! PanelObjects::PanelObjects(wxWindow *parent, const wxPoint &pos, const wxSize &size): wxPanel(parent,-1,pos,size) { *************** *** 246,250 **** btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! OnTypeChange(wxCommandEvent()); _ShowEntity(); } --- 246,252 ---- btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! //OnTypeChange(wxCommandEvent()); ! wxCommandEvent event = wxCommandEvent(); ! OnTypeChange(event); _ShowEntity(); } *************** *** 280,284 **** btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! OnTypeChange(wxCommandEvent()); _ShowEntity(); } --- 282,288 ---- btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! //OnTypeChange(wxCommandEvent()); ! wxCommandEvent event = wxCommandEvent(); ! OnTypeChange(event); _ShowEntity(); } *************** *** 369,373 **** btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! OnTypeChange(wxCommandEvent()); _ShowLight(); } --- 373,379 ---- btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! //OnTypeChange(wxCommandEvent()); ! wxCommandEvent event = wxCommandEvent(); ! OnTypeChange(event); _ShowLight(); } *************** *** 393,397 **** btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! OnTypeChange(wxCommandEvent()); _ShowLight(); } --- 399,405 ---- btnCancel->Disable(); btnAddType->SetLabel("Add new"); ! //OnTypeChange(wxCommandEvent()); ! wxCommandEvent event = wxCommandEvent(); ! OnTypeChange(event); _ShowLight(); } Index: ApplicationOgreToolbox.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/ApplicationOgreToolbox.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ApplicationOgreToolbox.cpp 13 Mar 2005 14:51:32 -0000 1.2 --- ApplicationOgreToolbox.cpp 23 Apr 2005 22:20:48 -0000 1.3 *************** *** 64,68 **** SetTopWindow(mFrame); ! // Make an OGRE application object. mOgreMgr = new OgreManager(); --- 64,68 ---- SetTopWindow(mFrame); ! /*// Make an OGRE application object. mOgreMgr = new OgreManager(); *************** *** 76,80 **** mFrame->CreateOtherObjects(); // Update! ! mOgreMgr->Update(); #ifdef __WXMSW__ --- 76,80 ---- mFrame->CreateOtherObjects(); // Update! ! mOgreMgr->Update();*/ #ifdef __WXMSW__ *************** *** 92,98 **** { // Kill OGRE app. ! delete mOgreMgr; // All done here. return 0; ! } \ No newline at end of file --- 92,98 ---- { // Kill OGRE app. ! //delete mOgreMgr; // All done here. return 0; ! } Index: DialogAbout.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/DialogAbout.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogAbout.cpp 9 Mar 2005 21:22:47 -0000 1.1 --- DialogAbout.cpp 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 27,31 **** END_EVENT_TABLE() ! DialogAbout::DialogAbout(wxWindow *parent,wxPoint &pos,wxSize &size) : wxDialog(parent,-1,"About OgreToolbox",pos,size) { --- 27,31 ---- END_EVENT_TABLE() ! DialogAbout::DialogAbout(wxWindow *parent,const wxPoint &pos,const wxSize &size) : wxDialog(parent,-1,"About OgreToolbox",pos,size) { *************** *** 47,49 **** if(event.GetKeyCode() == WXK_ESCAPE) this->Hide(); ! } \ No newline at end of file --- 47,49 ---- if(event.GetKeyCode() == WXK_ESCAPE) this->Hide(); ! } Index: PanelSceneNodes.cpp =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/src/PanelSceneNodes.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PanelSceneNodes.cpp 13 Mar 2005 14:51:32 -0000 1.2 --- PanelSceneNodes.cpp 23 Apr 2005 22:20:48 -0000 1.3 *************** *** 33,37 **** END_EVENT_TABLE() ! PanelSceneNodes::PanelSceneNodes(wxWindow *parent, wxPoint &pos, wxSize &size) : wxPanel(parent,-1,pos,size) { --- 33,37 ---- END_EVENT_TABLE() ! PanelSceneNodes::PanelSceneNodes(wxWindow *parent, const wxPoint &pos, const wxSize &size) : wxPanel(parent,-1,pos,size) { *************** *** 110,114 **** END_EVENT_TABLE() ! PanelSceneNodes_PropertyGrid::PanelSceneNodes_PropertyGrid(wxWindow *parent, wxPoint &pos, wxSize &size) : wxPropertyGrid(parent,-1,pos,size) { --- 110,114 ---- END_EVENT_TABLE() ! PanelSceneNodes_PropertyGrid::PanelSceneNodes_PropertyGrid(wxWindow *parent, const wxPoint &pos, const wxSize &size) : wxPropertyGrid(parent,-1,pos,size) { *************** *** 192,196 **** } ! PanelSceneNodes_TvScene::PanelSceneNodes_TvScene(wxWindow *parent, wxPoint &pos, wxSize &size) : wxTreeCtrl(parent,-1,pos,size,wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_LINES_AT_ROOT) { --- 192,196 ---- } ! PanelSceneNodes_TvScene::PanelSceneNodes_TvScene(wxWindow *parent, const wxPoint &pos, const wxSize &size) : wxTreeCtrl(parent,-1,pos,size,wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_LINES_AT_ROOT) { *************** *** 382,386 **** END_EVENT_TABLE() ! PanelSceneNodes_MeshList::PanelSceneNodes_MeshList(wxWindow *parent, wxPoint &pos, wxSize &size) : wxListBox(parent,-1,pos,size,0,NULL,wxLB_SORT) { --- 382,386 ---- END_EVENT_TABLE() ! PanelSceneNodes_MeshList::PanelSceneNodes_MeshList(wxWindow *parent, const wxPoint &pos, const wxSize &size) : wxListBox(parent,-1,pos,size,0,NULL,wxLB_SORT) { |
|
From: MadLion <ma...@us...> - 2005-04-23 22:21:05
|
Update of /cvsroot/ogretoolbox/OgreToolbox/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20508/include Modified Files: PanelObjects.h DialogAddLight.h PanelSceneNodes.h FrameOgreToolbox.h DialogNodeProperties.h OgreToolboxObject.h OgreManager.h ApplicationOgreToolbox.h PanelEnvironment.h DialogAddEntity.h DialogAbout.h Added Files: WxOgreRenderWindow.h Log Message: changes for linux port - mouse events don't work - maybe windows build is broken - maybe mouse events don't work on windows Index: OgreManager.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/OgreManager.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OgreManager.h 13 Mar 2005 14:51:31 -0000 1.2 --- OgreManager.h 23 Apr 2005 22:20:55 -0000 1.3 *************** *** 27,33 **** --- 27,43 ---- #include <Ogre.h> + #ifdef __WXMSW__ + #define WIN32_LEAN_AND_MEAN #include <Windows.h> + #else + + #include <wx/wx.h> + #include <gtk/gtk.h> + #include <gdk/gdkx.h> + + #endif + using namespace Ogre; *************** *** 51,55 **** --- 61,67 ---- String* mWorkingDir; + #ifdef __WXMSW__ HWND mHandle; + #endif public: *************** *** 61,65 **** void Resize(long w, long h); void Update(); ! void Init(HWND handle, SceneType type = ST_GENERIC); void Restart(SceneType mType); --- 73,78 ---- void Resize(long w, long h); void Update(); ! //void Init(HWND handle, SceneType type = ST_GENERIC); ! void Init(wxWindow *renderWindow, SceneType type = ST_GENERIC); void Restart(SceneType mType); *************** *** 75,77 **** }; ! #endif \ No newline at end of file --- 88,90 ---- }; ! #endif --- NEW FILE: WxOgreRenderWindow.h --- /*----------------------------------------------------------------------------- This source file is part of Ogre Toolbox. Copyright (C) 2005 The Ogre Toolbox Team Also see acknowledgements in Readme.html 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; either version 2 of the License, or (at your option) any later version. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. or go to http://www.gnu.org/licenses/gpl.txt -----------------------------------------------------------------------------*/ #ifndef _WXOGRERENDERWINDOW_H_ #define _WXOGRERENDERWINDOW_H_ #include <wx/wx.h> #include "OgreToolboxObject.h" #include "OgreManager.h" class WxOgreRenderWindow : public wxWindow, public OgreToolboxObject //class WxOgreRenderWindow : public wxScrolledWindow, public OgreToolboxObject { public: WxOgreRenderWindow(wxFrame *parentFrame, const wxString title, const wxPoint &pos, const wxSize &size); ~WxOgreRenderWindow(); void OnSize(wxSizeEvent &event); void OnPaint(wxPaintEvent &event); void OnTimer(wxTimerEvent &event); void OnMouse(wxMouseEvent &e); void OnKey(wxKeyEvent &e); void OnKeyUp(wxKeyEvent &e); void OnEnterWindow(wxMouseEvent &event); private: wxTimer *mTimer; DECLARE_EVENT_TABLE() }; #endif Index: DialogAbout.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/DialogAbout.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DialogAbout.h 13 Mar 2005 14:51:31 -0000 1.2 --- DialogAbout.h 23 Apr 2005 22:20:55 -0000 1.3 *************** *** 33,37 **** public: ! DialogAbout(wxWindow *parent,wxPoint &pos,wxSize &size); void OnPaint(wxPaintEvent& event); void CloseDialog(wxKeyEvent &event); --- 33,37 ---- public: ! DialogAbout(wxWindow *parent,const wxPoint &pos,const wxSize &size); void OnPaint(wxPaintEvent& event); void CloseDialog(wxKeyEvent &event); *************** *** 40,42 **** }; ! #endif \ No newline at end of file --- 40,42 ---- }; ! #endif Index: PanelEnvironment.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/PanelEnvironment.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PanelEnvironment.h 9 Mar 2005 21:21:55 -0000 1.1 --- PanelEnvironment.h 23 Apr 2005 22:20:55 -0000 1.2 *************** *** 10,17 **** { public: ! PanelEnvironment(wxWindow *parent,wxPoint &pos, wxSize &size); protected: }; ! #endif \ No newline at end of file --- 10,17 ---- { public: ! PanelEnvironment(wxWindow *parent, const wxPoint &pos, const wxSize &size); protected: }; ! #endif Index: OgreToolboxObject.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/OgreToolboxObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OgreToolboxObject.h 9 Mar 2005 21:21:55 -0000 1.1 --- OgreToolboxObject.h 23 Apr 2005 22:20:55 -0000 1.2 *************** *** 38,40 **** }; ! #endif \ No newline at end of file --- 38,40 ---- }; ! #endif Index: PanelObjects.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/PanelObjects.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PanelObjects.h 9 Mar 2005 21:21:55 -0000 1.1 --- PanelObjects.h 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 31,35 **** { public: ! PanelObjects(wxWindow *parent,wxPoint &pos, wxSize &size); void OnTypeChange(wxCommandEvent &e); void OnItemSelect(wxCommandEvent &e); --- 31,35 ---- { public: ! PanelObjects(wxWindow *parent, const wxPoint &pos, const wxSize &size); void OnTypeChange(wxCommandEvent &e); void OnItemSelect(wxCommandEvent &e); *************** *** 87,89 **** }; ! #endif \ No newline at end of file --- 87,89 ---- }; ! #endif Index: FrameOgreToolbox.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/FrameOgreToolbox.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrameOgreToolbox.h 13 Mar 2005 14:51:31 -0000 1.2 --- FrameOgreToolbox.h 23 Apr 2005 22:20:55 -0000 1.3 *************** *** 38,41 **** --- 38,43 ---- #include "DialogAddLight.h" + #include "WxOgreRenderWindow.h" + #include "dotSceneInterface.h" *************** *** 66,69 **** --- 68,73 ---- wxNotebook* wxTabPages; + WxOgreRenderWindow *mOgreRenderWindow; + wxBoxSizer* mBoxSizer; *************** *** 84,88 **** public: ! FrameOgreToolbox(const wxChar *title, wxPoint &pos, wxSize &size); ~FrameOgreToolbox(); --- 88,92 ---- public: ! FrameOgreToolbox(const wxChar *title, const wxPoint &pos, const wxSize &size); ~FrameOgreToolbox(); *************** *** 92,100 **** void OnAbout(wxCommandEvent &e); void OnSize(wxSizeEvent &e); ! void OnPaint(wxPaintEvent &e); void OnMouse(wxMouseEvent &e); void OnKey(wxKeyEvent &e); void OnKeyUp(wxKeyEvent& e); ! void OnTimer(wxTimerEvent &e); void OnOpen(wxCommandEvent &e); void OnNew(wxCommandEvent &e); --- 96,104 ---- void OnAbout(wxCommandEvent &e); void OnSize(wxSizeEvent &e); ! //void OnPaint(wxPaintEvent &e); void OnMouse(wxMouseEvent &e); void OnKey(wxKeyEvent &e); void OnKeyUp(wxKeyEvent& e); ! //void OnTimer(wxTimerEvent &e); void OnOpen(wxCommandEvent &e); void OnNew(wxCommandEvent &e); *************** *** 104,111 **** void OnRenderViewChange(wxCommandEvent &e); void OnControlClick(wxCommandEvent &e); ! void OpenScene(wxString &file); static int lightCount; }; ! #endif \ No newline at end of file --- 108,115 ---- void OnRenderViewChange(wxCommandEvent &e); void OnControlClick(wxCommandEvent &e); ! void OpenScene(const wxString &file); static int lightCount; }; ! #endif Index: DialogAddEntity.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/DialogAddEntity.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogAddEntity.h 13 Mar 2005 14:51:31 -0000 1.1 --- DialogAddEntity.h 23 Apr 2005 22:20:55 -0000 1.2 *************** *** 36,40 **** public: ! DialogAddEntity(wxWindow *parent,wxPoint &pos,wxSize &size); void ShowDialog(); void OnAdd(wxCommandEvent &e); --- 36,40 ---- public: ! DialogAddEntity(wxWindow *parent,const wxPoint &pos,const wxSize &size); void ShowDialog(); void OnAdd(wxCommandEvent &e); *************** *** 44,46 **** }; ! #endif \ No newline at end of file --- 44,46 ---- }; ! #endif Index: DialogAddLight.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/DialogAddLight.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogAddLight.h 13 Mar 2005 14:51:31 -0000 1.1 --- DialogAddLight.h 23 Apr 2005 22:20:48 -0000 1.2 *************** *** 36,40 **** public: ! DialogAddLight(wxWindow *parent,wxPoint &pos,wxSize &size); void ShowDialog(); void OnAdd(wxCommandEvent &e); --- 36,40 ---- public: ! DialogAddLight(wxWindow *parent,const wxPoint &pos,const wxSize &size); void ShowDialog(); void OnAdd(wxCommandEvent &e); *************** *** 44,46 **** }; ! #endif \ No newline at end of file --- 44,46 ---- }; ! #endif Index: DialogNodeProperties.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/DialogNodeProperties.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DialogNodeProperties.h 9 Mar 2005 21:21:55 -0000 1.1 --- DialogNodeProperties.h 23 Apr 2005 22:20:55 -0000 1.2 *************** *** 66,70 **** public: ! DialogNodeProperties(wxWindow *parent, wxPoint &pos, wxSize &size); void SetName(wxString &name){ tcName->SetValue(name); } void SetSceneNode(SceneNode *mSceneNode); --- 66,70 ---- public: ! DialogNodeProperties(wxWindow *parent, const wxPoint &pos, const wxSize &size); void SetName(wxString &name){ tcName->SetValue(name); } void SetSceneNode(SceneNode *mSceneNode); *************** *** 83,85 **** }; ! #endif \ No newline at end of file --- 83,85 ---- }; ! #endif Index: PanelSceneNodes.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/PanelSceneNodes.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PanelSceneNodes.h 13 Mar 2005 14:51:31 -0000 1.2 --- PanelSceneNodes.h 23 Apr 2005 22:20:55 -0000 1.3 *************** *** 41,45 **** { public: ! PanelSceneNodes_MeshList(wxWindow *parent, wxPoint &pos, wxSize &size); ~PanelSceneNodes_MeshList(); void UpdateList(); --- 41,45 ---- { public: ! PanelSceneNodes_MeshList(wxWindow *parent, const wxPoint &pos, const wxSize &size); ~PanelSceneNodes_MeshList(); void UpdateList(); *************** *** 53,57 **** { public: ! PanelSceneNodes_PropertyGrid(wxWindow *parent, wxPoint &pos, wxSize &size); ~PanelSceneNodes_PropertyGrid(); void UpdateGrid(const wxString &name, const wxString &entity,const Vector3 &pos,const Vector3 &scale, --- 53,57 ---- { public: ! PanelSceneNodes_PropertyGrid(wxWindow *parent, const wxPoint &pos, const wxSize &size); ~PanelSceneNodes_PropertyGrid(); void UpdateGrid(const wxString &name, const wxString &entity,const Vector3 &pos,const Vector3 &scale, *************** *** 84,88 **** public: ! PanelSceneNodes_TvScene(wxWindow *parent, wxPoint &pos, wxSize &size); ~PanelSceneNodes_TvScene(); --- 84,88 ---- public: ! PanelSceneNodes_TvScene(wxWindow *parent, const wxPoint &pos, const wxSize &size); ~PanelSceneNodes_TvScene(); *************** *** 113,117 **** { public: ! PanelSceneNodes(wxWindow *parent, wxPoint &pos, wxSize &size); ~PanelSceneNodes(); --- 113,117 ---- { public: ! PanelSceneNodes(wxWindow *parent, const wxPoint &pos, const wxSize &size); ~PanelSceneNodes(); *************** *** 136,138 **** }; ! #endif \ No newline at end of file --- 136,138 ---- }; ! #endif Index: ApplicationOgreToolbox.h =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/include/ApplicationOgreToolbox.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ApplicationOgreToolbox.h 13 Mar 2005 14:51:31 -0000 1.2 --- ApplicationOgreToolbox.h 23 Apr 2005 22:20:55 -0000 1.3 *************** *** 26,30 **** #include <wx/timer.h> ! #include "OgreManager.h" #include "FrameOgreToolbox.h" --- 26,30 ---- #include <wx/timer.h> ! //#include "OgreManager.h" #include "FrameOgreToolbox.h" *************** *** 33,37 **** { private: ! OgreManager *mOgreMgr; FrameOgreToolbox *mFrame ; --- 33,37 ---- { private: ! //OgreManager *mOgreMgr; FrameOgreToolbox *mFrame ; *************** *** 41,43 **** virtual int OnExit(); }; ! #endif \ No newline at end of file --- 41,43 ---- virtual int OnExit(); }; ! #endif |
|
From: MadLion <ma...@us...> - 2005-04-23 22:13:18
|
Update of /cvsroot/ogretoolbox/OgreToolbox/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/include Added Files: Makefile.am Log Message: initial linux build scripts checkin --- NEW FILE: Makefile.am --- noinst_HEADERS = ApplicationOgreToolbox.h DialogAbout.h DialogAddEntity.h \ DialogAddLight.h DialogNodeProperties.h FrameOgreToolbox.h OgreManager.h \ OgreToolboxObject.h PanelEnvironment.h PanelObjects.h PanelSceneNodes.h \ wxIds.h WxOgreRenderWindow.h \ $(DOTSCENE_PATH)/stdafx.h \ $(DOTSCENE_PATH)/Include/dotSceneInterface.h \ $(DOTSCENE_PATH)/Include/tinyxml.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneInfo.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneInterfacePrerequisites.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneLoader.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneLoaderImpl-0.2.0.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneResource.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneResourceManager.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneSerializer.h \ $(DOTSCENE_PATH)/Include/dsi/dotSceneUtils.h \ $(DOTSCENE_PATH)/Include/dsi/IDotSceneLoaderImpl.h \ $(DOTSCENE_PATH)/Include/dsi/tinyxml.h |
|
From: MadLion <ma...@us...> - 2005-04-23 22:13:18
|
Update of /cvsroot/ogretoolbox/OgreToolbox/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/src Added Files: Makefile.am Log Message: initial linux build scripts checkin --- NEW FILE: Makefile.am --- bin_PROGRAMS = OgreToolbox # set the include path found by configure INCLUDES = $(OGRE_CFLAGS) $(GTK_CFLAGS) \ -I$(OGRE_SOURCE_PATH)/RenderSystems/GL/include -I$(top_srcdir)/include \ -I$(DOTSCENE_PATH) -I$(DOTSCENE_PATH)/Include \ -I$(DOTSCENE_PATH)/Include/dsi # the library search path. OgreToolbox_LDFLAGS = $(OGRE_LIBS) $(LIBS) `wx-config --libs` OgreToolbox_SOURCES = ApplicationOgreToolbox.cpp DialogAbout.cpp \ DialogAddEntity.cpp DialogAddLight.cpp \ DialogNodeProperties.cpp FrameOgreToolbox.cpp OgreManager.cpp \ OgreToolboxObject.cpp PanelEnvironment.cpp PanelObjects.cpp \ PanelSceneNodes.cpp WxOgreRenderWindow.cpp \ $(DOTSCENE_PATH)/Source/dotSceneInfo.cpp \ $(DOTSCENE_PATH)/Source/dotSceneInterface.cpp \ $(DOTSCENE_PATH)/Source/dotSceneLoader.cpp \ $(DOTSCENE_PATH)/Source/dotSceneLoaderImpl-0.2.0.cpp \ $(DOTSCENE_PATH)/Source/dotSceneResource.cpp \ $(DOTSCENE_PATH)/Source/dotSceneResourceManager.cpp \ $(DOTSCENE_PATH)/Source/dotSceneSerializer.cpp \ $(DOTSCENE_PATH)/Source/dotSceneUtils.cpp \ $(DOTSCENE_PATH)/Source/tinyxml.cpp \ $(DOTSCENE_PATH)/Source/tinyxmlerror.cpp \ $(DOTSCENE_PATH)/Source/tinyxmlparser.cpp \ $(DOTSCENE_PATH)/stdafx.cpp # OgreRenderFrame.cpp AM_CXXFLAGS = $(OGRE_CFLAGS) $(GTK_CFLAGS) `wx-config --cxxflags` OgreToolbox_LDADD = $(GTK_LIBS) $(OGRE_LIBS) -lwx_gtk2_propgrid-2.5 |
|
From: MadLion <ma...@us...> - 2005-04-23 22:13:17
|
Update of /cvsroot/ogretoolbox/OgreToolbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079 Added Files: configure.in Makefile.am bootstrap Log Message: initial linux build scripts checkin --- NEW FILE: bootstrap --- #!/bin/sh # Check for proper versions of autotools # We require: # - autoconf 2.50+ # - automake 1.6+ # - libtool 1.4+ # Deal with some gentoo-specific issues export WANT_AUTOMAKE='1.7' export WANT_AUTOCONF_2_5=1 ## Using prereq in autoconf rather than here, mostly for the debian systems at ## this point if test -z "`autoconf --version 2>&1|head -n 1|egrep '2.5'`"; then echo "Autoconf 2.50 or above is required. Aborting build..."; exit 1; fi if test -z "`automake --version 2>&1|head -n 1|egrep '1.[6-9]'`"; then echo "Automake 1.6 or above is required. Aborting build..."; exit 1; fi if test -z "`libtool --version 2>&1|head -n 1|egrep '1.[4-5]'`"; then echo "Libtool 1.4 or above is required. Aborting build..."; exit 1; fi echo "Bootstrap..." # Fire up autotools libtoolize --force && aclocal $ACLOCAL_FLAGS && automake --include-deps --add-missing --foreign && autoconf && ./configure $@ --- NEW FILE: Makefile.am --- # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = src include --- NEW FILE: configure.in --- AC_PREREQ(2.50) AC_INIT(OgreToolbox, 0.2) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.6.1 foreign no-installinfo no-installman no-dependencies subdir-objects]) ##AC_CANONICAL_TARGET dnl Check for programs AC_LANG([C++]) AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL AM_PROG_LIBTOOL dnl GCC ersion check if test x$GCC = xyes; then AC_MSG_CHECKING([version 3.x of gcc]) if test -n "`$CC --version 2>&1|grep '3.'`"; then AC_DEFINE(EXT_HASH, 1, Use old STL hash options) AC_DEFINE(GCC_3_1, 1, 3.x GCC version) AC_MSG_RESULT(yes); else AC_MSG_RESULT(no)! fi fi # ***** DEBUGGING AC_ARG_ENABLE(debug,[ --enable-debug enable debugging [default=no]]) if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" else CXXFLAGS="$CXXFLAGS -O2" fi PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0) #PKG_CHECK_MODULES(OGRE, OGRE >= 1.0.1) # Ogre PKG_CHECK_MODULES(OGRE, OGRE >= 1.0.1) #AC_ARG_WITH(ogre-plugins,[ --with-ogre-plugins=path Set location of Ogre plugins],[ OGRE_PLUGINDIR="$withval"], [OGRE_PLUGINDIR=/usr/local/lib/OGRE]) #AC_SUBST(OGRE_PLUGINDIR) AC_ARG_WITH(ogre-source-path,[ --with-ogre-source-path=path Set the location of OGRE source], [ OGRE_SOURCE_PATH="$withval"], AC_MSG_ERROR([The include path to OGRE source is needed])) AC_SUBST(OGRE_SOURCE_PATH) #AC_ARG_WITH(xml-path,[ --with-xml-path=path Set the location of tinyyml], [ XML_PATH="$withval"], AC_MSG_ERROR([The include path to tinyxml is needed])) #AC_SUBST(XML_PATH) AC_ARG_WITH(dotScene-path,[ --with-dotScene-path=path Set the location of DotSceneinterface], [ DOTSCENE_PATH="$withval"], AC_MSG_ERROR([The include path to DotSceneInterface is needed])) AC_SUBST(DOTSCENE_PATH) dnl Create the makefiles AC_CONFIG_FILES([Makefile include/Makefile src/Makefile]) AC_OUTPUT |
|
From: Peter M. <pmy...@us...> - 2005-03-21 18:22:47
|
Update of /cvsroot/ogretoolbox/OgreToolbox/scripts/vc7.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31197/scripts/vc7.1 Modified Files: OgreToolbox.sln OgreToolbox.vcproj Log Message: corrected project file for debug-wx2.5 building Index: OgreToolbox.sln =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/scripts/vc7.1/OgreToolbox.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OgreToolbox.sln 9 Mar 2005 21:23:19 -0000 1.1 --- OgreToolbox.sln 21 Mar 2005 18:22:34 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- GlobalSection(SolutionConfiguration) = preSolution Debug = Debug + Debug-wx2.5 = Debug-wx2.5 Release = Release Release-wx2.5 = Release-wx2.5 *************** *** 13,16 **** --- 14,19 ---- {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Debug.ActiveCfg = Debug|Win32 {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Debug.Build.0 = Debug|Win32 + {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Debug-wx2.5.ActiveCfg = Debug-wx2.5|Win32 + {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Debug-wx2.5.Build.0 = Debug-wx2.5|Win32 {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Release.ActiveCfg = Release|Win32 {1EF7BE2C-C44B-478E-8EB9-80270B2F08BC}.Release.Build.0 = Release|Win32 Index: OgreToolbox.vcproj =================================================================== RCS file: /cvsroot/ogretoolbox/OgreToolbox/scripts/vc7.1/OgreToolbox.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OgreToolbox.vcproj 13 Mar 2005 14:51:32 -0000 1.2 --- OgreToolbox.vcproj 21 Mar 2005 18:22:35 -0000 1.3 *************** *** 169,172 **** --- 169,224 ---- Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> + <Configuration + Name="Debug-wx2.5|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../include;../../tinyxml;../../../lib/ogrenew/OgreMain/include;"../../../../wxWidgets-2.5.4/include";"../../../../wxWidgets-2.5.4/lib/vc_lib/msw";../../../lib/ogrenew/ogreaddons/dotsceneformat/DotSceneInterface/Include;"../../../../wxWidgets-2.5.4/contrib/include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="tinyxmld.lib dotSceneInterface.lib ogremain_d.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_propgrid.lib" + OutputFile="$(OutDir)/OgreToolbox.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="../../../lib/ogrenew/OgreMain/lib/Debug;"../../../../wxWidgets-2.5.4/lib/vc_lib";../../../lib/ogrenew/ogreaddons/dotsceneformat/DotSceneInterface/Debug;../../tinyxml/Debug" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/OgreToolbox.pdb" + SubSystem="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""../../../../wxWindows-2.4.2/include""/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> </Configurations> <References> |