[ViewVC] Diff of: cvs/deliantra/server/server/quadland.C

Comparing deliantra/server/server/quadland.C (file contents):
Revision 1.1 by root, Sun May 1 13:18:24 2011 UTC vs.
Revision 1.2 by root, Sun May 1 16:58:17 2011 UTC

 #include <global.h>
 #include "noise.h"
-#define FANCY_GRAPHICS 1
+#define FANCY_GRAPHICS 0
 static void
-gen_quadspace (int x, int y, int z)
+gen_quadspace (maptile *m, int mx, int my, int x, int y, int z)
 {
   vec2d P = vec2d (x, y);
   const int deep_sea_z = -200;
     T_UNDERGROUND,
     T_ACQUIFER,
   } t = T_NONE;
   vec3d c;
+  int h0 = 0;      // "water level"
   int h = 1000000; // height form heightmap
   // the continent increases in height from 0 to ~700 levels in the absence of anything else
   // thats about one step every 7 maps.
   int base_height  = blend (0, 300, xy_gradient, 0.2f, 0.9f);
   if (river1 < 0.01f)
     {
       // main rivers - they cut deeply into the mountains (base_height * 0.9f)
       t = T_RIVER;
       c = vec3d (0.2, 0.2, 1);
+      h0 = river_height;
       min_it (h, river_height + lerp<float> (river1, 0.f, 0.01f, -20, -1));
     }
   if (river2 > 0)
     {
       t = T_RIVER;
       c = vec3d (0.2, 0.2, 1);
+      h0 = river_height;
       min_it (h, river_height + lerp<float> (river1, 0.f, 0.01f, -5, -1));
     }
   if (continent < 0)
     {
   // now we have the base height, and base terrain
 #if FANCY_GRAPHICS
   z = h; // show the surface, not the given z layer
 #endif
+  max_it (h0, h);
   // everything below the surface is underground, or a variant
   if (z < h)
     {
       t = T_UNDERGROUND;
   c *= v;
   putc (clamp<int> (255 * c[0], 0, 255), stdout);
   putc (clamp<int> (255 * c[1], 0, 255), stdout);
   putc (clamp<int> (255 * c[2], 0, 255), stdout);
+#else
+  shstr arch_floor = shstr ("quad_open_space");
+  shstr arch_wall;
+  switch (t)
+    {
+      case T_OCEAN:
+      case T_RIVER:
+        if (z <= h0)
+          arch_wall  = shstr ("quad_water_wall");
+        break;
+      case T_VALLEY:
+        if (z == h)
+          {
+            arch_floor = shstr ("quad_dirt_floor");
+            arch_wall  = shstr ("quad_dirt_wall");
+          }
+        break;
+      case T_MOUNTAIN:
+        if (z == h)
+          {
+            arch_floor = shstr ("quad_stone_floor");
+            arch_wall  = shstr ("quad_stone_wall");
+          }
+        break;
+      case T_UNDERGROUND:
+        // todo, use a fractal
+        if (z < h - 10)
+          {
+            arch_floor = shstr ("quad_dirt_floor");
+            arch_wall  = shstr ("quad_dirt_wall");
+          }
+        else
+          {
+            arch_floor = shstr ("quad_stone_floor");
+            arch_wall  = shstr ("quad_stone_wall");
+          }
+        break;
+      case T_ACQUIFER:
+        arch_wall  = shstr ("quad_water_wall");
+        break;
+      default:
+        abort ();
+    }
+  if (arch_floor)
+    m->insert (archetype::get (arch_floor), mx, my);
+  if (arch_wall)
+    m->insert (archetype::get (arch_wall ), mx, my);
 #endif
+}
+void
+gen_quadmap (maptile *m, int x, int y, int z)
+{
+  assert (m->width  == 50);
+  assert (m->height == 50);
+  for (int mx = 0; mx < 50; ++mx)
+    for (int my = 0; my < 50; ++my)
+      gen_quadspace (m, mx, my, x + mx, y + my, z);
 }
 void noise_test ();
 void noise_test ()
 {
-#if 0
+#if 1
   int Nw = 700;
   printf ("P6 %d %d 255\n", Nw * 3, Nw * 2);
   // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
   for (int y = 0; y < Nw; ++y)
     {
       if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw);//D
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x * 25000 / Nw, y * 25000 / Nw, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x * 25000 / Nw, y * 25000 / Nw, 0);
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x +   400, y, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x +   400, y, 0);
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x + 22000, y +  2000, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 22000, y +  2000, 0);
     }
   for (int y = 0; y < Nw; ++y)
     {
       if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw+50);//D
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x +  1000, y + 22000, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x +  1000, y + 22000, 0);
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x + 12500, y + 12500, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 12500, y + 12500, 0);
-      for (int x = 0; x < Nw; ++x) gen_quadspace (x + 22000, y + 22500, 0);
+      for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 22000, y + 22500, 0);
     }
           //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
           //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
           //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
   printf ("P6 %d %d 255\n", N, N);
   for (int y = 0; y < N; ++y)
     {
       if (!(y&63))fprintf (stderr, "y %d\n", y);//D
-      for (int x = 0; x < N; ++x) gen_quadspace (x, y, 0);
+      for (int x = 0; x < N; ++x) gen_quadspace (0, 0, 0, x, y, 0);
     }
 #else
   int N = 200;
   //printf ("P6 %d %d 255\n", N, N);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/quadland.C (file contents): Revision 1.1 by root, Sun May 1 13:18:24 2011 UTC vs. Revision 1.2 by root, Sun May 1 16:58:17 2011 UTC

Diff Legend

Comparing deliantra/server/server/quadland.C (file contents):
Revision 1.1 by root, Sun May 1 13:18:24 2011 UTC vs.
Revision 1.2 by root, Sun May 1 16:58:17 2011 UTC