diff --git a/components/raylib/raylibConstShader.swift b/components/render/renderConstShader.swift similarity index 96% rename from components/raylib/raylibConstShader.swift rename to components/render/renderConstShader.swift index c61c21e..97bbb4a 100644 --- a/components/raylib/raylibConstShader.swift +++ b/components/render/renderConstShader.swift @@ -1,4 +1,4 @@ -let RAYLIB_SHADER_MAIN_FS = """ +let RENDER_SHADER_MAIN_FS = """ #version 150 in vec3 vWorldPos; @@ -93,7 +93,7 @@ void main() } """ -let RAYLIB_SHADER_MAIN_VS = """ +let RENDER_SHADER_MAIN_VS = """ #version 150 in vec3 vertexPosition; in vec2 vertexTexCoord; @@ -119,7 +119,7 @@ void main() } """ -let RAYLIB_SHADER_SHADOW_FS = """ +let RENDER_SHADER_SHADOW_FS = """ #version 150 out vec4 finalColor; void main() @@ -128,7 +128,7 @@ void main() } """ -let RAYLIB_SHADER_SHADOW_VS = """ +let RENDER_SHADER_SHADOW_VS = """ #version 150 in vec3 vertexPosition; uniform mat4 mvp; diff --git a/components/root/mac/view/RaylibGLView.swift b/components/root/mac/view/RaylibGLView.swift index e9d4008..7715a6f 100644 --- a/components/root/mac/view/RaylibGLView.swift +++ b/components/root/mac/view/RaylibGLView.swift @@ -58,8 +58,8 @@ final class RaylibGLNSView: NSOpenGLView { updatePixelSize() sr_init(pixelWidth, pixelHeight, - RAYLIB_SHADER_MAIN_VS, RAYLIB_SHADER_MAIN_FS, - RAYLIB_SHADER_SHADOW_VS, RAYLIB_SHADER_SHADOW_FS) + RENDER_SHADER_MAIN_VS, RENDER_SHADER_MAIN_FS, + RENDER_SHADER_SHADOW_VS, RENDER_SHADER_SHADOW_FS) loadModel() startTime = CACurrentMediaTime() ready = true diff --git a/game/ver-mac/bridge/include/raylib_bridge.h b/game/ver-mac/bridge/include/raylib_bridge.h index cb4d905..65be1af 100644 --- a/game/ver-mac/bridge/include/raylib_bridge.h +++ b/game/ver-mac/bridge/include/raylib_bridge.h @@ -6,7 +6,7 @@ extern "C" { #endif // Initialise the OpenGL-backed raylib scene (no raylib window is created). -// The four shader sources come from raylibConstShader.swift. +// The four shader sources come from renderConstShader.swift. void sr_init(int width, int height, const char *main_vs, const char *main_fs, const char *shadow_vs, const char *shadow_fs); diff --git a/game/ver-mac/src/raylib/raylibConstShader.swift b/game/ver-mac/src/raylib/raylibConstShader.swift deleted file mode 120000 index f8a6bf6..0000000 --- a/game/ver-mac/src/raylib/raylibConstShader.swift +++ /dev/null @@ -1 +0,0 @@ -../../../../components/raylib/raylibConstShader.swift \ No newline at end of file diff --git a/game/ver-mac/src/render/renderConstShader.swift b/game/ver-mac/src/render/renderConstShader.swift new file mode 120000 index 0000000..2dcc2d4 --- /dev/null +++ b/game/ver-mac/src/render/renderConstShader.swift @@ -0,0 +1 @@ +../../../../components/render/renderConstShader.swift \ No newline at end of file