[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs solid_color_background_obj
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs solid_color_background_obj.cxx,1.4,1.5 solid_color_background_obj.hxx,1.5,1.6 starfield_background_obj.cxx,1.3,1.4 starfield_background_obj.hxx,1.5,1.6 |
Date: |
29 Nov 2002 22:54:25 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv31004/editorobjs
Modified Files:
solid_color_background_obj.cxx solid_color_background_obj.hxx
starfield_background_obj.cxx starfield_background_obj.hxx
Log Message:
- added drag&dropable level resizer
Index: solid_color_background_obj.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editorobjs/solid_color_background_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background_obj.cxx 28 Sep 2002 11:52:25 -0000 1.4
+++ solid_color_background_obj.cxx 29 Nov 2002 22:54:23 -0000 1.5
@@ -20,8 +20,15 @@
#include "../string_converter.hxx"
#include "../editor/editor_view.hxx"
#include "../worldobjsdata/solid_color_background_data.hxx"
+#include "../editor/editor.hxx"
+#include "../editor/generic_property_frame.hxx"
+#include "../editor/property_window.hxx"
+#include "surface_background_obj.hxx"
+
#include "solid_color_background_obj.hxx"
+using namespace EditorNS;
+
namespace EditorObjs {
SolidColorBackgroundObj::SolidColorBackgroundObj (const
WorldObjsData::SolidColorBackgroundData& data_)
@@ -84,6 +91,20 @@
+ to_string(data->pos.x) + ", "
+ to_string(data->pos.y) + ", "
+ to_string(data->pos.z);
+}
+
+PropertyFrame*
+SolidColorBackgroundObj::get_gui_dialog(Editor* editor)
+{
+ GenericPropertyFrame* propframe
+ = new GenericPropertyFrame("SolidColorBackground",
editor->get_property_window()->get_client_area());
+
+ propframe->add_float_box("Red", &data->color.red);
+ propframe->add_float_box("Green", &data->color.green);
+ propframe->add_float_box("Blue", &data->color.blue);
+ propframe->add_float_box("Alpha", &data->color.alpha);
+
+ return propframe;
}
} // namespace EditorObjs
Index: solid_color_background_obj.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solid_color_background_obj.hxx 28 Nov 2002 20:09:54 -0000 1.5
+++ solid_color_background_obj.hxx 29 Nov 2002 22:54:23 -0000 1.6
@@ -21,6 +21,12 @@
#define HEADER_PINGUS_EDITOROBJS_SOLID_COLOR_BACKGROUND_OBJ_HXX
#include "../editor/rect_editorobj.hxx"
+#include "../editor/editor.hxx"
+#include "../editor/generic_property_frame.hxx"
+#include "../editor/property_window.hxx"
+#include "surface_background_obj.hxx"
+
+using namespace EditorNS;
namespace WorldObjsData {
class SolidColorBackgroundData;
@@ -56,7 +62,7 @@
void set_position_offset (const Vector& offset);
std::string status_line ();
- EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+ EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*);
private:
SolidColorBackgroundObj (const SolidColorBackgroundObj&);
SolidColorBackgroundObj& operator= (const SolidColorBackgroundObj&);
Index: starfield_background_obj.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editorobjs/starfield_background_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_obj.cxx 28 Sep 2002 11:52:25 -0000 1.3
+++ starfield_background_obj.cxx 29 Nov 2002 22:54:23 -0000 1.4
@@ -19,6 +19,12 @@
#include "starfield_background_obj.hxx"
#include "../worldobjsdata/starfield_background_data.hxx"
+#include "../editor/editor.hxx"
+#include "../editor/generic_property_frame.hxx"
+#include "../editor/property_window.hxx"
+#include "surface_background_obj.hxx"
+
+using namespace EditorNS;
namespace EditorObjs {
@@ -56,6 +62,19 @@
+ to_string (pos.z);
}
+
+PropertyFrame*
+StarfieldBackgroundObj::get_gui_dialog(Editor* editor)
+{
+ GenericPropertyFrame* propframe
+ = new GenericPropertyFrame("StarfieldBackground",
editor->get_property_window()->get_client_area());
+
+ propframe->add_integer_box("Small Stars", &data->small_stars_count);
+ propframe->add_integer_box("Middle Stars", &data->middle_stars_count);
+ propframe->add_integer_box("Large Stars", &data->large_stars_count);
+
+ return propframe;
+}
} // namespace EditorObjs
Index: starfield_background_obj.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starfield_background_obj.hxx 28 Nov 2002 20:09:54 -0000 1.5
+++ starfield_background_obj.hxx 29 Nov 2002 22:54:23 -0000 1.6
@@ -45,7 +45,7 @@
EditorObj* duplicate ();
std::string status_line ();
- EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+ EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*);
private:
StarfieldBackgroundObj (const StarfieldBackgroundObj&);
StarfieldBackgroundObj& operator= (const StarfieldBackgroundObj&);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs solid_color_background_obj.cxx,1.4,1.5 solid_color_background_obj.hxx,1.5,1.6 starfield_background_obj.cxx,1.3,1.4 starfield_background_obj.hxx,1.5,1.6,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor generic_property_frame.cxx,NONE,1.1 generic_property_frame.hxx,NONE,1.1 Makefile.am,1.26,1.27 groundpiece_window.cxx,1.10,1.11 property_frame.hxx,1.7,1.8
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor level_resizer.cxx,NONE,1.1 level_resizer.hxx,NONE,1.1 Makefile.am,1.27,1.28 editor.cxx,1.40,1.41 editor_event.cxx,1.41,1.42 level_property_window.cxx,1.10,1.11 level_property_window.hxx,1.8,1.9 object_manager.cxx,1.37,1.38 object_manager.hxx,1.22,1.23 property_window.cxx,1.11,1.12 start_pos.hxx,1.9,1.10
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor generic_property_frame.cxx,NONE,1.1 generic_property_frame.hxx,NONE,1.1 Makefile.am,1.26,1.27 groundpiece_window.cxx,1.10,1.11 property_frame.hxx,1.7,1.8
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor level_resizer.cxx,NONE,1.1 level_resizer.hxx,NONE,1.1 Makefile.am,1.27,1.28 editor.cxx,1.40,1.41 editor_event.cxx,1.41,1.42 level_property_window.cxx,1.10,1.11 level_property_window.hxx,1.8,1.9 object_manager.cxx,1.37,1.38 object_manager.hxx,1.22,1.23 property_window.cxx,1.11,1.12 start_pos.hxx,1.9,1.10
- Index(es):