Changeset 373

Timestamp:

07/03/08 00:54:53 (5 months ago)

Author:

FeepingCreature

Message:

• Moved redimple to tools
  
• Stuff
  

Files:

• trunk/qd/ProggyClean.ttf (added)
• trunk/qd/dsss.conf (modified) (2 diffs)
• trunk/qd/qd.d (modified) (7 diffs)
• trunk/qd/test.d (modified) (1 diff)
• trunk/qd/test15.d (added)
• trunk/redimple (added)
• trunk/redimple/dsss.conf (added)
• trunk/redimple/redimple.d (added)
• trunk/tools/tools/downloader.d (modified) (1 diff)
• trunk/tools/tools/page_queue.d (modified) (1 diff)
• trunk/tools/tools/threads.d (modified) (2 diffs)

trunk/qd/dsss.conf

@@ -4 +4 @@
-# [dt/main.d]
-# buildflags=-L-lSDL -L-lSDL_ttf -g -O
-# 
-
+
+
-[test2.d]
-buildflags=-L-lSDL -L-lSDL_ttf -g
@@ -33 +33 @@
-[snake.d]
-buildflags=-L-lSDL
+[test15.d]
+buildflags=-L-lSDL -L-lSDL_ttf

trunk/qd/qd.d

@@ -1 +1 @@
-module qd;
-import std.c.string, std.math, std.traits: ParameterTypeTuple;
+
+uint delegate() qd_rand;
+import std.random;
+static this() { qd_rand = { return rand(); }; }
-
-import tools.base;
@@ -182 +186 @@
-    return res;
-  }
+  static rgb rand() { return rgb(qd_rand() % 255, qd_rand() % 255, qd_rand() % 255); }
-  bool opEquals(rgb r) {
-    return values == r.values;
@@ -227 +232 @@
-  putpixel32(display.surface, transformed.tupleof, col);
-}
+
+void blend(ubyte* rgba, ubyte nr, ubyte ng, ubyte nb, ubyte alpha) {
+  rgba[0] = cast(ubyte) (rgba[0] + ((nr - rgba[0]) * alpha) / 255);
+  rgba[1] = cast(ubyte) (rgba[1] + ((ng - rgba[1]) * alpha) / 255);
+  rgba[2] = cast(ubyte) (rgba[2] + ((nb - rgba[2]) * alpha) / 255);
+}
+
-void putpixel(int x, int y, ubyte r, ubyte g, ubyte b) {
-  putpixel(x, y, SDL_MapRGBA(display.surface.format, r, g, b, 0));
+}
+void putpixel(int x, int y, ubyte[3] rgb, ubyte a) {
+  ubyte[4] old_rgba;
+  getpixel32(display.surface, display.tl.x + x, display.tl.y + y, &old_rgba);
+  blend(old_rgba.ptr, rgb[0], rgb[1], rgb[2], a);
+  putpixel(x, y, SDL_MapRGBA(display.surface.format, old_rgba[0], old_rgba[1], old_rgba[2], 0));
-}
-
@@ -355 +373 @@
-}
-
+void bresenham_aa(bool countUp=true, bool steep=false)(int x0, int y0, int x1, int y1) {
+  auto deltax = x1 - x0, deltay = y1 - y0;
+  static if (steep) {
+    auto Δerror = cast(float)deltax / cast(float)deltay;
+    auto var2 = x0;
+    const string name="y";
+  } else {
+    auto Δerror = cast(float)deltay / cast(float)deltax;
+    auto var2 = y0;
+    const string name="x";
+  }
+  auto error = 0f;
+  for (auto var1 = mixin(name~'0'); var1 <= mixin(name~'1'); ++var1) {
+    auto alpha = cast(ubyte) (error*255);
+    static if (steep) {
+      if (countUp) {
+        putpixel(var2, var1, color.values, 255-alpha);
+        if (var2 < display.width) putpixel(var2+1, var1, color.values, alpha);
+      } else {
+        putpixel(var2, var1, color.values, alpha);
+        if (var2 > 0) putpixel(var2-1, var1, color.values, 255-alpha);
+      }
+    } else {
+      if (countUp) {
+        putpixel(var1, var2, color.values, 255-alpha);
+        if (var2 < display.height) putpixel(var1, var2+1, color.values, alpha);
+      } else {
+        putpixel(var1, var2, color.values, alpha);
+        if (var2 > 0) putpixel(var1, var2-1, color.values, 255-alpha);
+      }
+    }
+    error += Δerror;
+    if (abs(error) >= 1f) { static if (countUp) { var2++; error -= 1f; } else { var2--; error += 1f; }}
+  }
+}
+
-template _UnPoint(int curOffs, T...) {
-  static if (T.length) {
@@ -395 +449 @@
-}
-
+bool aa = true;
+
-void _line(T...)(int x0, int y0, int x1, int y1, T p) {
-  static int max(int a, int b) { return a>b?a:b; }
@@ -428 +484 @@
-    else { if (x1 < x0) turn; }
-    bool stepUp=steep ? (x0 < x1) : (y0 < y1);
-
-
-
-
-
-
-
+
+
+
-  }
-}
@@ -488 +540 @@
-import std.stdio;
-void circle(T...)(T t) {
+  static assert(T.length!<3, "Circle: Needs x, y and radius");
+  int cx=cast(int)t[0], cy=cast(int)t[1]; float radius=cast(float)t[2];
+  SDL_LockSurface(display.surface);
+  scope(exit) { SDL_UnlockSurface(display.surface); if (doFlip) flip; }
+  execParams(t[3..$]);
+  if (radius!>0) return;
+  static if (T.length>3 && is(T[3]: int)) yradius=t[3];
+  static if (Select!(back_rgb, T) != -1) {
+    auto back_sdl=SDL_MapRGBA(display.surface.format, back.values[0], back.values[1], back.values[2], 0);
+    for (int i=0; i<=radius; ++i) {
+      ushort j=cast(ushort)(sqrt(cast(real)(radius*radius-i*i)));
+      hline(cx-j, cy+i, 2*j, back_sdl);
+      if (i) hline(cx-j, cy-i, 2*j, back_sdl);
+    }
+  }
+  static if (Select!(back_rgb, T) == -1 || Select!(rgb, T) != -1) {
+    auto x2square=2*radius*radius, y2square=x2square;
+    uint col=SDL_MapRGBA(display.surface.format, color.values[0], color.values[1], color.values[2], 0);
+    { mixin(circle_bresenham_pass!(true).str); }
+    { mixin(circle_bresenham_pass!(false).str); }
+  }
+}
+
+void circle_aa(T...)(T t) {
-  static assert(T.length!<3, "Circle: Needs x, y and radius");
-  int cx=cast(int)t[0], cy=cast(int)t[1]; float radius=cast(float)t[2];

trunk/qd/test.d

@@ -1 +1 @@
-module test;
+import qd, std.random;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-}
-
-void times(int count, void delegate() dg) {
-  while (count--) dg();
-}
-
-void myblit(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) {
-  if (!srcrect)
-    if ((src.w != dstrect.w) || (src.h != dstrect.h))
-      throw new Exception("Rectangles do not match!");
-  if ((srcrect.w != dstrect.w) || (srcrect.h != dstrect.h))
-    throw new Exception("Rectangles do not match!");
-  int count;
-  int srcoffs=src.pitch/4;
-  int dstoffs=dst.pitch/4;
-  auto ymax=srcrect?(srcrect.h):(src.h);
-  auto xmax=srcrect?(srcrect.w):(src.w);
-  for (int y=0; y<ymax; ++y) {
-    auto readp = cast(ubyte *)(cast(uint *)src.pixels + (y+srcrect.y)*srcoffs + srcrect.x);
-    auto writep = cast(ubyte *)(cast(uint *)dst.pixels + (y+dstrect.y)*dstoffs + dstrect.x);
-    auto end=readp+4*xmax;
-    for (; readp!=end; writep+=4, readp+=4) {
-      for (int e=0; e<3; ++e) {
-        writep[e] += (((readp[e]-writep[e])*readp[3])>>8);
-      }
-    }
-  }
-}
-
-import std.c.time;
-void main() {
-  screen(640, 480);
-  int count=10_000;
-  auto from=New!(SDL_Rect)(0, 0, 100, 100);
-  auto to=New!(SDL_Rect)(100, 100, 100, 100);
-  SDL_SetAlpha(display, SDL_SRCALPHA, 0);
-  writefln("SDL_Blit: ", time({
-    times(count, {
-      SDL_FillRect(display, to, 0);
-      SDL_FillRect(display, from, 0xa0_00_ff_00);
-      SDL_BlitSurface(display, from, display, to);
-    });
-  }), " ms!");
-  writefln("MyBlit: ", time({
-    times(count, {
-      SDL_FillRect(display, to, 0);
-      SDL_FillRect(display, from, 0xa0_00_ff_00);
-      myblit(display, from, display, to);
-    });
-  }), " ms!");
-  flip;
-  sleep(5);
-}

trunk/tools/tools/downloader.d

@@ -2 +2 @@
-
-import tools.base, std.string, tools.fixed_socket, std.utf;
+
+string htmlEscape(string s) {
+  //\todo: complete this
+  return s.replace(" ", "%20");
+}
-
-bool validAddress(string foob) {

trunk/tools/tools/page_queue.d

@@ -11 +11 @@
-    T[4000/T.sizeof] data; // almost one page .. leave some space for GC structures
-    ushort start; ushort end;
-
+, Format("Start ", start, " higher than end ", end, "! Desperation!")
-    Page* next;
-    bool push(T what) {

trunk/tools/tools/threads.d

@@ -172 +172 @@
-    bool try_acquire() {
-      mixin(sem_fn!("sem_trywait(&handle)"));
-
-
-
+
-    }
-  }
@@ -301 +299 @@
-    New(mesgs);
-  }
+  int messages() { return mesgs.length; }
-  bool active() { return mesgs.has; }
-  void put(T t) {