Make project nix buildable

Author: joinemm

.gitignore

@@ -1,3 +1,5 @@
+game
+result
 bin
 build
 *.o

Makefile

@@ -1,12 +1,19 @@
-CFLAGS = -Wall -Wextra -Werror -Wpedantic -Wshadow -Wconversion -Wno-float-conversion -Wno-unused-parameter -O2
+NAME = cpp-opengl
 
+CFLAGS = -Wall -Wextra -Werror -Wpedantic -Wshadow -Wconversion -Wno-float-conversion -Wno-unused-parameter -O2
 LDFLAGS = -lGLEW -lGL -lGLU -lglfw
-
-TARGET = bin/out
+PREFIX = /usr/local/$(NAME)
+TARGET = game
 SOURCES = $(wildcard src/*.cpp)
 OBJS = ${SOURCES:src/%.cpp=build/%.o}
 DEPS = $(OBJS:.o=.d)
 
+define RUNNER :=
+cd $(PREFIX)
+./$(TARGET)
+endef
+export RUNNER
+
 all: $(TARGET)
 
 clean:
@@ -27,6 +34,17 @@ $(TARGET): $(OBJS) | bin
 build/%.o: src/%.cpp | build
 	g++ $(CFLAGS) -MMD -MP -c $< -o $@
 
-.PHONY: all clean run
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	cp $(TARGET) $(PREFIX)
+	cp -r shaders $(PREFIX)
+	cp -r assets $(PREFIX)
+	@echo "$$RUNNER" > $(PREFIX)/bin/$(NAME)
+	chmod +x $(PREFIX)/bin/$(NAME)
+
+uninstall:
+	rm -r $(PREFIX)
+
+.PHONY: all clean run install uninstall
 
 -include $(DEPS)

assets/container2.png

@@ -13,15 +13,24 @@
   }:
     flake-utils.lib.eachDefaultSystem (
       system: let
+        name = "cpp-opengl";
         pkgs = nixpkgs.legacyPackages.${system};
+        buildInputs = with pkgs; [
+          glfw
+          glew
+          stb
+          glm
+        ];
       in {
+        packages = {
+          default = pkgs.stdenv.mkDerivation {
+            src = ./.;
+            makeFlags = ["PREFIX=$(out)"];
+            inherit name buildInputs;
+          };
+        };
         devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            glfw
-            glew
-            stb
-            glm
-          ];
+          inherit name buildInputs;
         };
       }
     );

assets/container2_specular.png

@@ -6,27 +6,44 @@ in vec2 TexCoord;
 in vec3 Normal;
 in vec3 FragPos;
 
-uniform vec3 lightColor;
-uniform vec3 objectColor;
-uniform vec3 lightPos;
-uniform vec3 viewPos;
+struct Material {
+  vec3 ambient;
+  vec3 diffuse;
+  sampler2D diffuseMap;
+  vec3 specular;
+  float shininess;
+};
+
+struct Light {
+  vec3 position;
+  vec3 ambient;
+  vec3 brightness;
+};
 
+uniform Material material;
+uniform Light light;
+
+uniform vec3 viewPos;
 uniform sampler2D texture1;
 
 void main() {
-  float ambientStrength = 0.1f;
-  float specularStrength = 0.5f;
-  vec3 ambient = ambientStrength * lightColor;
+  // ambient
+  vec3 ambient = light.ambient * material.ambient *
+                 vec3(texture(material.diffuseMap, TexCoord));
+
+  // diffuse
   vec3 norm = normalize(Normal);
-  // from object towards the light source
-  vec3 lightDir = normalize(lightPos - FragPos);
+  vec3 lightDir = normalize(light.position - FragPos);
   float diff = max(dot(norm, lightDir), 0.0f);
-  vec3 diffuse = diff * lightColor;
+  vec3 diffuse =
+      light.brightness * diff * vec3(texture(material.diffuseMap, TexCoord));
+
+  // specular
   vec3 viewDir = normalize(viewPos - FragPos);
   vec3 reflection = reflect(-lightDir, norm);
-  float spec = pow(max(dot(viewDir, reflection), 0.0f), 32);
-  vec3 specular = specularStrength * spec * lightColor;
-  vec3 final = (ambient + diffuse + specular) * objectColor;
-  FragColor = vec4(final, 1.0f);
-  // * texture(texture1, TexCoord);
+  float spec =
+      pow(max(dot(viewDir, reflection), 0.0f), material.shininess * 128.0f);
+  vec3 specular = light.brightness * (spec * material.specular);
+
+  FragColor = vec4(ambient + diffuse + specular, 1.0f);
 }

flake.lock

@@ -354,28 +354,49 @@ unsigned int createLightsource() {
   return VAO;
 }
 
+struct Material {
+  glm::vec3 ambient;
+  glm::vec3 diffuse;
+  glm::vec3 specular;
+  float shininess;
+};
+
 int main(void) {
   GLFWwindow *window = initOpenGL();
 
   Shader simpleShader("shaders/standard.vert.glsl", "shaders/phong.frag.glsl");
   Shader lampShader("shaders/standard.vert.glsl", "shaders/lamp.frag.glsl");
-  Texture texture("assets/silo2_p2.png", GL_NEAREST, GL_REPEAT);
+  Texture texture("assets/container2.png", GL_NEAREST, GL_REPEAT);
 
   unsigned int cubeVAO = createCube();
   unsigned int lightVAO = createLightsource();
 
+  Material gold = {
+      glm::vec3(0.24725f, 0.1995f, 0.0745f),
+      glm::vec3(0.75164f, 0.60648f, 0.22648f),
+      glm::vec3(0.628281f, 0.555802f, 0.366065f),
+      0.4f,
+  };
+
+  Material crate = {
+      glm::vec3(0.1f, 0.1f, 0.2f),
+      glm::vec3(1.0f),
+      glm::vec3(1.0f),
+      0.2f,
+  };
+
   std::vector cubePositions = {
       glm::vec3(0.0f, 0.0f, 0.0f),
       glm::vec3(1.3f, 0.0f, 0.0f),
       glm::vec3(0.0f, 1.3f, 0.0f),
       glm::vec3(0.0f, 0.0f, 1.3f),
   };
 
-  std::vector cubeColors = {
-      glm::vec3(1.0f, 1.0f, 1.0f),
-      glm::vec3(1.0f, 0.0f, 0.0f),
-      glm::vec3(0.0f, 1.0f, 0.0f),
-      glm::vec3(0.0f, 0.0f, 1.0f),
+  std::vector cubeMaterials = {
+      gold,
+      crate,
+      crate,
+      crate,
   };
 
   camera.setPosition(glm::vec3(4.0f, 4.0f, 4.0f));
@@ -427,16 +448,21 @@ int main(void) {
     simpleShader.setMat4("projection", camera.projection());
     simpleShader.setMat4("view", view);
 
-    simpleShader.setVec3("lightColor", glm::vec3(1.0f, 1.0f, 1.0f));
-    simpleShader.setVec3("lightPos", lightPos);
+    simpleShader.setVec3("light.ambient", glm::vec3(1.0f));
+    simpleShader.setVec3("light.brightness", glm::vec3(1.0f));
+    simpleShader.setVec3("light.position", lightPos);
+
     simpleShader.setVec3("viewPos", camera.pos);
     glBindVertexArray(cubeVAO);
 
     for (unsigned int i = 0; i < std::size(cubePositions); i++) {
       glm::mat4 model = glm::mat4(1.0f);
       model = glm::translate(model, cubePositions[i]);
       simpleShader.setMat4("model", model);
-      simpleShader.setVec3("objectColor", cubeColors[i]);
+      simpleShader.setVec3("material.ambient", cubeMaterials[i].ambient);
+      simpleShader.setVec3("material.diffuse", cubeMaterials[i].diffuse);
+      simpleShader.setVec3("material.specular", cubeMaterials[i].specular);
+      simpleShader.setFloat("material.shininess", cubeMaterials[i].shininess);
       glDrawArrays(GL_TRIANGLES, 0, 36);
     }
 

flake.nix

@@ -20,9 +20,9 @@ Shader::Shader(const char *vertexPath, const char *fragmentPath) {
 
   // check for linking errors
   int success;
-  glGetShaderiv(ID, GL_LINK_STATUS, &success);
+  glGetProgramiv(ID, GL_LINK_STATUS, &success);
   if (!success) {
-    GLchar infoLog[1024];
+    char infoLog[1024];
     glGetProgramInfoLog(ID, 1024, NULL, infoLog);
     std::cerr << "ERROR: SHADER LINKING FAILED\n" << infoLog << std::endl;
   }