[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...
From: |
Matti Katila |
Subject: |
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j... |
Date: |
Fri, 03 Jan 2003 14:05:24 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 03/01/03 14:05:24
Modified files:
gzz/modules/pp : PPMouseEvents.java PPView2.java demotest.py
Log message:
fix replaceNewScene
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.13
gzz/gzz/modules/pp/PPMouseEvents.java:1.14
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.13 Fri Jan 3 04:55:55 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java Fri Jan 3 14:05:24 2003
@@ -28,7 +28,7 @@
*/
public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.13 2003/01/03
09:55:55 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.14 2003/01/03
19:05:24 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
@@ -95,9 +95,6 @@
m_ev.accursed_obj = null;
m_ev.hit = null;
-
- pa("king: " +kingCS+" getCS"+p_state.getCS() );
-
// KLUDGE!!!
// there are no good way in gzz to handle events :/
if (p_state.getCS() == kingCS && notEmptyFrame(kingCS, p_state)) {
@@ -295,6 +292,7 @@
ppv.zoom = m_ev.last_zoom * (float)
Math.exp((p_state.getY() - ev.getY())/150.0);
pa(""+ppv.zoom);
+ ppv.replaceNewScene = true;
}
// moving in mainVP and event passing
else if (p_state.getButtons() == ev.BUTTON1_MASK) {
@@ -311,6 +309,7 @@
else {
ppv.panx = m_ev.last_panx - (ev.getX() -
p_state.getX())/ppv.zoom;
ppv.pany = m_ev.last_pany - (ev.getY() -
p_state.getY())/ppv.zoom;
+ ppv.replaceNewScene = true;
}
} else return;
@@ -328,6 +327,8 @@
ppv.panx = m_ev.last_panx - (ev.getX() - p_state.getX())/ppv.zoom;
ppv.pany = m_ev.last_pany - (ev.getY() - p_state.getY())/ppv.zoom;
+
+ ppv.replaceNewScene = true;
ppv.setZoomPan(vs);
AbstractUpdateManager.setNoAnimation();
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.37
gzz/gzz/modules/pp/PPView2.java:1.38
--- gzz/gzz/modules/pp/PPView2.java:1.37 Fri Jan 3 05:20:53 2003
+++ gzz/gzz/modules/pp/PPView2.java Fri Jan 3 14:05:24 2003
@@ -36,7 +36,7 @@
import java.util.*;
public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.37 2003/01/03
10:20:53 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.38 2003/01/03
19:05:24 mudyc Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
@@ -44,7 +44,7 @@
private EventHandling ev_handler = EventHandling.i();
public PPMouseEvents pp_events;
-
+ public boolean replaceNewScene = false;
// Geometry
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.38 gzz/gzz/modules/pp/demotest.py:1.39
--- gzz/gzz/modules/pp/demotest.py:1.38 Fri Jan 3 12:29:12 2003
+++ gzz/gzz/modules/pp/demotest.py Fri Jan 3 14:05:24 2003
@@ -9,7 +9,6 @@
from java.lang import Math
from java.awt.event import MouseEvent
from java.io import File
-from java.util.zip import ZipFile
from gfx.libutil import effects
@@ -88,10 +87,11 @@
print self.vs.matcher.interpList(self.vs.matcher)
if key == "Ctrl-X":
print 'Save...'
+ print 'Be sure you got "/tmp/pp/" directory'
# Next, the mediaserver we'll save to.
ms = gzz.mediaserver.SimpleMediaserver(
- gzz.mediaserver.storage.ZipStorer(ZipFile("/tmp/pp.zip/")))
+ gzz.mediaserver.storage.DirStorer(File("/tmp/pp/")))
# We'll use a fake mediaserver pointer
pointer_id = "FOObar"
@@ -111,7 +111,7 @@
# Next, the mediaserver we'll save to.
ms = gzz.mediaserver.SimpleMediaserver(
- gzz.mediaserver.storage.ZipStorer(ZipFile("/tmp/pp.zip/")))
+ gzz.mediaserver.storage.DirStorer(File("/tmp/pp/")))
# We'll use a fake mediaserver pointer
pointer_id = "FOObar"
@@ -173,17 +173,21 @@
self.ppv.render(vs, 0, self.avc)
vs.matcher.setKeyMap(self.map)
self.vs = vs
+
def mouse(self, ev):
ev_h = self.ppv.pp_events
ev_h.vs = self.vs
ev_h.context = self.avc
gzz.modules.pp.EventHandling.i().handleEvent(self.vs, ev);
- #if ev.getID() == ev.MOUSE_DRAGGED:
- # print 'replaceNewScene'
- #
- # According to mudyc's test you can't use replaceNewScene when
- # you do handle mouse events or no difference is shown on screen.
- # replaceNewScene(self.vs)
+ if ev.getID() == ev.MOUSE_PRESSED:
+ self.ppv.replaceNewScene = 0
+ return
+
+ if self.ppv.replaceNewScene:
+ replaceNewScene(self.vs)
+
+ # According to mudyc's test you must be careful when you are
allowed to replaceNewScene.
+ # Sometimes no difference is shown on screen which hardly is your
purpose.
gzz.view.CoordinatePlaneView.dbg = 0
gzz.view.Cell1DBuoyHook.dbg = 0
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...,
Matti Katila <=
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j..., Matti Katila, 2003/01/03
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j..., Matti Katila, 2003/01/07
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j..., Matti Katila, 2003/01/08
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j..., Matti Katila, 2003/01/09
- [Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j..., Matti Katila, 2003/01/10