Fix final few cross-dependencies

Moved node_parse to common, since it's used by both sides.
vkoskiv · Dec 3, 2023 · 2fd5ad6 · 2fd5ad6
1 parent 2958231
commit 2fd5ad6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/src/driver/node_parse.c → src/common/node_parse.c b/src/driver/node_parse.c → src/common/node_parse.c
@@ -10,14 +10,13 @@
 
 #include "node_parse.h"
 #include "../vendored/cJSON.h"
-#include "json_loader.h"
-
-#include "../common/loaders/textureloader.h"
-#include "../common/texture.h"
-#include "../common/string.h"
-#include "../common/logging.h"
-#include "../common/color.h"
-#include "../common/vector.h"
+
+#include "loaders/textureloader.h"
+#include "texture.h"
+#include "string.h"
+#include "logging.h"
+#include "color.h"
+#include "vector.h"
 
 static enum cr_vec_to_value_component value_node_component(const cJSON *data) {
 	if (!cJSON_IsString(data)) {

diff --git a/src/driver/node_parse.h → src/common/node_parse.h b/src/driver/node_parse.h → src/common/node_parse.h
diff --git a/src/driver/json_loader.c b/src/driver/json_loader.c
@@ -10,12 +10,12 @@
 
 #include "json_loader.h"
 #include "../vendored/cJSON.h"
-#include "node_parse.h"
 #include "loaders/meshloader.h"
-#include "../common/loaders/textureloader.h"
 
 #include <c-ray/c-ray.h>
 
+#include "../common/node_parse.h"
+#include "../common/loaders/textureloader.h"
 #include "../common/quaternion.h"
 #include "../common/transforms.h"
 #include "../common/vector.h"

diff --git a/src/lib/datatypes/scene.c b/src/lib/datatypes/scene.c
@@ -13,7 +13,7 @@
 #include "../../common/hashtable.h"
 #include "../../common/textbuffer.h"
 #include "../../common/dyn_array.h"
-#include "../../driver/node_parse.h" // FIXME: CROSS
+#include "../../common/node_parse.h"
 #include "../../common/texture.h"
 #include "camera.h"
 #include "tile.h"

diff --git a/src/lib/nodes/bsdfnode.c b/src/lib/nodes/bsdfnode.c
@@ -10,7 +10,7 @@
 #include "../../common/color.h"
 #include "../renderer/renderer.h"
 #include "../datatypes/scene.h"
-#include "../../driver/node_parse.h" // FIXME: CROSS
+#include "../../common/node_parse.h"
 #include "../../common/string.h"
 #include "bsdfnode.h"
 #include <c-ray/c-ray.h>

diff --git a/src/lib/protocol/protocol.c b/src/lib/protocol/protocol.c
@@ -25,7 +25,7 @@
 #include "../../common/networking.h"
 #include "../../common/base64.h"
 #include "../../common/timer.h"
-#include "../../driver/node_parse.h" // FIXME: CROSS
+#include "../../common/node_parse.h"
 #include "../renderer/renderer.h"
 #include "../renderer/instance.h"
 #include "../datatypes/tile.h"

diff --git a/tests/test_parser.h b/tests/test_parser.h
@@ -11,7 +11,7 @@
 #include "../src/common/color.h"
 #include "../src/vendored/cJSON.h"
 #include "../src/driver/json_loader.h"
-#include "../src/driver/node_parse.h"
+#include "../src/common/node_parse.h"
 
 bool parser_color_rgb(void) {