[Pingus-CVS] r3102 - trunk/pingus/src/editor

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-07 00:35:34 +0200 (Fri, 07 Sep 2007)
New Revision: 3102

Modified:
   trunk/pingus/src/editor/editor_viewport.cpp
   trunk/pingus/src/editor/editor_viewport.hpp
   trunk/pingus/src/editor/level_objs.cpp
Log:
- fixed set_limit() call

Modified: trunk/pingus/src/editor/editor_viewport.cpp
===================================================================
--- trunk/pingus/src/editor/editor_viewport.cpp 2007-09-06 22:28:12 UTC (rev 
3101)
+++ trunk/pingus/src/editor/editor_viewport.cpp 2007-09-06 22:35:34 UTC (rev 
3102)
@@ -33,17 +33,18 @@
 #include "level_objs.hpp"
 
 namespace Editor {
-
+
 // Constructor
-EditorViewport::EditorViewport(EditorScreen* e) :
-  state(Display::get_width(), Display::get_height()),
-  drawing_context(new DrawingContext(Rect(48, 38 + 48, Display::get_width() - 
248 - 48, 600 - 48))),
-  editor(e),
-  autoscroll(false),
-  highlighted_area(0,0,0,0),
-  context_menu(0),
-  snap_to(false),
-  current_action(NOTHING)
+EditorViewport::EditorViewport(EditorScreen* e) 
+  : rect(48, 38 + 48, Display::get_width() - 248 - 48, 600 - 48),
+    state(rect.get_width(), rect.get_height()),
+    drawing_context(new DrawingContext(rect)),
+    editor(e),
+    autoscroll(false),
+    highlighted_area(0,0,0,0),
+    context_menu(0),
+    snap_to(false),
+    current_action(NOTHING)
 {
 }
 
@@ -300,7 +301,7 @@
 EditorViewport::refresh()
 {
   objs = editor->get_level()->get_objects();
-  //state.set_limit(Rect(Vector2i(0, 0), editor->get_level()->get_size()));
+  state.set_limit(Rect(Vector2i(0, 0), editor->get_level()->get_size()));
   std::cout << editor->get_level()->get_size().width << ", "
             << editor->get_level()->get_size().height 
             << std::endl;
@@ -362,7 +363,7 @@
 {
   return 
Vector2i(state.screen2world(drawing_context->screen_to_world(Vector2i(x, y))));
 }
+
+} // namespace Editor
 
-} // Editor namespace
-
 /* EOF */

Modified: trunk/pingus/src/editor/editor_viewport.hpp
===================================================================
--- trunk/pingus/src/editor/editor_viewport.hpp 2007-09-06 22:28:12 UTC (rev 
3101)
+++ trunk/pingus/src/editor/editor_viewport.hpp 2007-09-06 22:35:34 UTC (rev 
3102)
@@ -32,7 +32,7 @@
 class SceneContext;
 
 namespace Editor {
-
+
 class LevelObj;
 class EditorScreen;
 class ContextMenu;
@@ -43,6 +43,7 @@
 class EditorViewport : public GUI::Component 
 {
 private:       
+  Rect rect;
   GraphicContextState state;
   DrawingContext* drawing_context;
 
@@ -139,7 +140,7 @@
   EditorViewport (const EditorViewport&);
   EditorViewport& operator= (const EditorViewport&);
 };
-
+
 } // Editor namespace
 
 #endif

Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp      2007-09-06 22:28:12 UTC (rev 
3101)
+++ trunk/pingus/src/editor/level_objs.cpp      2007-09-06 22:35:34 UTC (rev 
3102)
@@ -74,7 +74,7 @@
         {
           gc.draw_rect(translated_pos.x, translated_pos.y, translated_pos.x 
                        + sprite.get_width(), translated_pos.y + 
sprite.get_height(), 
-                       Color(255,255,255,150), 5000);
+                       Color(255,0,0), 5000);
         }
 
       if (attribs & HAS_WIDTH)