Changeset 924

Timestamp:

02/04/2011 01:18:52 PM (10 years ago)

Author:

dave

Message:

entities now optionally have a tile location, improved hiding

Location:

scenarios/GerminationX/fungi/src

Files:

• Fungi.hx (modified) (6 diffs)
• truffle/Bone.hx (modified) (1 diff)
• truffle/Entity.hx (modified) (4 diffs)
• truffle/flash/FlashSprite.hx (modified) (2 diffs)
• truffle/flash/FlashWorld.hx (modified) (3 diffs)
• truffle/interfaces/Sprite.hx (modified) (1 diff)
• truffle/interfaces/World.hx (modified) (1 diff)

scenarios/GerminationX/fungi/src/Fungi.hx

@@ -154 +154 @@
 {
     public var Name:String;
+
     var Debug:flash.text.TextField;
         var BG:Graphics;
@@ -167 +168 @@
         var tf = new flash.text.TextField();
         tf.text = "nowt yet.";
-        tf.x=Pos.x-50;
+        tf.x=Pos.x-150;
         tf.y=Pos.y-25;
         tf.height=150;
@@ -187 +188 @@
         BG.drawRect(tf.x,tf.y,tf.width,tf.height);
         BG.endFill();
+        figures.visible=false;
         cast(c,truffle.flash.FlashWorld).addChild(figures);
 
         c.addChild(tf);
         Debug=tf;
-        /*tf.visible=false;
-        Root.MouseOver(this,function(c) { tf.visible=true; });
-        Root.MouseOut(this,function(c) { tf.visible=false; });*/
+        tf.visible=false;
 
         Root.MouseDown(c,function(c)
         {
-            trace("perc...");
-            c.Server.Request("perceive",1,function(c,d){});
+            tf.visible=!tf.visible;
+            figures.visible=!figures.visible;
         });
         }
@@ -204 +204 @@
     public function UpdateEmotions(e:Dynamic)
     {
+        SetTilePos(new Vec2(Std.parseInt(e.tile.x),
+                            Std.parseInt(e.tile.y)));
+
+        LogicalPos = new Vec3(Std.parseInt(e.pos.x),
+                              Std.parseInt(e.pos.y),
+                              4);
+
         var ee = e.emotions.content;
         var mood=Std.parseFloat(ee[0].content[0]);
@@ -229 +236 @@
         t.color= 0x000000;           
         Debug.setTextFormat(t);
+        Debug.x=Pos.x-150;
+        Debug.y=Pos.y-25;
 
         BG.clear();
@@ -403 +412 @@
         {
                 WorldPos=pos;
+        SetCurrentTilePos(new Vec2(pos.x,pos.y));
                 
                 var circles = [];

scenarios/GerminationX/fungi/src/truffle/Bone.hx

@@ -64 +64 @@
     }
 
+    override function Hide(s:Bool) : Void
+    {
+        if (Hidden!=s)
+        {
+            super.Hide(s);
+            for (c in Children)
+            {
+                c.Hide(s);
+            }
+        }
+    }
+
     public function Print()
     {

scenarios/GerminationX/fungi/src/truffle/Entity.hx

@@ -19 +19 @@
 class Entity
 {
-    public var LogicalPos:Vec3;
-    public var Depth:Float;
-    public var Pos:Vec3;
-    public var NeedsUpdate:Bool;
+    public var TilePos:Vec2;     // position in the world in tiles 
+    public var LogicalPos:Vec3;  // position in it's tile
+    public var Pos:Vec3;         // screen position
+    public var Depth:Float;      // depth from camera
+    public var NeedsUpdate:Bool; 
+    public var Hidden:Bool;
                 
         public function new(w:World,pos:Vec3) 
@@ -28 +30 @@
         LogicalPos=pos;
         Pos = Pos2PixelPos(LogicalPos);
+        TilePos = null;
         Depth = Pos.z;
         NeedsUpdate=false;
@@ -46 +49 @@
                         pos.x*0.51 + pos.y*0.71 + pos.z*0.47);             
         }
-                
+
+    public function SetTilePos(s:Vec2) : Void
+    {
+        TilePos=s;
+    }
+
         public function Update(frame:Int, world:World)
         {
@@ -61 +69 @@
     {
     }
+
+    public function Hide(s:Bool) : Void
+    {
+        Hidden=s;
+        if (GetRoot()) GetRoot().Hide(s);
+    }
 }

scenarios/GerminationX/fungi/src/truffle/flash/FlashSprite.hx

@@ -38 +38 @@
     public var Angle:Float;
     public var MyScale:Vec2;
+    public var Hidden:Bool;
     var Transform:Matrix;
     var Depth:Int;
@@ -70 +71 @@
     public function Hide(s:Bool) : Void
     {
+        Hidden=s;
         visible=!s;
     }

scenarios/GerminationX/fungi/src/truffle/flash/FlashWorld.hx

@@ -30 +30 @@
     var MouseDownFunc:Dynamic -> Void;
     var MouseDownContext:Dynamic;
+    var CurrentTilePos:Vec2;
 
     function new()
@@ -35 +36 @@
         super();
         Scene = [];
+        CurrentTilePos=new Vec2(0,0); // perhaps
     }
 
@@ -107 +109 @@
     }
 
+    public function SetCurrentTilePos(s:Vec2) : Void
+    {
+        CurrentTilePos=s;
+    }
+
     public function Update(time)
     {
         for (e in Scene)
         {
-            if (e.NeedsUpdate)
+            if (e.TilePos!=null)
+            {
+                e.Hide(!e.TilePos.Eq(CurrentTilePos));
+            }
+
+            if (e.NeedsUpdate && !e.Hidden)
             {
                 e.Update(time,cast(this,truffle.World));

scenarios/GerminationX/fungi/src/truffle/interfaces/Sprite.hx

@@ -26 +26 @@
     public var Angle:Float;
     public var MyScale:Vec2;
+    public var Hidden:Bool;
 
         public function MouseDown(c:Dynamic, f:Dynamic -> Void=null) : Void;

scenarios/GerminationX/fungi/src/truffle/interfaces/World.hx

@@ -30 +30 @@
     public function Update(time:Int) : Void;
     public function Handle(event:Int) : Void;
+    public function SetCurrentTilePos(s:Vec2) : Void;
 }