Menu
▾
▴
[Iaeditor-commits] SF.net SVN: iaeditor: [345] trunk
|
From: <ob...@us...> - 2007-10-08 12:30:18
|
Revision: 345
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=345&view=rev
Author: obi666
Date: 2007-10-08 05:30:21 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
- Cleaned widgets controls ids
- Fixed several compile bugs leftover after previous commit
Modified Paths:
--------------
trunk/msvc/8/appiaeditor.vcproj
trunk/src/apps/editor/gui/widgets/iaMainFrame.h
trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
Modified: trunk/msvc/8/appiaeditor.vcproj
===================================================================
--- trunk/msvc/8/appiaeditor.vcproj 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/msvc/8/appiaeditor.vcproj 2007-10-08 12:30:21 UTC (rev 345)
@@ -236,7 +236,7 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.cpp"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.cpp"
>
</File>
<File
@@ -296,15 +296,15 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\widgets\ia_propgrid.h"
+ RelativePath="..\..\src\apps\editor\iaCSApplication.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\iaCSApplication.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectsManager.h"
>
</File>
<File
Modified: trunk/src/apps/editor/gui/widgets/iaMainFrame.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -34,58 +34,56 @@
#include "ia-tool/iaBaseObjectListener.h"
#include <wx/aui/aui.h>
-
-
-////@begin control identifiers
-#define ID_FRAME 10000
#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
-#define ID_STATUSBAR 10001
-#define ID_PANEL 10002
-#define ID_MENUITEM1 10008
-#define ID_MENU 10006
-#define ID_MENUITEM 10007
-#define ID_MENUITEM2 10009
-#define ID_MENUITEM_SAVE 10010
-#define ID_MENUITEM_SAVE_AS 10011
-#define ID_MENUITEM_LOAD 10012
-#define ID_TOOLBAR 10004
-#define ID_PANEL 10002
-#define ID_SIMULATION_PANEL 10019
-#define ID_OBJECTS_TREE_PANEL 10020
-#define ID_PANEL7 10024
-#define ID_TOOLBAR2 10025
-//#define ID_MENUITEM_CREATE_RAGDOLL 10023
-#define ID_MENUITEM_NEW_PROJECT 10027
-#define ID_MENUITEM_LOAD_PROJECT 10028
-#define ID_MENUITEM_EXIT 10029
-#define ID_TOOL_SAVE 10032
-#define ID_TOOL_IMPORT 10033
-#define ID_TOOL_EXPORT 10034
-#define ID_TOOL_MOVE 10035
-#define ID_TOOL_ROTATE 10036
-#define ID_TOOL_MOVE_BODY 10037
-#define ID_TOOL_ROTATE_BODY 10038
-#define ID_TOOL_CREATE_CHAR 10039
-#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
-#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
-#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
-#define ID_TOOL_ANIMATION 10043
-#define ID_TOOL_FORCE 10044
-#define ID_TOOL_CONTROLLER 10045
-#define ID_TOOL_CAMERA 10045
-#define ID_MENUITEM_DRAW_WIREFRAME 10046
-#define ID_MENUITEM_SHOW_COLLIDERS 10047
-#define ID_MENUITEM_SHOW_BONES 10048
-#define ID_MENUITEM_SHOW_JOINTS 10049
-#define ID_MENUITEM_SHOW_BODIES 10050
-#define ID_MENUITEM_SHOW_CHARACTERS 10051
-#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
-////@end control identifiers
+enum iaEMainFrameControlIds
+{
+ ID_FRAME = 10000,
+ ID_STATUSBAR,
+ ID_PANEL,
+ ID_MENUITEM1,
+ ID_MENU,
+ ID_MENUITEM,
+ ID_MENUITEM2,
+ ID_MENUITEM_SAVE,
+ ID_MENUITEM_SAVE_AS,
+ ID_MENUITEM_LOAD,
+ ID_TOOLBAR,
+ ID_SIMULATION_PANEL,
+ ID_OBJECTS_TREE_PANEL,
+ ID_PANEL7,
+ ID_TOOLBAR2,
+ ID_MENUITEM_NEW_PROJECT,
+ ID_MENUITEM_LOAD_PROJECT,
+ ID_MENUITEM_EXIT,
+ ID_TOOL_SAVE,
+ ID_TOOL_IMPORT,
+ ID_TOOL_EXPORT,
+ ID_TOOL_MOVE,
+ ID_TOOL_ROTATE,
+ ID_TOOL_MOVE_BODY,
+ ID_TOOL_ROTATE_BODY,
+ ID_TOOL_CREATE_CHAR,
+ ID_TOOL_ATTACH_BOX_COLLIDER,
+ ID_TOOL_ATTACH_CILINDER_COLLIDER,
+ ID_TOOL_ATTACH_SPHERE_COLLIDER,
+ ID_TOOL_ANIMATION,
+ ID_TOOL_FORCE,
+ ID_TOOL_CONTROLLER,
+ ID_TOOL_CAMERA,
+ ID_MENUITEM_DRAW_WIREFRAME,
+ ID_MENUITEM_SHOW_COLLIDERS,
+ ID_MENUITEM_SHOW_BONES,
+ ID_MENUITEM_SHOW_JOINTS,
+ ID_MENUITEM_SHOW_BODIES,
+ ID_MENUITEM_SHOW_CHARACTERS,
+ ID_TOOL_ATTACH_CAPSULE_COLLIDER
+};
+
/*!
* Compatibility
*/
Modified: trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -27,20 +27,21 @@
#include "editor.h"
-////@begin control identifiers
-#define IA_MENUITEM_ATTACH_BODY 0
-#define IA_MENUITEM_ATTACH_JOINT 2
-#define IA_MENUITEM_ATTACH_SPHERE_COLLIDER 3
-#define IA_MENUITEM_ATTACH_BOX_COLLIDER 4
-#define IA_MENUITEM_DELETE 5
-#define ID_MENUITEM_SORT_BY_TYPE 6
-#define IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER 7
-#define IA_MENUITEM_ATTACH_CAPSULE_COLLIDER 8
-#define IA_MENUITEM_HIDE 9
-#define IA_MENUITEM_SHOW 10
-#define IA_MENUITEM_GROUP 11
-#define IA_MENUITEM_SAVE_ANIMATION 12
-////@end control identifiers
+enum iaMenuItems
+{
+ IA_MENUITEM_ATTACH_BODY = 0,
+ IA_MENUITEM_ATTACH_JOINT,
+ IA_MENUITEM_ATTACH_SPHERE_COLLIDER,
+ IA_MENUITEM_ATTACH_BOX_COLLIDER,
+ IA_MENUITEM_DELETE,
+ ID_MENUITEM_SORT_BY_TYPE,
+ IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
+ IA_MENUITEM_ATTACH_CAPSULE_COLLIDER,
+ IA_MENUITEM_HIDE,
+ IA_MENUITEM_SHOW,
+ IA_MENUITEM_GROUP,
+ IA_MENUITEM_SAVE_ANIMATION
+};
/*!
* Compatibility
Modified: trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -1,105 +1,105 @@
-/*
- Copyright (C) 2007 by Piotr Obrzut
-
- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef _IA_SIMULATION_PANEL_H_
-#define _IA_SIMULATION_PANEL_H_
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/math.h>
-#include <wx/aui/aui.h>
-#include "../iaMainFrame.h"
-#include "editor.h"
-
-#define ID_TIME_LINE_PANEL 10022
-#define ID_BUTTONS_PANEL 10023
-#define ID_PLAY_BUTTON 10024
-#define ID_SIMULATE_BUTTON 10025
-#define ID_STEP_FORWARD 10026
-#define ID_LAST_FRAME 10027
-#define ID_FIRST_FRAME 10028
-#define ID_STEP_BACKWARD 10029
-#define ID_PLAY_BACKWARD 10030
-#define ID_TRACKS_CTRL 10031
-
-class iaTimeLineCtrl;
-class iaSimulationTracksCtrl;
-
-class iaSimulationPanel : public wxPanel
-{
-public:
-
- iaSimulationPanel () {};
- iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size, long style);
-
- virtual ~iaSimulationPanel()
- {
- };
-
- void CreateControls ();
- iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
-
- //events
- void OnLastFrameClick (wxCommandEvent& event);
- void OnStartSimulationClick (wxCommandEvent& event);
- void OnPlayClick (wxCommandEvent& event);
- void OnStepForwardClick (wxCommandEvent& event);
- void OnFirstFrameClick (wxCommandEvent& event);
- void OnPlayBackwardClick (wxCommandEvent& event);
- void OnStepBackwardClick (wxCommandEvent& event);
- void OnSize (wxSizeEvent& event);
-
+/*
+ Copyright (C) 2007 by Piotr Obrzut
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+#ifndef _IA_SIMULATION_PANEL_H_
+#define _IA_SIMULATION_PANEL_H_
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+#include <wx/math.h>
+#include <wx/aui/aui.h>
+#include "iaMainFrame.h"
+#include "editor.h"
+
+#define ID_TIME_LINE_PANEL 10022
+#define ID_BUTTONS_PANEL 10023
+#define ID_PLAY_BUTTON 10024
+#define ID_SIMULATE_BUTTON 10025
+#define ID_STEP_FORWARD 10026
+#define ID_LAST_FRAME 10027
+#define ID_FIRST_FRAME 10028
+#define ID_STEP_BACKWARD 10029
+#define ID_PLAY_BACKWARD 10030
+#define ID_TRACKS_CTRL 10031
+
+class iaTimeLineCtrl;
+class iaSimulationTracksCtrl;
+
+class iaSimulationPanel : public wxPanel
+{
+public:
+
+ iaSimulationPanel () {};
+ iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style);
+
+ virtual ~iaSimulationPanel()
+ {
+ };
+
+ void CreateControls ();
+ iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
+
+ //events
+ void OnLastFrameClick (wxCommandEvent& event);
+ void OnStartSimulationClick (wxCommandEvent& event);
+ void OnPlayClick (wxCommandEvent& event);
+ void OnStepForwardClick (wxCommandEvent& event);
+ void OnFirstFrameClick (wxCommandEvent& event);
+ void OnPlayBackwardClick (wxCommandEvent& event);
+ void OnStepBackwardClick (wxCommandEvent& event);
+ void OnSize (wxSizeEvent& event);
+
/// singleton instance access
- static iaSimulationPanel* instance () {return m_pInstance;}
-
- DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
-
-private:
-
- iaTimeLineCtrl *time_line_ctrl;
- iaSimulationTracksCtrl *tracks_ctrl;
- iEditorCentralInfo *central_info;
- iaMainFrame *parent;
- static iaSimulationPanel *m_pInstance;
-
- //Buttons
- wxBitmapButton *item_bitmap_button_step_forward;
- wxBitmapButton *item_bitmap_button_last_frame;
- wxBitmapButton *item_bitmap_button_simulate;
- wxBitmapButton *item_bitmap_button_play;
- wxBitmapButton *item_bitmap_button_step_backward;
- wxBitmapButton *item_bitmap_button_first_frame;
- wxBitmapButton *item_bitmap_button_play_backward;
- //Buttons bitmaps
- wxBitmap item_bitmap_simulate;
- wxBitmap item_bitmap_play;
- wxBitmap item_bitmap_stop;
- wxBitmap item_bitmap_step_forward;
- wxBitmap item_bitmap_last_frame;
- wxBitmap item_bitmap_play_backward;
- wxBitmap item_bitmap_step_backward;
- wxBitmap item_bitmap_first_frame;
- //pressed flags
- bool play_forward_pressed;
- bool play_backward_pressed;
- bool simulate_pressed;
-
- DECLARE_EVENT_TABLE()
-};
-#endif // _IA_SIMULATION_PANEL_H_
-
+ static iaSimulationPanel* instance () {return m_pInstance;}
+
+ DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
+
+private:
+
+ iaTimeLineCtrl *time_line_ctrl;
+ iaSimulationTracksCtrl *tracks_ctrl;
+ iEditorCentralInfo *central_info;
+ iaMainFrame *parent;
+ static iaSimulationPanel *m_pInstance;
+
+ //Buttons
+ wxBitmapButton *item_bitmap_button_step_forward;
+ wxBitmapButton *item_bitmap_button_last_frame;
+ wxBitmapButton *item_bitmap_button_simulate;
+ wxBitmapButton *item_bitmap_button_play;
+ wxBitmapButton *item_bitmap_button_step_backward;
+ wxBitmapButton *item_bitmap_button_first_frame;
+ wxBitmapButton *item_bitmap_button_play_backward;
+ //Buttons bitmaps
+ wxBitmap item_bitmap_simulate;
+ wxBitmap item_bitmap_play;
+ wxBitmap item_bitmap_stop;
+ wxBitmap item_bitmap_step_forward;
+ wxBitmap item_bitmap_last_frame;
+ wxBitmap item_bitmap_play_backward;
+ wxBitmap item_bitmap_step_backward;
+ wxBitmap item_bitmap_first_frame;
+ //pressed flags
+ bool play_forward_pressed;
+ bool play_backward_pressed;
+ bool simulate_pressed;
+
+ DECLARE_EVENT_TABLE()
+};
+#endif // _IA_SIMULATION_PANEL_H_
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
