From 8cf6d145929e1fb243db7f58b82060da7c35062a Mon Sep 17 00:00:00 2001
From: coco875 <pereira.jannin@gmail.com>
Date: Tue, 5 Mar 2024 08:17:27 +0100
Subject: [PATCH] move in a blender folder

---
 .gitmodules                                            | 4 ++--
 tools/{ => blender}/3d_models.json                     | 0
 tools/{blender_extension => blender}/blender_export.py | 4 ++--
 tools/{blender_extension => blender}/clean_scene.py    | 0
 tools/{ => blender}/extract_models.py                  | 4 ++--
 tools/{blender_extension => blender}/fast64_run.py     | 0
 tools/fast64                                           | 1 -
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename tools/{ => blender}/3d_models.json (100%)
 rename tools/{blender_extension => blender}/blender_export.py (94%)
 rename tools/{blender_extension => blender}/clean_scene.py (100%)
 rename tools/{ => blender}/extract_models.py (94%)
 rename tools/{blender_extension => blender}/fast64_run.py (100%)
 delete mode 160000 tools/fast64

diff --git a/.gitmodules b/.gitmodules
index 4daeb0793..940631b37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,6 @@
 [submodule "doxygen-awesome-css"]
 	path = doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
-[submodule "tools/fast64"]
-	path = tools/fast64
+[submodule "tools/blender/fast64"]
+	path = tools/blender/fast64
 	url = https://github.com/Fast-64/fast64.git
diff --git a/tools/3d_models.json b/tools/blender/3d_models.json
similarity index 100%
rename from tools/3d_models.json
rename to tools/blender/3d_models.json
diff --git a/tools/blender_extension/blender_export.py b/tools/blender/blender_export.py
similarity index 94%
rename from tools/blender_extension/blender_export.py
rename to tools/blender/blender_export.py
index 0aa538c18..44ee6d8cc 100644
--- a/tools/blender_extension/blender_export.py
+++ b/tools/blender/blender_export.py
@@ -1,13 +1,13 @@
 import bpy
 import os
 import sys
-sys.path.append('tools')
+sys.path.append('tools/blender')
 import fast64
 from fast64.fast64_internal.f3d.f3d_gbi import get_F3D_GBI
 from fast64.fast64_internal.f3d.f3d_material import createF3DMat
 from fast64.fast64_internal.f3d.f3d_parser import F3DContext, getImportData, importMeshC
 
-from blender_extension.clean_scene import clean_scene
+from clean_scene import clean_scene
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 dir_path = dir_path.replace("\\", "/")
diff --git a/tools/blender_extension/clean_scene.py b/tools/blender/clean_scene.py
similarity index 100%
rename from tools/blender_extension/clean_scene.py
rename to tools/blender/clean_scene.py
diff --git a/tools/extract_models.py b/tools/blender/extract_models.py
similarity index 94%
rename from tools/extract_models.py
rename to tools/blender/extract_models.py
index 8f252b2aa..79e289fe6 100644
--- a/tools/extract_models.py
+++ b/tools/blender/extract_models.py
@@ -11,7 +11,7 @@ args = parser.parse_args()
 if not os.path.exists("models"):
     os.makedirs("models")
 
-models:list[dict[str, str|list[str]]] = json.load(open("tools/3d_models.json"))
+models:list[dict[str, str|list[str]]] = json.load(open("tools/blender/3d_models.json"))
 
 if os.name == "nt":
     blender = "c:/Program Files/Blender Foundation/Blender 4.0/blender.exe"
@@ -21,7 +21,7 @@ else:
 args_blender = [
     "--background",
     "--python",
-    "tools/blender_extension/blender_export.py",
+    "tools/blender/blender_export.py",
     "--",
 ]
 
diff --git a/tools/blender_extension/fast64_run.py b/tools/blender/fast64_run.py
similarity index 100%
rename from tools/blender_extension/fast64_run.py
rename to tools/blender/fast64_run.py
diff --git a/tools/fast64 b/tools/fast64
deleted file mode 160000
index 4e77d46cb..000000000
--- a/tools/fast64
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4e77d46cb1dd0fa0f0e9e6d49875ea07b331b946