changeset 570:0e0a30f0eb20

Finally found the bug when you create a new map and are unable to place instances on the map until you save and re-load the map.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 28 Jun 2010 21:28:44 +0000
parents 466d76db9701
children edc9efe969c2
files tools/editor/scripts/gui/cameradialog.py tools/editor/scripts/gui/layerdialog.py tools/editor/scripts/mapview.py
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tools/editor/scripts/gui/cameradialog.py	Mon Jun 28 19:28:53 2010 +0000
+++ b/tools/editor/scripts/gui/cameradialog.py	Mon Jun 28 21:28:44 2010 +0000
@@ -106,6 +106,9 @@
 		cam.setCellImageDimensions(refw, refh)
 		cam.setRotation(rot)
 		cam.setTilt(tilt)
+		
+		renderer = fife.InstanceRenderer.getInstance(cam)
+		renderer.activateAllLayers(map)
 	
 		self._widget.hide()
 
--- a/tools/editor/scripts/gui/layerdialog.py	Mon Jun 28 19:28:53 2010 +0000
+++ b/tools/editor/scripts/gui/layerdialog.py	Mon Jun 28 21:28:44 2010 +0000
@@ -26,12 +26,13 @@
 from fife.extensions.pychan import dialogs
 
 class LayerDialog(object):
-	""" The B{LayerDialog} provides a gui dialog for creating and editing layers.
+	""" 
+	The B{LayerDialog} provides a gui dialog for creating and editing layers.
 	
 		FIXME:
 			- gridtypes can only be square for now
 			- pathing strategy 
-	"""
+    """
 	def __init__(self, engine, map, callback=None, onCancel=None, layer=None):
 		self.engine = engine
 		self.model = engine.getModel()
--- a/tools/editor/scripts/mapview.py	Mon Jun 28 19:28:53 2010 +0000
+++ b/tools/editor/scripts/mapview.py	Mon Jun 28 21:28:44 2010 +0000
@@ -106,7 +106,7 @@
 			print "Camera is not associated with this map"
 			return
 			
-		self._camera = None
+		self._camera = camera
 	
 	def getController(self):
 		return self._controller
@@ -154,4 +154,4 @@
 		self._cleanUp()
 		
 		events.postMapClosed.send(sender=self, mapview=self)
-	
\ No newline at end of file
+