update test meshes to use palette texture

data/default.fs

@@ -38,6 +38,6 @@ void main()
 
 	vec4 sampled_color = texture(sampler, fragUV.st);
 	color = clamp(totalBrightness, 0, 1) * sampled_color;
-	//color = clamp(totalBrightness, 0, 1) * fragColor;
+	//color = vec4(clamp(totalBrightness, 0, 1) * fragColor, 0);
 }
 

data/test_scene.json

@@ -74,7 +74,7 @@
 		},
 		{
 			"name" : "box",
-			"model_file" : "animated.block.dae",
+			"model_file" : "block2.dae",
 			"position" : {
 				"x" : 140,
 				"y" : -100,

src/mesh.cpp

@@ -155,7 +155,7 @@ copyMeshInfo(const char* data_dir, const aiScene* scene, aiMesh* mesh)
 		mi->diffuse_color.b = color.b;
 	}
 
-	if (mat->GetTextureCount(aiTextureType_DIFFUSE) > 0) {
+	if (has_tex && mat->GetTextureCount(aiTextureType_DIFFUSE) > 0) {
 		aiString file_name;
 		if (AI_SUCCESS != mat->GetTexture(aiTextureType_DIFFUSE, 0, &file_name, NULL, NULL, NULL, NULL, NULL)) {
 			LOG(ERROR) << "Some Assimp-type-error\n";

src/render_group.cpp

@@ -13,7 +13,7 @@
 #include "mesh.h"
 #include "util.h"
 
-#define INFO_LOG_MAX_LENGTH 312;
+#define INFO_LOG_MAX_LENGTH 312
 
 
 // forward declarations
@@ -222,6 +222,7 @@ rgDraw(render_group* rg, glm::mat4 model_matrix,
 			}
 		}
 
+		// 4th attribute buffer: UV coordinates
 		if (ro->use_texture) {
 			glEnableVertexAttribArray(3);
 			glBindBuffer(GL_ARRAY_BUFFER, ro->uv_buffer.buffer_id);

src/util.cpp

@@ -71,6 +71,7 @@ utilLoadImage(const char* filename)
 
 	util_image image;
 	std::memcpy(image.file_path, filename, std::strlen(filename) + 1);
+	stbi_set_flip_vertically_on_load(1);
 	image.pixels = stbi_load(filename, &image.w, &image.h, &image.num_channels, 0);
 	image.data_len = image.w * image.h * image.num_channels; // NOTE: assumes 8 bits per channel