From bf47b9e59d5694ae0059f177545d6977e23cbb6d Mon Sep 17 00:00:00 2001 From: Miguel Angel Astor Romero Date: Thu, 23 Feb 2017 16:07:22 -0400 Subject: [PATCH] Color map finally works! --- ogl.cpp | 4 +++- pheromone.cpp | 2 +- shaders/color_map.png | Bin 346 -> 328 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ogl.cpp b/ogl.cpp index 67b4e82..0eafb41 100644 --- a/ogl.cpp +++ b/ogl.cpp @@ -69,11 +69,13 @@ namespace ogl glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, tex.width, 0, GL_RGB, GL_UNSIGNED_BYTE, data); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); png_close_file(&tex); delete data; } - + void initialize(PheromoneMap * phero_map) { glEnable(GL_TEXTURE_1D); glEnable(GL_TEXTURE_2D); diff --git a/pheromone.cpp b/pheromone.cpp index cd26dbb..893cad3 100644 --- a/pheromone.cpp +++ b/pheromone.cpp @@ -36,7 +36,7 @@ #define MAP_POS(X, Y) (data[((X) * m_height) + (Y)]) static const unsigned int MAX_ITERS = 1000; -static const float EVAPORATION_RATE = 0.1f; +static const float EVAPORATION_RATE = 0.05f; const unsigned char MAX_PHERO_INTENSITY = 250; const unsigned char MIN_PHERO_INTENSITY = 0; diff --git a/shaders/color_map.png b/shaders/color_map.png index 98f2d2b4c42c755e0969507d64b96ad53319e11f..94d3a2fe7d944a3df1f74dd80cecd6b53e6f9402 100644 GIT binary patch delta 236 zcmV}c8Bo78+OGiWi{{a60|De66laV1H2p1Cy076ZxVv$KGf3QhJK~yNu zjgnDr!yps{XBO9r)Fbr%$E;sJfY?rKr4~ZNcv<*BU|oLVw?5)3tFE%(mn^zS!zK-y z1A mn$XSY3BlnOD7P15?&pp9H{6y4X3${QbTSWUJ z(a2WVc*+=24b%d5MK>q0|K8|AS9GzPlVWO4z7&%|#d&kZAj g=schE_{o1fZ`^m`1N-~C-~a#s07*qoM6N<$f-o$61^@s6