[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.18,1.19 s
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.18,1.19 selection.cxx,1.7,1.8 |
Date: |
2 Jul 2002 09:21:05 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv1715/editor
Modified Files:
object_manager.cxx selection.cxx
Log Message:
fixed bug in rect selection
Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- object_manager.cxx 2 Jul 2002 09:14:20 -0000 1.18
+++ object_manager.cxx 2 Jul 2002 09:21:03 -0000 1.19
@@ -419,7 +419,6 @@
void
ObjectManager::add (EditorObj* obj)
{
- std::cout << "ObjectManager::add (EditorObj*)" << std::endl;
editor_objs.push_back (boost::shared_ptr<EditorObj>(obj));
}
@@ -439,19 +438,6 @@
editor_objs.end ());
}
}
-
-/*
-bool
-ObjectManager::object_selected(boost::shared_ptr<EditorObj> c_obj)
-{
- for(CurrentObjIter i = current_objs.begin(); i != current_objs.end(); i++)
- {
- if (c_obj == *i)
- return true;
- }
- return false;
-}
-*/
EditorObj*
ObjectManager::find_object(const CL_Vector& pos)
Index: selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- selection.cxx 2 Jul 2002 09:14:20 -0000 1.7
+++ selection.cxx 2 Jul 2002 09:21:03 -0000 1.8
@@ -100,12 +100,7 @@
y1 = static_cast<int> (Math::min(y1_, y2_));
y2 = static_cast<int> (Math::max(y1_, y2_));
- std::cout << "Rect: " << x1 << " " << y1 << " " << x2 << " " << y2 << " "
<< std::endl;
-
- const vector<EditorObj*> & erg = object_manager->rect_get_objs(x1, x2, y1,
y2);
-
- std::cout << "Size: " << erg.size () << std::endl;
-
+ vector<EditorObj*> erg = object_manager->rect_get_objs(x1, y1, x2, y2);
obj_list.insert(obj_list.end(), erg.begin(), erg.end());
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.18,1.19 selection.cxx,1.7,1.8,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.16,1.17 editor.hxx,1.7,1.8 editor_event.cxx,1.20,1.21 object_manager.cxx,1.17,1.18 object_manager.hxx,1.10,1.11 selection.cxx,1.6,1.7 selection.hxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds solidcolor_background.cxx,1.2,1.3 starfield_background.cxx,1.4,1.5 surface_background_data.cxx,1.2,1.3 thunderstorm_background_data.cxx,1.3,1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.16,1.17 editor.hxx,1.7,1.8 editor_event.cxx,1.20,1.21 object_manager.cxx,1.17,1.18 object_manager.hxx,1.10,1.11 selection.cxx,1.6,1.7 selection.hxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds solidcolor_background.cxx,1.2,1.3 starfield_background.cxx,1.4,1.5 surface_background_data.cxx,1.2,1.3 thunderstorm_background_data.cxx,1.3,1.4
- Index(es):