From c3c923611c747b88e3050b91aa35f798bc3e4719 Mon Sep 17 00:00:00 2001
From: milek7 <me@milek7.pl>
Date: Wed, 6 Sep 2017 21:46:33 +0200
Subject: [PATCH] png textures support

---
 Model3d.h   |  2 --
 Texture.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 Texture.h   |  1 +
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/Model3d.h b/Model3d.h
index 44d9f82c..76c00b48 100644
--- a/Model3d.h
+++ b/Model3d.h
@@ -55,8 +55,6 @@ class TGroundNode;
 
 class TSubModel
 { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów
-    //m7todo: zrobić normalną serializację
-
     friend class opengl_renderer;
     friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy
     friend class TDynamicObject; // temporary etc
diff --git a/Texture.cpp b/Texture.cpp
index bf505024..add2d4f8 100644
--- a/Texture.cpp
+++ b/Texture.cpp
@@ -23,6 +23,8 @@ http://mozilla.org/MPL/2.0/.
 #include "Logs.h"
 #include "sn_utils.h"
 
+#include <png.h>
+
 #define EU07_DEFERRED_TEXTURE_UPLOAD
 
 texture_manager::texture_manager() {
@@ -46,6 +48,7 @@ opengl_texture::load() {
 
              if( extension == "dds" ) { load_DDS(); }
         else if( extension == "tga" ) { load_TGA(); }
+		else if( extension == "png" ) { load_PNG(); }
         else if( extension == "bmp" ) { load_BMP(); }
         else if( extension == "tex" ) { load_TEX(); }
         else { goto fail; }
@@ -72,6 +75,51 @@ fail:
     return;
 }
 
+void opengl_texture::load_PNG()
+{
+	png_image png;
+	memset(&png, 0, sizeof(png_image));
+	png.version = PNG_IMAGE_VERSION;
+
+	png_image_begin_read_from_file(&png, name.c_str());
+	if (png.warning_or_error)
+	{
+		data_state = resource_state::failed;
+		ErrorLog(name + " error: " + std::string(png.message));
+		return;
+	}
+
+	if (png.format & PNG_FORMAT_FLAG_ALPHA)
+	{
+		data_format = GL_RGBA;
+		data_components = GL_RGBA;
+		png.format = PNG_FORMAT_RGBA;
+	}
+	else
+	{
+		data_format = GL_RGB;
+		data_components = GL_RGB;
+		png.format = PNG_FORMAT_RGB;
+	}
+	data_width = png.width;
+	data_height = png.height;
+
+	data.resize(PNG_IMAGE_SIZE(png));
+
+	png_image_finish_read(&png, nullptr,
+		(void*)&data[0], -data_width * PNG_IMAGE_PIXEL_SIZE(png.format), nullptr);
+
+    if (png.warning_or_error)
+    {
+        data_state = resource_state::failed;
+        ErrorLog(name + " error: " + std::string(png.message));
+        return;
+    }
+
+    data_mapcount = 1;
+    data_state = resource_state::good;
+}
+
 void
 opengl_texture::load_BMP() {
 
@@ -722,7 +770,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) {
 
 	std::replace(Filename.begin(), Filename.end(), '\\', '/'); // fix slashes
 
-    std::vector<std::string> extensions{ { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } };
+    std::vector<std::string> extensions{ { ".dds" }, { ".tga" }, { ".png" }, { ".bmp" }, { ".ext" } };
 
     // try to locate requested texture in the databank
     auto lookup = find_in_databank( Filename + Global::szDefaultExt );
diff --git a/Texture.h b/Texture.h
index 097d1bb5..ab997ec2 100644
--- a/Texture.h
+++ b/Texture.h
@@ -57,6 +57,7 @@ struct opengl_texture {
 private:
 // methods
     void load_BMP();
+	void load_PNG();
     void load_DDS();
     void load_TEX();
     void load_TGA();