Changeset 3810 for trunk/tools/editor/scripts/gui/mapeditor.py

Timestamp:

11/12/11 21:28:22 (19 months ago)

Author:

helios2000

Message:

• Fixed instance z so it works now as expected. But note that this should only be used for static instances(for small optical corrections). Current Pathfinder implementation can not handle it correct.
• Fixed a problem with instance setLocation().
• Added the layer z offset. The map loaders, savers and the editor have now support for layer z. I keep the ticket open so we can test it more and maybe we can built a map that use this new feature. refs[t:366]

File:

• trunk/tools/editor/scripts/gui/mapeditor.py (modified) (5 diffs)

trunk/tools/editor/scripts/gui/mapeditor.py

@@ -399 +399 @@
                                         self._controller.getUndoManager().startGroup("Inserted instances")
                                         self._undogroup = True
-                                        
-                                        position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
+
+                                        position = self._controller.screenToMapCoordinates(realCoords[0], realCoords[1])
                                         position = self._controller._layer.getCellGrid().toLayerCoordinates(position)
                                         
@@ -417 +417 @@
                         elif self._mode == MapEditor.MOVING:
                                 if event.getButton() == fife.MouseEvent.LEFT:
-                                
-                                        position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
+                                        position = self._controller.screenToMapCoordinates(realCoords[0], realCoords[1])
 
                                         self._last_drag_pos = self._controller._layer.getCellGrid().toLayerCoordinates(position)
@@ -439 +438 @@
                                         
                         elif self._mode == MapEditor.OBJECTPICKER:
-                                position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
+                                position = self._controller.screenToMapCoordinates(realCoords[0], realCoords[1])
                                 exact = self._controller._layer.getCellGrid().toExactLayerCoordinates(position)
                                 instances = self._controller.getInstancesFromPosition(exact)
@@ -473 +472 @@
                                         
                         elif self._mode == MapEditor.INSERTING:
-                                position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
+                                position = self._controller.screenToMapCoordinates(realCoords[0], realCoords[1])
                                 position = self._controller._layer.getCellGrid().toLayerCoordinates(position)
                                 
@@ -484 +483 @@
                                 
                         elif self._mode == MapEditor.MOVING:
-                                position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
-                                
+                                position = self._controller.screenToMapCoordinates(realCoords[0], realCoords[1])                                
                                 positionExact = self._controller._layer.getCellGrid().toExactLayerCoordinates(position)
                                 position = self._controller._layer.getCellGrid().toLayerCoordinates(position)