diff --git a/misc/CCicon.rc b/misc/CCicon.rc
deleted file mode 100644
index 0dbe9f8ba..000000000
--- a/misc/CCicon.rc
+++ /dev/null
@@ -1 +0,0 @@
-1 ICON "CCicon.ico"
diff --git a/misc/build_server.py b/misc/build_scripts/build_server.py
similarity index 100%
rename from misc/build_server.py
rename to misc/build_scripts/build_server.py
diff --git a/misc/buildbot.sh b/misc/build_scripts/buildbot.sh
similarity index 99%
rename from misc/buildbot.sh
rename to misc/build_scripts/buildbot.sh
index f0dec8e9c..7a9cac289 100644
--- a/misc/buildbot.sh
+++ b/misc/build_scripts/buildbot.sh
@@ -33,7 +33,7 @@ WIN64_FLAGS="-mwindows -nostartfiles -Wl,-emain_real -DCC_NOMAIN"
build_win32() {
echo "Building win32.."
- cp $ROOT_DIR/misc/CCicon_32.res $ROOT_DIR/src/CCicon_32.res
+ cp $ROOT_DIR/misc/windows/CCicon_32.res $ROOT_DIR/src/CCicon_32.res
$WIN32_CC *.c $ALL_FLAGS $WIN32_FLAGS -o cc-w32-d3d.exe CCicon_32.res -DCC_COMMIT_SHA=\"$LATEST\" -lwinmm -limagehlp
if [ $? -ne 0 ]; then echo "Failed to compile Windows 32 bit" >> "$ERRS_FILE"; fi
@@ -49,7 +49,7 @@ build_win32() {
build_win64() {
echo "Building win64.."
- cp $ROOT_DIR/misc/CCicon_64.res $ROOT_DIR/src/CCicon_64.res
+ cp $ROOT_DIR/misc/windows/CCicon_64.res $ROOT_DIR/src/CCicon_64.res
$WIN64_CC *.c $ALL_FLAGS $WIN64_FLAGS -o cc-w64-d3d.exe CCicon_64.res -DCC_COMMIT_SHA=\"$LATEST\" -lwinmm -limagehlp
if [ $? -ne 0 ]; then echo "Failed to compile Windows 64 bit" >> "$ERRS_FILE"; fi
diff --git a/misc/buildbot_plugin.sh b/misc/build_scripts/buildbot_plugin.sh
similarity index 100%
rename from misc/buildbot_plugin.sh
rename to misc/build_scripts/buildbot_plugin.sh
diff --git a/misc/buildtestplugin.sh b/misc/build_scripts/buildtestplugin.sh
similarity index 100%
rename from misc/buildtestplugin.sh
rename to misc/build_scripts/buildtestplugin.sh
diff --git a/misc/makerelease.sh b/misc/build_scripts/makerelease.sh
similarity index 100%
rename from misc/makerelease.sh
rename to misc/build_scripts/makerelease.sh
diff --git a/misc/notify.py b/misc/build_scripts/notify.py
similarity index 100%
rename from misc/notify.py
rename to misc/build_scripts/notify.py
diff --git a/misc/build_scripts/readme.md b/misc/build_scripts/readme.md
new file mode 100644
index 000000000..7bf5e7f97
--- /dev/null
+++ b/misc/build_scripts/readme.md
@@ -0,0 +1,9 @@
+This folder contains build scripts for automatically compiling ClassiCube
+
+|File|Description|
+|--------|-------|
+|buildbot.sh | Compiles the game to optimised executables (with icons) |
+|buildbot_plugin.sh | Compiles specified plugin for various platforms |
+|buildtestplugin.sh | Example script for how to use buildbot_plugin.sh |
+|makerelease.sh | Packages the executables to produce files for a release |
+|notify.py | Notifies a user on Discord if buildbot fails |
\ No newline at end of file
diff --git a/misc/install-desktop-entry.sh b/misc/linux/install-desktop-entry.sh
similarity index 100%
rename from misc/install-desktop-entry.sh
rename to misc/linux/install-desktop-entry.sh
diff --git a/misc/linux_icon_gen.cs b/misc/linux/linux_icon_gen.cs
similarity index 100%
rename from misc/linux_icon_gen.cs
rename to misc/linux/linux_icon_gen.cs
diff --git a/misc/CCIcon.icns b/misc/macOS/CCIcon.icns
similarity index 100%
rename from misc/CCIcon.icns
rename to misc/macOS/CCIcon.icns
diff --git a/misc/info.plist b/misc/macOS/info.plist
similarity index 100%
rename from misc/info.plist
rename to misc/macOS/info.plist
diff --git a/misc/mac_icon_gen.cs b/misc/macOS/mac_icon_gen.cs
similarity index 100%
rename from misc/mac_icon_gen.cs
rename to misc/macOS/mac_icon_gen.cs
diff --git a/misc/readme.md b/misc/readme.md
index e21089b45..aaa926106 100644
--- a/misc/readme.md
+++ b/misc/readme.md
@@ -1,23 +1,19 @@
-This folder contains addtitional information and resources for the game
+This folder contains additional files and resources for ClassiCube
## Icons
CCicon.ico is the basis icon for the other icon files
-mac_icon_gen.cs/linux_icon_gen.cs use CCIcon.ico to generate icon files for macOS/Linux
+Generating icons that can be embedded in the executable is operating system and compiler specific - see the relevant operating system folder for more details
TODO: Explain how to compile your own icon for all the platforms
-## Build scripts
+## Folder meanings
|File|Description|
|--------|-------|
-|buildbot.sh | Compiles the game to optimised executables (with icons) |
-|buildbot_plugin.sh | Compiles specified plugin for various platforms |
-|buildtestplugin.sh | Example script for how to use buildbot_plugin.sh |
-|makerelease.sh | Packages the executables to produce files for a release |
-|notify.py | Notifies a user on Discord if buildbot fails |
-
-## Other files
-
-Info.plist is the Info.plist you would use when creating an Application Bundle for macOS.
\ No newline at end of file
+|windows | Contains icons |
+|macOS | Contains icons, Info.plist for generating macOS Application Bundle |
+|linux | Contains icons, script for generating a Desktop Entry |
+|xbox | Contains Xbox shaders |
+|build_scripts | Contains scripts for compiling plugins and optimised ClassiCube executables|
\ No newline at end of file
diff --git a/misc/windows/CCicon.rc b/misc/windows/CCicon.rc
new file mode 100644
index 000000000..6c0d8cd9f
--- /dev/null
+++ b/misc/windows/CCicon.rc
@@ -0,0 +1 @@
+1 ICON "../CCicon.ico"
diff --git a/misc/CCicon_32.res b/misc/windows/CCicon_32.res
similarity index 100%
rename from misc/CCicon_32.res
rename to misc/windows/CCicon_32.res
diff --git a/misc/CCicon_64.res b/misc/windows/CCicon_64.res
similarity index 100%
rename from misc/CCicon_64.res
rename to misc/windows/CCicon_64.res
diff --git a/src/ClassiCube.vcxproj b/src/ClassiCube.vcxproj
index 92c6ce1e5..526fae5ac 100644
--- a/src/ClassiCube.vcxproj
+++ b/src/ClassiCube.vcxproj
@@ -553,7 +553,7 @@
-
+
diff --git a/src/Graphics_Xbox.c b/src/Graphics_Xbox.c
index dbbfd244e..53ff43889 100644
--- a/src/Graphics_Xbox.c
+++ b/src/Graphics_Xbox.c
@@ -41,12 +41,12 @@ static void LoadFragmentShader(void) {
uint32_t* p;
p = pb_begin();
- #include "ps.inl"
+ #include "../misc/xbox/ps_colored.inl"
pb_end(p);
}
static uint32_t vs_program[] = {
- #include "vs.inl"
+ #include "../misc/xbox/vs_colored.inl"
};
static void SetupShaders(void) {
@@ -368,22 +368,7 @@ void Gfx_CalcPerspectiveMatrix(struct Matrix* matrix, float fov, float aspect, f
matrix->row4.W = 0.0f;
}
-/* Construct a viewport transformation matrix */
-static void CalcViewportTransform(struct Matrix* m, float width, float height, float z_min, float z_max) {
- *m = Matrix_Identity;
- m->row1.X = width / 2.0f;
- m->row2.Y = -height / 2.0f;
- m->row3.Z = z_max - z_min;
- m->row4.X = width / 2.0f;
- m->row4.Y = height / 2.0f;
- m->row4.Z = z_min;
- m->row4.W = 1.0f;
-}
-
-struct Matrix viewport;
-void Gfx_OnWindowResize(void) {
- CalcViewportTransform(&viewport, WindowInfo.Width, WindowInfo.Height, 0, 65536.0f);
-}
+void Gfx_OnWindowResize(void) { }
static struct Matrix _view, _proj, _mvp;
diff --git a/src/Makefile_xbox b/src/Makefile_xbox
index a54fc0865..b198d1512 100644
--- a/src/Makefile_xbox
+++ b/src/Makefile_xbox
@@ -2,7 +2,8 @@ XBE_TITLE = ClassiCube
GEN_XISO = $(XBE_TITLE).iso
SRCS = $(wildcard src/*.c)
NXDK_DIR = /home/test/Downloads/nxdk
-SHADER_OBJS = misc/xbox/ps.inl misc/xbox/vs.inl
-NXDK_STACKSIZE = 131072
+SHADER_OBJS = misc/xbox/vs_colored.inl misc/xbox/ps_colored.inl
+NXDK_NET = y
+NXDK_LDFLAGS = -stack:131072
include $(NXDK_DIR)/Makefile
diff --git a/src/Platform_Xbox.c b/src/Platform_Xbox.c
index eb2acddd5..5a1e45bd5 100644
--- a/src/Platform_Xbox.c
+++ b/src/Platform_Xbox.c
@@ -424,7 +424,7 @@ static void InitHDD(void) {
Platform_LogConst("Failed to mount E:\ from Data partition");
return;
}
- Directory_Create(&String_Empty);
+ Directory_Create(&String_Empty); // create root ClassiCube folder
}
void Platform_Init(void) {