From 8945c2e3a902fcc24359608b9ddadd80e8848ae1 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 2 Apr 2023 17:45:46 -0700 Subject: [PATCH] Fixed colors in shaders. --- assets/games/rose/textures/Urchin.png | Bin 8959 -> 9662 bytes .../display/shader/ShaderProgram.cpp | 3 ++- src/dawnrose/scenes/HelloWorldScene.hpp | 4 ++-- src/dawntools/texturetool/TextureTool.cpp | 12 +++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/assets/games/rose/textures/Urchin.png b/assets/games/rose/textures/Urchin.png index a562f6f1d0c5061594b3dde33bce1fe2437468f7..b5e1a8492d687f11d5ddc3b84989426cc89212f2 100644 GIT binary patch literal 9662 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 Z{||ozkCl{4dwu`_002ovPDHLkV1k+qB+>u? diff --git a/src/dawnopengl/display/shader/ShaderProgram.cpp b/src/dawnopengl/display/shader/ShaderProgram.cpp index 58b5e52e..b649ecec 100644 --- a/src/dawnopengl/display/shader/ShaderProgram.cpp +++ b/src/dawnopengl/display/shader/ShaderProgram.cpp @@ -97,7 +97,8 @@ void ShaderProgram::setBoolean(shaderparameter_t uni, bool value) { } void ShaderProgram::setColor(shaderparameter_t uniform, struct Color color) { - glUniform4f(uniform, color.r, color.g, color.b, color.a); + auto precise = color.precision(); + glUniform4f(uniform, precise.r, precise.g, precise.b, precise.a); } void ShaderProgram::setVector3(shaderparameter_t uniform, glm::vec3 vector) { diff --git a/src/dawnrose/scenes/HelloWorldScene.hpp b/src/dawnrose/scenes/HelloWorldScene.hpp index 81c4ab1a..a3d3e819 100644 --- a/src/dawnrose/scenes/HelloWorldScene.hpp +++ b/src/dawnrose/scenes/HelloWorldScene.hpp @@ -43,8 +43,8 @@ namespace Dawn { camera = Camera::create(this); camera->fov = 0.436332f; camera->transform->lookAt(glm::vec3(10, 10, 10), glm::vec3(0, 0, 0)); - // auto gameCamera = camera->item->addComponent(); - // gameCamera->player = player->player; + auto gameCamera = camera->item->addComponent(); + gameCamera->player = player->player; } std::vector getRequiredAssets() override { diff --git a/src/dawntools/texturetool/TextureTool.cpp b/src/dawntools/texturetool/TextureTool.cpp index c472029a..adafb4dd 100644 --- a/src/dawntools/texturetool/TextureTool.cpp +++ b/src/dawntools/texturetool/TextureTool.cpp @@ -21,8 +21,8 @@ int32_t TextureTool::start() { if(!in.open(FILE_MODE_READ)) return 1; int w, h, channels; - auto dataImage = stbi_load_from_file(in.file, &w, &h, &channels, STBI_rgb_alpha); - if(dataImage == NULL) { + auto imageRaw = stbi_load_from_file(in.file, &w, &h, &channels, STBI_rgb_alpha); + if(imageRaw == NULL) { std::cout << "Failed to load input texture!" << std::endl; return 1; } @@ -30,6 +30,12 @@ int32_t TextureTool::start() { // Convert to floating points size_t len = STBI_rgb_alpha * w * h; + uint8_t *dataImage = (uint8_t*)malloc(sizeof(uint8_t) * len); + for(size_t i = 0; i < len; i++) { + auto dataIn = imageRaw[i]; + dataImage[i] = dataIn; + } + stbi_image_free(imageRaw); // Open and create output File out(flags["output"] + ".texture"); @@ -55,7 +61,7 @@ int32_t TextureTool::start() { std::cout << "Failed to write texture data for " << out.filename << std::endl; return 1; } - stbi_image_free(dataImage); + free(dataImage); return 0; } \ No newline at end of file