fife-parpg: tools/editor/scripts/mapcontroller.py annotate

annotate tools/editor/scripts/mapcontroller.py @ 582:5e04f6349894

* Improved the floatingtextrenderer. You can now set a background speech quad. * Added a speech quad example to rio de hola. * Little fix to the editor stuff.

author	helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date	Tue, 03 Aug 2010 13:57:12 +0000
parents	b2feacaed53c
children

rev	line source
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	1 # -- coding: utf-8 --
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	2
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	3 # ####################################################################
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	4 # Copyright (C) 2005-2009 by the FIFE team
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	5 # http://www.fifengine.de
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	6 # This file is part of FIFE.
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	7 #
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	8 # FIFE is free software; you can redistribute it and/or
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	9 # modify it under the terms of the GNU Lesser General Public
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	10 # License as published by the Free Software Foundation; either
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	11 # version 2.1 of the License, or (at your option) any later version.
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	12 #
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	13 # This library is distributed in the hope that it will be useful,
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	16 # Lesser General Public License for more details.
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	17 #
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	18 # You should have received a copy of the GNU Lesser General Public
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	19 # License along with this library; if not, write to the
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	20 # Free Software Foundation, Inc.,
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	21 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	22 # ####################################################################
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	23
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	24 import editor
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25 import pdb
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	26
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	27 import math
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 from fife import fife
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 import editor
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	31 import events
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	32 import undomanager
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34 from fife.extensions.pychan.tools import callbackWithArguments as cbwa
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	35 from fife.extensions.fife_settings import Setting
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	36
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	37 TDS = Setting(app_name="editor")
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	39 class MapController(object):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40 """ MapController provides an interface for editing maps """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	41 def __init__(self, map):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	42
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	43 self._editor = editor.getEditor()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 self._engine = self._editor.getEngine()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46 self._camera = None # currently selected camera
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47 self._layer = None # currently selected layer
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 self._selection = [] # currently selected cells
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	49 self._map = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	50 self._undo = False
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	51 self._undomanager = undomanager.UndoManager()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	52 undomanager.preUndo.connect(self._startUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	53 undomanager.preRedo.connect(self._startUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	54 undomanager.postUndo.connect(self._endUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	55 undomanager.postRedo.connect(self._endUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	56 self.debug = False
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	57 self._settings = TDS
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	58
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	59 self.overwriteInstances = True # Remove instances on cell before placing new instance
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	60
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	61 if map is not None:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	62 self.setMap(map.getId())
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	63
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	64 def cleanUp(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	65 undomanager.preUndo.disconnect(self._startUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	66 undomanager.preRedo.disconnect(self._startUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	67 undomanager.postUndo.disconnect(self._endUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	68 undomanager.postRedo.disconnect(self._endUndo, sender=self._undomanager)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	69 self._undomanager.clear()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	70
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	71 self._editor = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	72 self._engine = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	73 self._map = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	74 self._selection = []
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	75 self._layer = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	76 self._camera = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	77
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	78 def setMap(self, mapid):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	79 """ Set the map to be edited """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	80 self._camera = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	81 self._map = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	82 self._layer = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83 self._selection = []
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	85 self._map = self._engine.getModel().getMap(mapid)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	86 if not self._map.getLayers():
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	87 raise AttributeError('Editor error: map ' + self._map.getId() + ' has no layers. Cannot edit.')
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88
422 9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 378 diff changeset	89 for cam in self._map.getCameras():
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 if cam.getLocationRef().getMap().getId() == self._map.getId():
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	91 self._camera = cam
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	92 break
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	93
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	94 self._layer = self._map.getLayers()[0]
432 4f2752d45458 This changes the behavior of Camera::resetRenderers(). It will no longer activate all layers for every renderer. This is now up to the clients to do. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 424 diff changeset	95
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	96 gridrenderer = fife.GridRenderer.getInstance(self._camera)
432 4f2752d45458 This changes the behavior of Camera::resetRenderers(). It will no longer activate all layers for every renderer. This is now up to the clients to do. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 424 diff changeset	97 gridrenderer.activateAllLayers(self._map)
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	98 color = str(self._settings.get("Colors", "Grid", "0,255,0"))
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	99 gridrenderer.setColor(*[int(c) for c in color.split(',')])
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	100
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	101 blockrenderer = fife.BlockingInfoRenderer.getInstance(self._camera)
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	102 blockrenderer.activateAllLayers(self._map)
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	103 color = str(self._settings.get("Colors", "Blocking", "0,255,0"))
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	104 blockrenderer.setColor(*[int(c) for c in color.split(',')])
432 4f2752d45458 This changes the behavior of Camera::resetRenderers(). It will no longer activate all layers for every renderer. This is now up to the clients to do. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 424 diff changeset	105
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	106 coordinaterenderer = fife.CoordinateRenderer.getInstance(self._camera)
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	107 coordinaterenderer.activateAllLayers(self._map)
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	108 color = str(self._settings.get("Colors", "Coordinate", "255,255,255"))
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	109 coordinaterenderer.setColor(*[int(c) for c in color.split(',')])
432 4f2752d45458 This changes the behavior of Camera::resetRenderers(). It will no longer activate all layers for every renderer. This is now up to the clients to do. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 424 diff changeset	110
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	111 cellrenderer = fife.CellSelectionRenderer.getInstance(self._camera)
432 4f2752d45458 This changes the behavior of Camera::resetRenderers(). It will no longer activate all layers for every renderer. This is now up to the clients to do. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 424 diff changeset	112 cellrenderer.activateAllLayers(self._map)
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	113 color = str(self._settings.get("Colors", "CellSelection", "255,0,0"))
582 5e04f6349894 * Improved the floatingtextrenderer. You can now set a background speech quad. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	114 cellrenderer.setColor(*[int(c) for c in color.split(',')])
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	115 cellrenderer.setEnabled(True)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	116
422 9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 378 diff changeset	117 def getMap(self):
9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 378 diff changeset	118 return self._map
9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 378 diff changeset	119
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	120 def selectLayer(self, layerid):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	121 """ Select layer to be edited """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	122 self.deselectSelection()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	123 self._layer = None
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	124 layers = [l for l in self._map.getLayers() if l.getId() == layerid]
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	125 if len(layers) == 1:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	126 self._layer = layers[0]
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	127
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	128 def deselectSelection(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	129 """ Deselects all selected cells """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	130 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	131 if self.debug: print 'No camera bind yet, cannot select any cell'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	132 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	133 self._selection = []
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	134 fife.CellSelectionRenderer.getInstance(self._camera).reset()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	135
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	136 def clearSelection(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	137 """ Removes all instances on selected cells """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	138 instances = self.getInstancesFromSelection()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	139 self._undomanager.startGroup("Cleared selection")
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	140 self.removeInstances(instances)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	141 self._undomanager.endGroup()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	142
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	143 def fillSelection(self, object):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	144 """ Adds an instance of object on each selected cell """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	145 self._undomanager.startGroup("Filled selection")
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	146 for loc in self._selection:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	147 self.placeInstance(loc.getLayerCoordinates(), object)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	148 self._undomanager.endGroup()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	149
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	150 def selectCell(self, screenx, screeny):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	151 """ Selects a cell at a position on screen """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	152 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	153 if self.debug: print 'No camera bind yet, cannot select any cell'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	154 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	155 if not self._layer:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	156 if self.debug: print 'No layer assigned in selectCell'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	157 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	159 mapCoords = self._camera.toMapCoordinates(fife.ScreenPoint(screenx, screeny), False)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	160 position = self._layer.getCellGrid().toLayerCoordinates(mapCoords)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	162 loc = fife.Location(self._layer)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	163 loc.setLayerCoordinates(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	165 for i in self._selection:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	166 if loc == i: return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	167
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168 self._selection.append( loc )
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	169 fife.CellSelectionRenderer.getInstance(self._camera).selectLocation(loc)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	170
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	171 def deselectCell(self, screenx, screeny):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172 """ Deselects a cell at a position on screen """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 if self.debug: print 'No camera bind yet, cannot select any cell'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 if not self._layer:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177 if self.debug: print 'No layer assigned in selectCell'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	178 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	179
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	180 mapCoords = self._camera.toMapCoordinates(fife.ScreenPoint(screenx, screeny), False)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	181 position = self._layer.getCellGrid().toLayerCoordinates(mapCoords)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 loc = fife.Location(self._layer)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 loc.setLayerCoordinates(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	185
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 for i in self._selection:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	187 if loc == i:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	188 self._selection.remove( loc )
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	189 fife.CellSelectionRenderer.getInstance(self._camera).deselectLocation(loc)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	190 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	191
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	192
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	193 def getInstancesFromSelection(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	194 """ Returns all instances in the selected cells """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	195 instances = []
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	196
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	197 for loc in self._selection:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	198 instances.extend(self.getInstancesFromPosition(loc.getLayerCoordinates()))
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	199
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200 return instances
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	201
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	202 def getInstancesFromPosition(self, position, layer=None):
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	203 """ Returns all instances on a specified position """
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	204 if not self._layer and not layer:
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	205 if self.debug: print 'No layer assigned in getInstancesFromPosition'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	206 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	207 if not position:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	208 if self.debug: print 'No position assigned in getInstancesFromPosition'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	209 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	210
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	211 if layer:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	212 loc = fife.Location(layer)
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	213 else:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	214 loc = fife.Location(self._layer)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	215 if type(position) == fife.ExactModelCoordinate:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	216 loc.setExactLayerCoordinates(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	217 else:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	218 loc.setLayerCoordinates(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	219
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	220 if layer:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	221 instances = layer.getInstancesAt(loc)
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	222 else:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	223 instances = self._layer.getInstancesAt(loc)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	224
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	225 return instances
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	226
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	227 def getUndoManager(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	228 """ Returns undo manager """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	229 return self._undomanager
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	230
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	231 def undo(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	232 """ Undo one level """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	233 self._undomanager.undo()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	234
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	235 def redo(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	236 """ Redo one level """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	237 self._undomanager.redo()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	239 def _startUndo(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	240 """ Called before a undo operation is performed. Makes sure undo stack does not get corrupted """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241 self._undo = True
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	242
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 def _endUndo(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 """ Called when a undo operation is done """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	245 self._undo = False
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	246
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	247 def placeInstance(self, position, object, layer=None):
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	248 """ Places an instance of object at position. Any existing instances on position are removed. """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 mname = 'placeInstance'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	250 if not object:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	251 if self.debug: print 'No object assigned in %s' % mname
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	253 if not position:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	254 if self.debug: print 'No position assigned in %s' % mname
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	255 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	256 if not self._layer:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257 if self.debug: print 'No layer assigned in %s' % mname
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	258 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	259
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	260 if self.debug: print 'Placing instance of ' + object.getId() + ' at ' + str(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	261
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	262 # Remove instances from target position
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	263 if not self._undo:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	264 instances = self.getInstancesFromPosition(position)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	265 if len(instances) == 1:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	266 # Check if the only instance at position has the same object
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	267 objectId = instances[0].getObject().getId()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	268 objectNs = instances[0].getObject().getNamespace()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	269 if objectId == object.getId() and objectNs == object.getNamespace():
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	270 if self.debug: print "Tried to place duplicate instance"
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	271 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	272
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	273 self._undomanager.startGroup("Placed instance")
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	274 self.removeInstances(instances)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	275
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	276 if layer:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	277 inst = layer.createInstance(object, position)
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	278 else:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	279 inst = self._layer.createInstance(object, position)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	280 fife.InstanceVisual.create(inst)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	281
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	282 if not self._undo:
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	283 redocall = cbwa(self.placeInstance, position, object, inst.getLocation().getLayer())
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	284 undocall = cbwa(self.removeInstanceOfObjectAt, position, object, inst.getLocation().getLayer())
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	285 undoobject = undomanager.UndoObject(undocall, redocall, "Placed instance")
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	286 self._undomanager.addAction(undoobject)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	287 self._undomanager.endGroup()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	288
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	289 def removeInstanceOfObjectAt(self, position, object, layer=None):
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	290 """ Removes the first instance of object it can find on position """
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	291 instances = self.getInstancesFromPosition(position, layer)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	292 for i in instances:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	293 if i.getObject().getId() == object.getId() and i.getObject().getNamespace() == object.getNamespace():
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	294 self.removeInstances([i],layer)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	295 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	296
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	297 def removeInstances(self, instances, layer=None):
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	298 """ Removes all provided instances """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	299 mname = 'removeInstances'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	300 if not instances:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	301 if self.debug: print 'No instances assigned in %s' % mname
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	302 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	303
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	304 for i in instances:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	305 if self.debug: print 'Deleting instance ' + i.getObject().getId() + ' at ' + str(i.getLocation().getExactLayerCoordinates())
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	306
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	307 if not self._undo:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	308 object = i.getObject()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	309 position = i.getLocation().getExactLayerCoordinates()
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	310 undocall = cbwa(self.placeInstance, position, object, i.getLocation().getLayer())
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	311 redocall = cbwa(self.removeInstanceOfObjectAt, position, object, i.getLocation().getLayer())
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	312 undoobject = undomanager.UndoObject(undocall, redocall, "Removed instance")
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	313 self._undomanager.addAction(undoobject)
423 04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	314
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	315 if layer:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	316 layer.deleteInstance(i)
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	317 else:
04029ebc5670 This fixes an editor bug when you place an instance and select another layer then undo that placement. Same with deleting an instance. [t:443] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 422 diff changeset	318 self._layer.deleteInstance(i)
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	319
424 e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	320 def moveInstances(self, instances, moveBy, exact=False, origLoc=None, origFacing=None):
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	321 """ Moves provided instances by moveBy. If exact is false, the instances are
424 e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	322 snapped to closest cell. origLoc and origFacing are only set when an undo/redo
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	323 operation takes place and will have no effect and should not be used under normal
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	324 circumstances."""
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	325 mname = 'moveInstances'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	326 if not self._layer:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	327 if self.debug: print 'No layer assigned in %s' % mname
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	328 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	329
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	330 if exact and type(moveBy) != fife.ExactModelCoordinate:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	331 moveBy = fife.ExactModelCoordinate(float(moveBy.x), float(moveBy.y), float(moveBy.z))
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	332 elif exact is False and type(moveBy) != fife.ModelCoordinate:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	333 moveBy = fife.ModelCoordinate(int(round(moveBy.x)), int(round(moveBy.y)), int(round(moveBy.z)))
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	334
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	335 for i in instances:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	336 loc = i.getLocation()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	337 f = i.getFacingLocation()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	338 if exact:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	339 newCoords = loc.getExactLayerCoordinates() + moveBy
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	340 loc.setExactLayerCoordinates(newCoords)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	341 f.setExactLayerCoordinates(f.getExactLayerCoordinates() + moveBy)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	342 else:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	343 # Move instance and snap to closest cell
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	344 newCoords = loc.getLayerCoordinates() + moveBy
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	345 loc.setLayerCoordinates(newCoords)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	346 f.setLayerCoordinates(f.getLayerCoordinates() + moveBy)
424 e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	347
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	348 if not self._undo:
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	349 undocall = cbwa(self.moveInstances, [i], moveBy, exact, i.getLocation(), i.getFacingLocation())
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	350 redocall = cbwa(self.moveInstances, [i], moveBy, exact, i.getLocation(), i.getFacingLocation())
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	351 undoobject = undomanager.UndoObject(undocall, redocall, "Moved instance")
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	352 self._undomanager.addAction(undoobject)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	353 i.setLocation(loc)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	354 i.setFacingLocation(f)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	355
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	356 else:
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	357 assert(origLoc)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	358 assert(origFacing)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	359 i.setLocation(origLoc)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	360 i.setFacingLocation(origFacing)
e29fbf84cb41 Adding undo/redo support for moving instances. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 423 diff changeset	361
378 64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	362
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	363 def rotateCounterClockwise(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	364 """ Rotates map counterclockwise by 90 degrees """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	365 currot = self._camera.getRotation()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	366 self._camera.setRotation((currot + 270) % 360)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	367
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	368 def rotateClockwise(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	369 """ Rotates map clockwise by 90 degrees """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	370 currot = self._camera.getRotation()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	371 self._camera.setRotation((currot + 90) % 360)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	372
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	373 def getZoom(self):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	374 """ Returns camera zoom """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	375 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	376 if self.debug: print 'No camera bind yet, cannot get zoom'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	377 return 0
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	378 return self._camera.getZoom()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	379
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	380 def setZoom(self, zoom):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	381 """ Sets camera zoom """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	382 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	383 if self.debug: print 'No camera bind yet, cannot get zoom'
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	384 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 self._camera.setZoom(zoom)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	386
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	387 def moveCamera(self, screen_x, screen_y):
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	388 """ Move camera (scroll) by screen_x, screen_y """
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 if not self._camera:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	390 return
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	391
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	392 coords = self._camera.getLocationRef().getMapCoordinates()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	393 z = self._camera.getZoom()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	394 r = self._camera.getRotation()
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	395 if screen_x:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	396 coords.x -= screen_x / z * math.cos(r / 180.0 * math.pi) / 100;
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	397 coords.y -= screen_x / z * math.sin(r / 180.0 * math.pi) / 100;
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	398 if screen_y:
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	399 coords.x -= screen_y / z * math.sin(-r / 180.0 * math.pi) / 100;
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	400 coords.y -= screen_y / z * math.cos(-r / 180.0 * math.pi) / 100;
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	401 coords = self._camera.getLocationRef().setMapCoordinates(coords)
64738befdf3b bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife. vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	402 self._camera.refresh()

Mercurial > fife-parpg

annotate tools/editor/scripts/mapcontroller.py @ 582:5e04f6349894