[Iaeditor-commits] SF.net SVN: iaeditor: [342] branches/release/V0.2/src/apps/editor/gui

[<ob...@us...>]

Revision: 342
          http://iaeditor.svn.sourceforge.net/iaeditor/?rev=342&view=rev
Author:   obi666
Date:     2007-10-08 04:40:28 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
Applied r341 from trunk.

Modified Paths:
--------------
    branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
    branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h

Modified: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp	2007-10-08 11:37:23 UTC (rev 341)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp	2007-10-08 11:40:28 UTC (rev 342)
@@ -65,8 +65,8 @@
 EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
 EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
 EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
 EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-//EVT_MENU(ID_MENUITEM_CREATE_RAGDOLL, iaMainFrame::OnCreateRagdollMenuItem)
 EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
 EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
 EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
@@ -82,10 +82,10 @@
 EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
 EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
 
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
 EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
 EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
 EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-//EVT_TOOL(ID_TOOL_CREATE_CHAR, iaMainFrame::OnCreateRagdollMenuItem)
 EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
 EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
 
@@ -264,13 +264,15 @@
   tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
     _T(""), wxT("Load Project"));
 
+#if 0
   wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
     _T(""), wxT("Export physics (currently not avaible)"));
+#endif
 
   tb1->AddSeparator();
-
+#if 0
   wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
@@ -299,6 +301,7 @@
   wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL, 
     _T(""), wxT("Create character from given model"));
+#endif 
 
   wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
@@ -307,15 +310,15 @@
 
   wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
-  tb1->AddTool(ID_TOOL_ATTACH_CILINDER_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
-    wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider (currently not avaible)"));
+  tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+    wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
 
-
   wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
     wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
 
+#if 0
   wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
@@ -325,6 +328,7 @@
   wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL, 
     _T(""), wxT("Create force (not avaible yet)"));
+#endif
 
   wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
@@ -333,12 +337,14 @@
 
   tb1->AddSeparator();
 
+#if 0
   wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
   wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
   tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
     wxT("Record (not avaible yet)"));
 
   tb1->AddSeparator();
+#endif
 
   itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
   itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
@@ -474,6 +480,10 @@
 {
   OnAttachBody ();
 }
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+  OnAttachCapsuleCollider ();
+}
 void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
 {
   OnAttachSphereCollider ();
@@ -509,3 +519,4 @@
   event.Skip();
 }
 
+

Modified: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h	2007-10-08 11:37:23 UTC (rev 341)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h	2007-10-08 11:40:28 UTC (rev 342)
@@ -83,6 +83,7 @@
 #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
 
 /*!
@@ -149,6 +150,7 @@
   void OnAttachJointMenuItem (wxCommandEvent& event);
   void OnAttachBodyMenuItem (wxCommandEvent& event);
   void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+  void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
   void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
 
   void OnSize (wxSizeEvent& event); 
@@ -181,3 +183,4 @@
 #endif
 // _IA_MAINFRAME_H_
 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.