Merge pull request #19 from AnotherCraft/dev

Dev

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.20)
 include(ExternalProject)
 
-project(ac_worldgen_master VERSION 0.0.3 LANGUAGES CXX)
+project(ac_worldgen_master VERSION 1.0.0.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -103,7 +103,7 @@ target_precompile_headers(x_ac_worldgen_dummy PRIVATE "${PROJECT_BASE_DIR}/src/p
 target_include_directories(x_ac_worldgen_dummy PRIVATE "${PROJECT_BASE_DIR}/src")
 target_include_directories(x_ac_worldgen_dummy SYSTEM PRIVATE
         "${PROJECT_BASE_DIR}/include"
-        "${PROJECT_BASE_DIR}/deps/tracy"
+        "${CMAKE_BASE_DIR}/install/tracy/include"
         "${CMAKE_BASE_DIR}/install/antlr/include"
         "${CMAKE_BASE_DIR}/install/fastNoise2/include"
         )

docs/woglac_reference.md

@@ -641,13 +641,13 @@ In certain situations, for example when you have even block count wide corridors
 Rules define... well rules of what component will actually be spawned. The used terminology is that rules *expand* into components. A rule can have multiple possible expansions, each with different priority and probability. 
 
 ### Rule pragmas
-<center>``
+<center>
 
 | Pragma | Type | Default value | Description |
 | --- | --- | --- | --- |
 `depthFirstProbability` | `Float` | `1` | Probability that the rule will expand depth-first (will put current rule expansions to the top of the queue) opposed to breadth-frist (would add current rule expansions to the end of the queue)
 
-``</center>
+</center>
 
 ### Rule expansions
 > ```g4

src/main.cpp

@@ -18,17 +18,16 @@
 #include "util/forit.h"
 #include "util/iterators.h"
 #include "util/tracyutils.h"
-
 #include "worldgen/base/worldgenapi.h"
-
 #include "worldgen/cpu/worldgenapi_cpu.h"
 #include "worldgen/cpu/supp/wga_valuewrapper_cpu.h"
 #include "woglac/wglcompiler.h"
+#include "worldgen/cpu/supp/worldgen_cpu_utils.h"
 
 std::mutex stdoutMutex;
 
-std::mutex jobsMutex;
-std::condition_variable jobEndCondition, newJobCondition;
+TracyLockable(std::mutex, jobsMutex);
+std::condition_variable_any jobEndCondition, newJobCondition;
 std::queue<std::function<void()>> jobs;
 size_t runningJobs = 0;
 
@@ -192,8 +191,12 @@ Compiles the source files and prints out the list of exports.
 		}
 
 		for(size_t i = 0; i < threadCount; i++) {
-			pool.push_back(std::thread([] {
+			pool.push_back(std::thread([i] {
+				WorldGenAPI_CPU::createLocalCache();
+
 				while(true) {
+					std::srand(std::time(0) ^ WorldGen_CPU_Utils::scramble(i));
+
 					std::function<void()> job;
 
 					{
@@ -218,6 +221,8 @@ Compiles the source files and prints out the list of exports.
 						jobEndCondition.notify_all();
 					}
 				}
+
+				WorldGenAPI_CPU::destroyLocalCache();
 			}));
 		}
 

src/util/containerutils.h

@@ -2,6 +2,8 @@
 
 #include <cstdlib>
 
+#include "worldgen/cpu/supp/worldgen_cpu_utils.h"
+
 class ContainerUtils {
 
 public:
@@ -31,4 +33,16 @@ class ContainerUtils {
 		return bestIx;
 	}
 
+	/// Pseudo-randomly shuffles the order of the items using Fisher-Yates shuffle
+	template<typename I>
+	static void randomShuffle(I begin, I end, uint32_t seed) {
+		const size_t sz = end - begin;
+		size_t ix = 0;
+		for(auto i = begin; i < end; i++) {
+			const auto j = i + (WorldGen_CPU_Utils::hash(ix, seed) % (sz - ix));
+			std::swap(*i, *j);
+			ix++;
+		}
+	}
+
 };

src/worldgen/base/autogen/wga_funcs.cpp

@@ -1,23 +1,23 @@
 // This file was automatically generated by /supp/autogen.
 
-#include "../worldgenapi.h"
-
-const WorldGenAPI::Functions &WorldGenAPI::functions() {
-	static const Functions fs = [] {
-		Functions fs;
-		Function f;
-
-		const auto finalize = [&]() {
-			f.prototype = Function::composePrototype(f.name, iterator(f.arguments).mapx(x.type).toList());
-			fs.list.push_back(f);
-			fs.prototypeMapping[f.prototype] = f.id;
-			if(!fs.nameSet.contains(f.name))
-				fs.nameList.push_back(f.name);
-			fs.nameSet.insert(f.name);
-			fs.nameMapping[f.name].push_back(f.id);
-		};
-
-		f.section = "Utility functions";
+	#include "../worldgenapi.h"
+
+	const WorldGenAPI::Functions &WorldGenAPI::functions() {
+		static const Functions fs = [] {
+			Functions fs;
+			Function f;
+
+			const auto finalize = [&]() {
+				f.prototype = Function::composePrototype(f.name, iterator(f.arguments).mapx(x.type).toList());
+				fs.list.push_back(f);
+				fs.prototypeMapping[f.prototype] = f.id;
+				if(!fs.nameSet.contains(f.name))
+					fs.nameList.push_back(f.name);
+				fs.nameSet.insert(f.name);
+				fs.nameMapping[f.name].push_back(f.id);
+			};
+
+			f.section = "Utility functions";
 f.name = "worldPos";
 f.returnValue.name = "pos";
 f.arguments.resize(0);
@@ -1613,7 +1613,8 @@ f.id = 203;
 finalize();
 
 
+			return fs;
+		} ();
 		return fs;
-	} ();
-	return fs;
-}
+	}
+

src/worldgen/base/supp/wga_rule.h

@@ -7,6 +7,7 @@
 
 #include "pch.h"
 #include "wga_grammarsymbol.h"
+#include "util/tracyutils.h"
 
 class WGA_Rule : public WGA_GrammarSymbol {
 
@@ -43,7 +44,7 @@ class WGA_Rule : public WGA_GrammarSymbol {
 	std::vector<WGA_RuleExpansion *> expansions_;
 	CompiledExpansionList compiledExpansions_;
 	bool compiledReady_ = false;
-	std::mutex compilingMutex_;
+	TracyLockable(std::mutex, compilingMutex_);
 
 };