Mercurial > fife-parpg
diff demos/shooter/scripts/world.py @ 490:939a4dc12ca1
Starting to add some comments.
Cleaned up some old commented out code.
The SoundManager now creates a new SoundClip rather than only creating one per FIFE SoundEmitter.
| author | prock@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Wed, 05 May 2010 21:39:31 +0000 |
| parents | 85fa5fa486a8 |
| children | c4168eb47a44 |
line wrap: on
line diff
--- a/demos/shooter/scripts/world.py Wed May 05 14:29:37 2010 +0000 +++ b/demos/shooter/scripts/world.py Wed May 05 21:39:31 2010 +0000 @@ -50,7 +50,8 @@ """ def __init__(self, app, engine): - super(World, self).__init__(engine, regMouse=True, regKeys=True) + super(World, self).__init__(engine, regKeys=True) + self._applictaion = app self._engine = engine self._timemanager = engine.getTimeManager() @@ -251,7 +252,8 @@ for cam in self._map.getCameras(): if cam.getId() == 'main': self.cameras['main'] = cam - + + #pass the camera to the scene as the scene controls the cameras position self._scene.attachCamera(self.cameras['main']) def resetKeys(self): @@ -297,23 +299,6 @@ elif keyval in (fife.Key.LEFT_CONTROL, fife.Key.RIGHT_CONTROL): self._keystate['CTRL'] = False - def mouseWheelMovedUp(self, evt): - if self._keystate['CTRL']: - self.cameras['main'].setZoom(self.cameras['main'].getZoom() * 1.05) - - def mouseWheelMovedDown(self, evt): - if self._keystate['CTRL']: - self.cameras['main'].setZoom(self.cameras['main'].getZoom() / 1.05) - - def mousePressed(self, evt): - if evt.isConsumedByWidgets(): - return - - clickpoint = fife.ScreenPoint(evt.getX(), evt.getY()) - - def mouseMoved(self, evt): - pt = fife.ScreenPoint(evt.getX(), evt.getY()) - def pump(self): """ Called every frame. @@ -322,7 +307,7 @@ if self._genericrenderer: self._genericrenderer.removeAll("quads") - + #scene hasn't been initialized. Nothing to do. if not self._scene: return @@ -333,7 +318,6 @@ self._scene.update(self._timemanager.getTime() - self._starttime, self._keystate) - #update the HUD avgframe = self._timemanager.getAverageFrameTime() if avgframe > 0: