diff --git a/assets/textures/studs.png b/assets/textures/studs.png index 9b83818..425c310 100644 Binary files a/assets/textures/studs.png and b/assets/textures/studs.png differ diff --git a/assets/textures/studs.psd b/assets/textures/studs.psd new file mode 100644 index 0000000..e7053d8 Binary files /dev/null and b/assets/textures/studs.psd differ diff --git a/assets/textures/studs.xcf b/assets/textures/studs.xcf new file mode 100644 index 0000000..9367b89 Binary files /dev/null and b/assets/textures/studs.xcf differ diff --git a/assets/textures/studs1.png b/assets/textures/studs1.png new file mode 100644 index 0000000..10a919e Binary files /dev/null and b/assets/textures/studs1.png differ diff --git a/assets/textures/studs_beta.png b/assets/textures/studs_beta.png new file mode 100644 index 0000000..9b83818 Binary files /dev/null and b/assets/textures/studs_beta.png differ diff --git a/src/rendering/renderer.cpp b/src/rendering/renderer.cpp index 7c11659..f42ca5e 100644 --- a/src/rendering/renderer.cpp +++ b/src/rendering/renderer.cpp @@ -15,6 +15,7 @@ #include "../camera.h" #include "../part.h" #include "skybox.h" +#include "surface.h" #include "texture3d.h" #include "renderer.h" @@ -46,7 +47,7 @@ void renderInit(GLFWwindow* window) { "assets/textures/skybox/null_plainsky512_bk.jpg", }, GL_RGB); - studsTexture = new Texture3D("assets/textures/studs.png", 64, 64, 6, GL_RGBA); + studsTexture = new Texture3D("assets/textures/studs.png", 128, 128, 6, GL_RGBA); // Compile shader shader = new Shader("assets/shaders/phong.vs", "assets/shaders/phong.fs"); @@ -90,8 +91,9 @@ void renderParts() { // }); studsTexture->activate(0); shader->set("studs", 0); - shader->set("surfaces[1]", 3); - shader->set("surfaces[4]", 4); + // shader->set("surfaces[1]", SurfaceStuds); + shader->set("surfaces[1]", SurfaceStuds); + shader->set("surfaces[4]", SurfaceInlets); // Pre-calculate the normal matrix for the shader diff --git a/src/rendering/surface.h b/src/rendering/surface.h new file mode 100644 index 0000000..ae4f462 --- /dev/null +++ b/src/rendering/surface.h @@ -0,0 +1,10 @@ +#pragma once + +enum SurfaceType { + SurfaceSmooth = 0, + SurfaceGlue = 1, + SurfaceWeld = 2, + SurfaceStuds = 3, + SurfaceInlets = 4, + SurfaceUniversal = 5, +}; \ No newline at end of file