Changeset 346

Timestamp:

05/30/08 08:24:53 (6 months ago)

Author:

FeepingCreature

Message:

• Changed the path
  
• Added ten lives functionality
  
• Switched to more powerful selection system
  
• Removed skewed circle functionality, was not needed
  
• keystate and mouse state are always set
  
• added blink() which is neat
  

Files:

• trunk/qd/dt.d (modified) (21 diffs)
• trunk/qd/qd.d (modified) (4 diffs)

trunk/qd/dt.d

@@ -8 +8 @@
-import qd, dglut.vector;
-
+import tools.time;
+bool delegate() blink(float _delay) {
+  return stuple(_delay, true, sec()) /apply/ (float delay, ref bool state, ref float last) {
+    if (sec() < last) {
+      last = sec(); // timer wrapped around. Can't help this. Don't switch. Hope the user doesn't notice.
+      return state;
+    }
+    while (sec() - last > delay) { last += delay; state = !state; }
+    return state;
+  };
+}
+
-float randf() { return (cast(float)rand())/(cast(float)(typeof(rand()).max)); }
-
@@ -16 +28 @@
-  abstract void draw();
-  abstract void update();
+}
+
+interface InteractingThing {
+  void select(); void unselect();
+  void highlight(); void unhighlight();
+  bool isSelected(); bool isHighlighted();
+}
+
+template InteractingImpl() {
+  bool selected, highlighted;
+  void select() { selected = true; highlighted = true; }
+  void highlight() { highlighted = true; }
+  void unselect() { selected = false; } void unhighlight() { highlighted = false; }
+  bool isSelected() { return selected; } bool isHighlighted() { return selected || highlighted; }
-}
-
@@ -28 +54 @@
-class LivingThing : WorldThing {
-  private {
-
+maxlife, 
-    void delegate(LivingThing) onDeath;
-  }
@@ -34 +60 @@
-  void damage(int howmuch) { life-=howmuch; if (life!>0) onDeath(this); }
-  void die() { damage(life); onDeath(this); }
-
+; #maxlife=life; 
-}
-
@@ -108 +134 @@
-
-class Critter : LivingThing , MovingThing {
-  //void draw() { circle(x, y, radius, Black, Fill=Blue~White~White); }
-  void draw() {
-    bufferedCircle(pos.to!(int).tuple, radius, Black, Fill=Blue~White~White);
@@ -122 +147 @@
-  void damage(typeof(life) d) {
-    super.damage(d);
-
+
+
+
+
-  }
-  void update() {
@@ -130 +158 @@
-  float speed;
-  void delegate() win;
+  void done() { win(); die(); }
-  private {
-    int maxlife;
-    Path path;
-    Path.Train train;
-    void initTrain() {
-win
+&done
-    }
-    long id;
-  }
-maxlife=life; #
+
-}
-
@@ -280 +308 @@
-}
-
-
+
+
-  struct Settings {
-    int range, rate;
@@ -296 +325 @@
-  void draw() {
-    auto ipos = pos.to!(int);
-mouseOver(this)
+isHighlighted
-      circle(ipos.tuple, settings.range+1, White);
-      circle(ipos.tuple, settings.range, Black);
-      circle(ipos.tuple, settings.range-1, White);
-    }
-
+
+
-    Teh_Ordnance.draw;
-  }
@@ -342 +372 @@
-    bool break_mode;
-    Path path;
+    int score;
+    void delegate() critter_hit;
-  }
-  TargetGroup critters;
-
+critter_hit, 
-    #group_left=groupsize; #critters=new TargetGroup; #break_mode=true; #break_left=breaktime; ");
-  void draw() {
@@ -354 +386 @@
-    else if (group_left) text = Format(group_left);
-    critters.draw;
-
+
+
+
-    .print(pos.to!(int).tuple, Center, Black, text);
-  }
-throw new Exception("The critters win!"
+critter_hit(
-  static long id=0;
-  void update() {
@@ -378 +412 @@
-    } else group_left --;
-    // yes the last critter is intentionally stronger.
-
+
+
+
-    critters.addThing(newCritter); newCritter.update;
-  }
@@ -441 +477 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-import test13, tools.functional;
-void main() {
+  auto blink_fn = blink(0.5);
-  vec2f mouse_pos, start;
-  bool drag=false;
-  bool[int] pressed;
-
-
-
-
-
-
-
+
+
+
+
+
+
-    with (wt) {
-      if (pos.x+radius<min(start.x, mouse_pos.x)) return false;
@@ -461 +512 @@
-      if (pos.y-radius>max(start.y, mouse_pos.y)) return false;
-    }
+    logln(cast(void*) wt, " under selection.");
-    return true;
-
-
+
-  screen(640, 480);
-  while (!mouse.clicked) { flip; events; }
@@ -469 +520 @@
-  Group!(Thing) group;
-  auto path=new Path(false,
-
+
+
-  );
-  
-  auto bg_surf = screen.With(screen.w, screen.h) = {
-    FatLine fl;
-vec2f(300, 400) ~ 
+
-      if (abs(d) > fl.width) return Background;
-      else if (abs(d) > fl.width - 2) return Background.blend(Black, (fl.width - abs(d)) / 2f);
@@ -483 +535 @@
-  };
-  
-
+
+
+
+
+
+
-  group=new typeof(group)([cast(Thing)spawner]);
-  group.addThing(new Turret(
-    Turret.Settings(115, 24, false),
-    Ammo.Settings(/*speed*/ 1.5f, /*aim*/ 0.25, /*momentum_speed*/0, /*momentum_dir*/ 1, /*damage*/ 8, /*lifetime*/256, /*linger*/true, /*punchthrough*/false),
-85, 22
+30, 34
-  ));
-  group.addThing(new Turret(
-6, tru
+12, fals
-    Ammo.Settings(/*speed*/ 0.9f, /*aim*/ 0, /*momentum_speed*/0.9, /*momentum_dir*/ 0.98, /*damage*/ 2, /*lifetime*/1024, true, false, true),
-185, 13
+360, 8
-  ));
-  group.addThing(effects);
@@ -502 +559 @@
-  scope(exit) writefln("Average FPS: ", avg/(cast(float)count));
-  auto limiter=new FrameLimiter(60, 60);
+  bool delegate(WorldThing) shouldHighlight = &underMouse;;
-  do with (group) {
-    update;
@@ -507 +565 @@
-    display.blit(bg_surf);
-    prettyprint(0, 0, Bottom|Right,
-"Test .. [size -1]test![/size] [b]Bold, [i]italic and [u]underlined![/u][/i][/b] [i]Just italic now.[/i] [b][color #f00]Red?[/color][/b]Done!"
+Format("Score: [b][size -2]", spawner.score, "[/size][/b]")
-    draw;
+    withSet(alpha, 64, { circle(path.points[$-1].to!(int).tuple, 15, Fill=Yellow~Black); });
+    string formatting = Format(hits_counter);
+    auto b = blink_fn();
+    if (hits_counter <= 3) formatting = "[size +4]"~(b?"[color #f88][b]":"")~formatting~(b?"[/b][/color]":"")~"[/size]";
+    formatting = "[color #c80]"~formatting~"[/color]";
+    .prettyprint(path.points[$-1].to!(int).tuple, Center, formatting);
-    if (drag) {
-      tintfill(start.min(mouse_pos).to!(int).tuple, start.max(mouse_pos).to!(int).tuple, Blue~White);
@@ -520 +584 @@
-      if (key==27) throw new Error("Quit");
-    }, (int x, int y, ubyte button, int p) {
+      foreach (thing; group) {
+        auto wt = cast(WorldThing) thing, it = cast(InteractingThing) thing;
+        if (wt && it)
+          if (shouldHighlight(wt)) thingies.addHighlight(it);
+          else thingies.rmHighlight(it);
+      }
-      if (!button) {
-        mouse_pos.x=x; mouse_pos.y=y;
@@ -525 +595 @@
-        if (p==1) {
-          start.x=x; start.y=y;
-          mouseOver=dragMouseOver;
-          drag=true;
+          shouldHighlight = &underSelection;
-        }
-        if (p==-1) {
-
-
-
+
+
-          drag=false;
-        }
@@ -546 +615 @@
-      fps=0;
-    }
-    // with (Background) SDL_FillRect(display.surface, null, SDL_MapRGBA(display.surface.format, values[0], values[1], values[2], 0));
-  } while (true);
-}

trunk/qd/qd.d

@@ -441 +441 @@
-  const string yx=(first?"y":"x");
-  const string str="
-x
-y
-yradius*yradius*"~(first?"(1-2*x
-xradius*xradius*"~(first?"1":"(1-2*y
+
+
+radius*radius*"~(first?"(1-2*
+radius*radius*"~(first?"1":"(1-2*
-    auto error=0;
-x
-y
+
+
-    while (stopx"~(first?">=":"<=")~"stopy) {
-      putpixel(cx+x, cy+y, col);
@@ -486 +486 @@
-void circle(T...)(T t) {
-  static assert(T.length!<3, "Circle: Needs x, y and radius");
-x
+
-  SDL_LockSurface(display.surface);
-  scope(exit) { SDL_UnlockSurface(display.surface); if (doFlip) flip; }
-  execParams(t[3..$]);
-
-
+
-  static if (T.length>3 && is(T[3]: int)) yradius=t[3];
-  static if (Select!(back_rgb, T) != -1) {
-    auto ratio=xradius*1f/yradius;
-    auto back_sdl=SDL_MapRGBA(display.surface.format, back.values[0], back.values[1], back.values[2], 0);
-y
-yradius*yradius-i*i))*ratio
+
+radius*radius-i*i))
-      hline(cx-j, cy+i, 2*j, back_sdl);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -622 +621 @@
-}
-
+bool[int] keystate;
+
-/// parameters to key: which key, and if it's pressed or released
-/// parameters to mouse: x, y, button [Left: 1, Mid: 2, Right: 3], change [1: pressed, -1: released]
@@ -629 +630 @@
-    switch (evt.type) {
-      case SDL_EventType.MouseMotion:
-
+
+
+
+
-        break;
-      case SDL_EventType.MouseButtonDown:
-
+
+
+
+
-        break;
-      case SDL_EventType.MouseButtonUp:
-
+
+
+
+
-        break;
-      case SDL_EventType.KeyDown:
+        keystate[evt.key.keysym.sym] = true;
-        if (key) key(evt.key.keysym.sym, true);
+        break;
-      case SDL_EventType.KeyUp:
+        keystate.remove(evt.key.keysym.sym);
-        if (key) key(evt.key.keysym.sym, false);
-        break;