Bugfixes, new pic.

2017-05-03 16:54:30 -04:00 · 2017-05-03 16:54:30 -04:00 · 92a0debac8
parent 45348889fa
commit 92a0debac8
11 changed files with 277 additions and 223 deletions
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@ Fork of Michael Fogleman's Minecraft clone for Windows, Mac OS X and Linux. Just

 http://www.michaelfogleman.com/craft/

-![Screenshot](https://twetzel59.github.io/craftng.github.io/CraftNG_new.png)
+![Screenshot](https://twetzel59.github.io/craftng.github.io/CraftNG3.png)

 ### Features

--- a/src/worldgen/biome_desert.c
+++ b/src/worldgen/biome_desert.c
@ -0,0 +1,49 @@
+#include "biome_desert.h"
+#include "noise.h"
+#include "../config.h"
+#include "../item.h"
+
+void generateDesert(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
+    for (int y = 0; y < h; y++) {
+        func(x, y, z, 2 * flag, arg);
+    }
+
+    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.8) {
+        func(x, h, z, 18 * flag, arg);
+    }
+
+    int ok = 1;
+    if (dx - 4 < 0 || dz - 4 < 0 ||
+        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
+    {
+        ok = 0;
+    }
+    if (ok && simplex2(x * 4, z * 4, 6, 0.45, 2) > 0.88) {
+        int height = simplex2(x, z, 6, 0.5, 2) * 16;
+        for (int y = h; y < h + height; y++) {
+            func(x, y, z, Item_CACTUS, arg);
+        }
+
+        int oz = z % 3;
+
+        if(x % 2) {
+            func(x + 1, h + height - 4 - oz, z, Item_CACTUS, arg);
+            func(x - 1, h + height - 4 + oz, z, Item_CACTUS, arg);
+
+            func(x + 2, h + height - 4 - oz, z, Item_CACTUS, arg);
+            func(x - 2, h + height - 4 + oz, z, Item_CACTUS, arg);
+
+            func(x + 2, h + height - 3 - oz, z, Item_CACTUS, arg);
+            func(x - 2, h + height - 3 + oz, z, Item_CACTUS, arg);
+        } else {
+            func(x, h + height - 4 - oz, z + 1, Item_CACTUS, arg);
+            func(x, h + height - 4 + oz, z - 1, Item_CACTUS, arg);
+
+            func(x, h + height - 4 - oz, z + 2, Item_CACTUS, arg);
+            func(x, h + height - 4 + oz, z - 2, Item_CACTUS, arg);
+
+            func(x, h + height - 3 - oz, z + 2, Item_CACTUS, arg);
+            func(x, h + height - 3 + oz, z - 2, Item_CACTUS, arg);
+        }
+    }
+}
--- a/src/worldgen/biome_desert.h
+++ b/src/worldgen/biome_desert.h
@ -0,0 +1,8 @@
+#ifndef _biome_desert_h_
+#define _biome_desert_h_
+
+#include "world.h"
+
+void generateDesert(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+
+#endif // _biome_desert_h_
--- a/src/worldgen/biome_rainforest.c
+++ b/src/worldgen/biome_rainforest.c
@ -0,0 +1,97 @@
+#include "biome_rainforest.h"
+#include "noise.h"
+#include "../config.h"
+#include "../item.h"
+
+void generateRainforest(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
+    for (int y = 0; y < h; y++) {
+        func(x, y, z, 1 * flag, arg);
+    }
+
+    // grass
+    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.6) {
+        func(x, h, z, 17 * flag, arg);
+    }
+    // flowers
+    if (simplex2(x * 0.05, -z * 0.05, 4, 0.8, 2) > 0.7) {
+        int w = 18 + simplex2(x * 0.1, z * 0.1, 4, 0.8, 2) * 7;
+        func(x, h, z, w * flag, arg);
+    }
+
+    // trees
+    /** TODO **/
+    // Is removing this ok?
+    int ok = 1;
+    if (dx - 4 < 0 || dz - 4 < 0 ||
+        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
+    {
+        ok = 0;
+    }
+    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.82) {
+        //Leaves
+        for (int y = h + 46; y < h + 54; y++) {
+            for (int ox = -6; ox <= 6; ox++) {
+                for (int oz = -6; oz <= 6; oz++) {
+                    int d = (ox * ox) + (oz * oz) +
+                        (y - (h + 46)) * (y - (h + 46));
+                    if (d < 22) {
+                        func(x + ox, y, z + oz, 15, arg);
+                        func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, 15, arg);
+                    }
+                }
+            }
+        }
+        //Vines
+        for (int y = h + 35; y < h + 46; y++) {
+            for (int ox = -6; ox <= 6; ox++) {
+                for (int oz = -6; oz <= 6; oz++) {
+                    if (y >= h + 43) {
+                        int d = (ox * ox) + (oz * oz) +
+                            (y - (h + 46)) * (y - (h + 46));
+                        if (d < 12) {
+                            func(x + ox, y, z + oz, Item_VINE, arg);
+                            func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, Item_VINE, arg);
+                        }
+                    }
+
+                    int d = (ox * ox) + (oz * oz);
+                    if (d > 15 && d < 22 && ox % 4 && oz % 4) {
+                        func(x + ox, y, z + oz, Item_VINE, arg);
+                        func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, Item_VINE, arg);
+                    }
+                }
+            }
+        }
+        //Trunk
+        for (int y = h; y < h + 46; y++) {
+            for (int ox = -1; ox < 1; ox++) {
+                for (int oz = -1; oz < 1; oz++) {
+                    func(x + ox, y, z + oz, 5, arg);
+                }
+            }
+        }
+    }
+    //Generate large normal trees as well.
+    if (simplex2(x, z, 6, 0.5, 2) > 0.72) {
+        for (int y = h + 6; y < h + 16; y++) {
+            for (int ox = -8; ox <= 8; ox++) {
+                for (int oz = -8; oz <= 8; oz++) {
+                    int d = (ox * ox) + (oz * oz) +
+                        (y - (h + 6)) * (y - (h + 6));
+                    if (d < 11) {
+                        if((dx + ox >= 0) && (dz + oz >= 0) &&
+                                (dx + ox < CHUNK_SIZE) && (dz + oz < CHUNK_SIZE)) {
+                            func(x + ox, y, z + oz, 15, arg);
+                        }
+                    }
+                }
+            }
+        }
+        for (int y = h; y < h + 6; y++) {
+            if((dx >= 0) && (dz >= 0) &&
+                    (dx < CHUNK_SIZE) && (dz < CHUNK_SIZE)) {
+                func(x, y, z, 5, arg);
+            }
+        }
+    }
+}
--- a/src/worldgen/biome_rainforest.h
+++ b/src/worldgen/biome_rainforest.h
@ -0,0 +1,8 @@
+#ifndef _biome_rainforest_h_
+#define _biome_rainforest_h_
+
+#include "world.h"
+
+void generateRainforest(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+
+#endif // _biome_rainforest_h_
--- a/src/worldgen/biome_taiga.c
+++ b/src/worldgen/biome_taiga.c
@ -0,0 +1,44 @@
+#include "biome_taiga.h"
+#include "noise.h"
+#include "../config.h"
+#include "../item.h"
+
+void generateTaiga(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
+    for (int y = 0; y < h; y++) {
+        func(x, y, z, 9 * flag, arg);
+    }
+
+    // grass
+    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.7) {
+        func(x, h, z, 17 * flag, arg);
+    }
+
+    // trees
+    int ok = 1;
+    if (dx - 4 < 0 || dz - 4 < 0 ||
+        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
+    {
+        ok = 0;
+    }
+    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.8) {
+        for (int y = h + 1; y < h + 29; y += 4) {
+            for (int ox = -3; ox <= 3; ox++) {
+                for (int oz = -3; oz <= 3; oz++) {
+                    int d = (ox * ox) + (oz * oz) +
+                        (y - 20 - (h + 4)) * (y - 20 - (h + 4));
+                    if (d < 400) {
+                        func(x + ox, y, z + oz, 15, arg);
+                    }
+                }
+            }
+        }
+        for (int y = h; y < h + 26; y++) {
+            for (int ox = -1; ox < 1; ox++) {
+                for (int oz = -1; oz < 1; oz++) {
+                    func(x + ox, y, z + oz, 5, arg);
+                }
+            }
+        }
+    }
+}
+
--- a/src/worldgen/biome_taiga.h
+++ b/src/worldgen/biome_taiga.h
@ -0,0 +1,8 @@
+#ifndef _biome_taiga_h_
+#define _biome_taiga_h_
+
+#include "world.h"
+
+void generateTaiga(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+
+#endif // _biome_taiga_h_
--- a/src/worldgen/biome_temperate.c
+++ b/src/worldgen/biome_temperate.c
@ -0,0 +1,45 @@
+#include "biome_temperate.h"
+#include "noise.h"
+#include "../config.h"
+#include "../item.h"
+
+void generateTemperate(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
+    for (int y = 0; y < h; y++) {
+        func(x, y, z, 1 * flag, arg);
+    }
+
+    // grass
+    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.6) {
+        func(x, h, z, 17 * flag, arg);
+    }
+    // flowers
+    if (simplex2(x * 0.05, -z * 0.05, 4, 0.8, 2) > 0.7) {
+        int w = 18 + simplex2(x * 0.1, z * 0.1, 4, 0.8, 2) * 7;
+        func(x, h, z, w * flag, arg);
+    }
+
+    // trees
+    int ok = 1;
+    if (dx - 4 < 0 || dz - 4 < 0 ||
+        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
+    {
+        ok = 0;
+    }
+    
+    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.84) {
+        for (int y = h + 3; y < h + 8; y++) {
+            for (int ox = -3; ox <= 3; ox++) {
+                for (int oz = -3; oz <= 3; oz++) {
+                    int d = (ox * ox) + (oz * oz) +
+                        (y - (h + 4)) * (y - (h + 4));
+                    if (d < 11) {
+                        func(x + ox, y, z + oz, 15, arg);
+                    }
+                }
+            }
+        }
+        for (int y = h; y < h + 7; y++) {
+            func(x, y, z, 5, arg);
+        }
+    }
+}
--- a/src/worldgen/biome_temperate.h
+++ b/src/worldgen/biome_temperate.h
@ -0,0 +1,8 @@
+#ifndef _biome_temperate_h_
+#define _biome_temperate_h_
+
+#include "world.h"
+
+void generateTemperate(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+
+#endif // _biome_temperate_h_
--- a/src/worldgen/world.c
+++ b/src/worldgen/world.c
@ -3,12 +3,16 @@
 #include "noise.h"
 #include "../util.h"
 #include "world.h"
+#include "biome_temperate.h"
+#include "biome_desert.h"
+#include "biome_rainforest.h"
+#include "biome_taiga.h"
 #include <math.h>

-void generateTemperate(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
-void generateDesert(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
-void generateRainforest(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
-void generateTaiga(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+//void generateTemperate(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+//void generateDesert(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+//void generateRainforest(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);
+//void generateTaiga(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg);

 void create_world(int p, int q, world_func func, void *arg) {
    int pad = 1;
@ -73,220 +77,3 @@ Biome biome_at_pos(int q, int x, int z) {

    return biome;
 }
-
-void generateTemperate(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
-    for (int y = 0; y < h; y++) {
-        func(x, y, z, 1 * flag, arg);
-    }
-
-    // grass
-    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.6) {
-        func(x, h, z, 17 * flag, arg);
-    }
-    // flowers
-    if (simplex2(x * 0.05, -z * 0.05, 4, 0.8, 2) > 0.7) {
-        int w = 18 + simplex2(x * 0.1, z * 0.1, 4, 0.8, 2) * 7;
-        func(x, h, z, w * flag, arg);
-    }
-
-    // trees
-    int ok = 1;
-    if (dx - 4 < 0 || dz - 4 < 0 ||
-        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
-    {
-        ok = 0;
-    }
-    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.84) {
-        for (int y = h + 3; y < h + 8; y++) {
-            for (int ox = -3; ox <= 3; ox++) {
-                for (int oz = -3; oz <= 3; oz++) {
-                    int d = (ox * ox) + (oz * oz) +
-                        (y - (h + 4)) * (y - (h + 4));
-                    if (d < 11) {
-                        func(x + ox, y, z + oz, 15, arg);
-                    }
-                }
-            }
-        }
-        for (int y = h; y < h + 7; y++) {
-            func(x, y, z, 5, arg);
-        }
-    }
-}
-
-void generateDesert(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
-    for (int y = 0; y < h; y++) {
-        func(x, y, z, 2 * flag, arg);
-    }
-
-    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.8) {
-        func(x, h, z, 18 * flag, arg);
-    }
-
-    int ok = 1;
-    if (dx - 4 < 0 || dz - 4 < 0 ||
-        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
-    {
-        ok = 0;
-    }
-    if (ok && simplex2(x * 4, z * 4, 6, 0.45, 2) > 0.88) {
-        int height = simplex2(x, z, 6, 0.5, 2) * 16;
-        for (int y = h; y < h + height; y++) {
-            func(x, y, z, Item_CACTUS, arg);
-        }
-
-        int oz = z % 3;
-
-        if(x % 2) {
-            func(x + 1, h + height - 4 - oz, z, Item_CACTUS, arg);
-            func(x - 1, h + height - 4 + oz, z, Item_CACTUS, arg);
-
-            func(x + 2, h + height - 4 - oz, z, Item_CACTUS, arg);
-            func(x - 2, h + height - 4 + oz, z, Item_CACTUS, arg);
-
-            func(x + 2, h + height - 3 - oz, z, Item_CACTUS, arg);
-            func(x - 2, h + height - 3 + oz, z, Item_CACTUS, arg);
-        } else {
-            func(x, h + height - 4 - oz, z + 1, Item_CACTUS, arg);
-            func(x, h + height - 4 + oz, z - 1, Item_CACTUS, arg);
-
-            func(x, h + height - 4 - oz, z + 2, Item_CACTUS, arg);
-            func(x, h + height - 4 + oz, z - 2, Item_CACTUS, arg);
-
-            func(x, h + height - 3 - oz, z + 2, Item_CACTUS, arg);
-            func(x, h + height - 3 + oz, z - 2, Item_CACTUS, arg);
-        }
-    }
-}
-
-void generateRainforest(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
-    for (int y = 0; y < h; y++) {
-        func(x, y, z, 1 * flag, arg);
-    }
-
-    // grass
-    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.6) {
-        func(x, h, z, 17 * flag, arg);
-    }
-    // flowers
-    if (simplex2(x * 0.05, -z * 0.05, 4, 0.8, 2) > 0.7) {
-        int w = 18 + simplex2(x * 0.1, z * 0.1, 4, 0.8, 2) * 7;
-        func(x, h, z, w * flag, arg);
-    }
-
-    // trees
-    /** TODO **/
-    // Is removing this ok?
-    int ok = 1;
-    if (dx - 4 < 0 || dz - 4 < 0 ||
-        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
-    {
-        ok = 0;
-    }
-    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.82) {
-        //Leaves
-        for (int y = h + 46; y < h + 54; y++) {
-            for (int ox = -6; ox <= 6; ox++) {
-                for (int oz = -6; oz <= 6; oz++) {
-                    int d = (ox * ox) + (oz * oz) +
-                        (y - (h + 46)) * (y - (h + 46));
-                    if (d < 22) {
-                        func(x + ox, y, z + oz, 15, arg);
-                        func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, 15, arg);
-                    }
-                }
-            }
-        }
-        //Vines
-        for (int y = h + 35; y < h + 46; y++) {
-            for (int ox = -6; ox <= 6; ox++) {
-                for (int oz = -6; oz <= 6; oz++) {
-                    if (y >= h + 43) {
-                        int d = (ox * ox) + (oz * oz) +
-                            (y - (h + 46)) * (y - (h + 46));
-                        if (d < 12) {
-                            func(x + ox, y, z + oz, Item_VINE, arg);
-                            func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, Item_VINE, arg);
-                        }
-                    }
-
-                    int d = (ox * ox) + (oz * oz);
-                    if (d > 15 && d < 22 && ox % 4 && oz % 4) {
-                        func(x + ox, y, z + oz, Item_VINE, arg);
-                        func(x + ox, y - (15 + (x % 2) * 2 + (z % 2) * 2), z + oz, Item_VINE, arg);
-                    }
-                }
-            }
-        }
-        //Trunk
-        for (int y = h; y < h + 46; y++) {
-            for (int ox = -1; ox < 1; ox++) {
-                for (int oz = -1; oz < 1; oz++) {
-                    func(x + ox, y, z + oz, 5, arg);
-                }
-            }
-        }
-    }
-    //Generate large normal trees as well.
-    if (simplex2(x, z, 6, 0.5, 2) > 0.72) {
-        for (int y = h + 6; y < h + 16; y++) {
-            for (int ox = -8; ox <= 8; ox++) {
-                for (int oz = -8; oz <= 8; oz++) {
-                    int d = (ox * ox) + (oz * oz) +
-                        (y - (h + 6)) * (y - (h + 6));
-                    if (d < 11) {
-                        if((dx + ox >= 0) && (dz + oz >= 0) &&
-                                (dx + ox < CHUNK_SIZE) && (dz + oz < CHUNK_SIZE)) {
-                            func(x + ox, y, z + oz, 15, arg);
-                        }
-                    }
-                }
-            }
-        }
-        for (int y = h; y < h + 6; y++) {
-            if((dx >= 0) && (dz >= 0) &&
-                    (dx < CHUNK_SIZE) && (dz < CHUNK_SIZE)) {
-                func(x, y, z, 5, arg);
-            }
-        }
-    }
-}
-
-void generateTaiga(int dx, int dz, int x, int z, int h, int flag, world_func func, void *arg) {
-    for (int y = 0; y < h; y++) {
-        func(x, y, z, 9 * flag, arg);
-    }
-
-    // grass
-    if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.7) {
-        func(x, h, z, 17 * flag, arg);
-    }
-
-    // trees
-    int ok = 1;
-    if (dx - 4 < 0 || dz - 4 < 0 ||
-        dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
-    {
-        ok = 0;
-    }
-    if (ok && simplex2(x, z, 6, 0.5, 2) > 0.8) {
-        for (int y = h + 1; y < h + 29; y += 4) {
-            for (int ox = -3; ox <= 3; ox++) {
-                for (int oz = -3; oz <= 3; oz++) {
-                    int d = (ox * ox) + (oz * oz) +
-                        (y - 20 - (h + 4)) * (y - 20 - (h + 4));
-                    if (d < 400) {
-                        func(x + ox, y, z + oz, 15, arg);
-                    }
-                }
-            }
-        }
-        for (int y = h; y < h + 26; y++) {
-            for (int ox = -1; ox < 1; ox++) {
-                for (int oz = -1; oz < 1; oz++) {
-                    func(x + ox, y, z + oz, 5, arg);
-                }
-            }
-        }
-    }
-}
--- a/src/worldgen/world.h
+++ b/src/worldgen/world.h
@ -14,4 +14,4 @@ typedef void (*world_func)(int, int, int, int, void *);
 void create_world(int p, int q, world_func func, void *arg);
 Biome biome_at_pos(int q, int x, int z);

-#endif
+#endif // _world_h_