Merge pull request #29 from mortennobel/1.0.6

1.0.6
mortennobel · Mar 17, 2018 · c6b5c15 · c6b5c15
2 parents 2f880f0 + 0eaaeb3
commit c6b5c15
Show file tree

Hide file tree

Showing 57 changed files with 707 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -138,4 +138,5 @@ App_Data/*.mdf
 App_Data/*.ldf
 
 .idea/
-project/
+project/
+imgui.ini
diff --git a/em-build.sh b/em-build.sh
@@ -8,7 +8,7 @@ fi
 
 source ${EMSDK}/emsdk_env.sh
 
-for FILENAME in multiple-materials multiple-lights imgui-color-test pbr-test custom-mesh-layout-default-values imgui_demo multi-cameras particle-sprite particle-test polygon-offset-example spinning-sphere-cubemap sprite-test static_vertex_attribute texture-test
+for FILENAME in benchmark64k-heavy matrix-uniforms custom-mesh-layout-ints multiple-materials multiple-lights imgui-color-test pbr-test custom-mesh-layout-default-values imgui_demo multi-cameras particle-sprite particle-test polygon-offset-example spinning-sphere-cubemap sprite-test static_vertex_attribute texture-test
 do
 echo $FILENAME
 emcc -Iinclude src/imgui/imgui.cpp \

diff --git a/imgui.ini b/imgui.ini
diff --git a/include/TextEditor.h b/include/TextEditor.h
@@ -11,7 +11,7 @@
 #include "imgui.h"
 
 /**
- * https://github.com/BalazsJako/ImGuiColorTextEdit
+ * https://github.com/BalazsJako/ImGuiColorTextEdit (commit 6c69c306da0afb6c0b7ea51ec504aa0aae348aad)
  *
  * MIT License
  *

diff --git a/include/sre/BlendType.hpp b/include/sre/BlendType.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Camera.hpp b/include/sre/Camera.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Color.hpp b/include/sre/Color.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Framebuffer.hpp b/include/sre/Framebuffer.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Inspector.hpp b/include/sre/Inspector.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Light.hpp b/include/sre/Light.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/LightType.hpp b/include/sre/LightType.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Log.hpp b/include/sre/Log.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 #pragma once

diff --git a/include/sre/Material.hpp b/include/sre/Material.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 
@@ -78,7 +78,9 @@ namespace sre {
 
         bool set(std::string uniformName, glm::vec4 value);
         bool set(std::string uniformName, float value);
-        bool set(std::string uniformName, std::shared_ptr<sre::Texture>);
+        bool set(std::string uniformName, std::shared_ptr<sre::Texture> value);
+        bool set(std::string uniformName, std::shared_ptr<std::vector<glm::mat3>> value);
+        bool set(std::string uniformName, std::shared_ptr<std::vector<glm::mat4>> value);
         bool set(std::string uniformName, Color value);
 
         template<typename T>
@@ -98,6 +100,8 @@ namespace sre {
 
         std::vector<Uniform<std::shared_ptr<sre::Texture>>> textureValues;
         std::vector<Uniform<glm::vec4>> vectorValues;
+        std::vector<Uniform<std::shared_ptr<std::vector<glm::mat4>>>> mat4Values;
+        std::vector<Uniform<std::shared_ptr<std::vector<glm::mat3>>>> mat3Values;
         std::vector<Uniform<float>> floatValues;
 
         friend class Shader;

diff --git a/include/sre/Mesh.hpp b/include/sre/Mesh.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 
@@ -65,7 +65,7 @@ namespace sre {
             MeshBuilder& withAttribute(std::string name, const std::vector<glm::vec2> &values);   // Set a named vertex attribute of vec2
             MeshBuilder& withAttribute(std::string name, const std::vector<glm::vec3> &values);   // Set a named vertex attribute of vec3
             MeshBuilder& withAttribute(std::string name, const std::vector<glm::vec4> &values);   // Set a named vertex attribute of vec4
-            MeshBuilder& withAttribute(std::string name, const std::vector<glm::i32vec4> &values);// Set a named vertex attribute of i32vec4
+            MeshBuilder& withAttribute(std::string name, const std::vector<glm::i32vec4> &values);// Set a named vertex attribute of i32vec4. On platforms not supporting i32vec4 the values are converted to vec4
 
             // other
             MeshBuilder& withName(const std::string& name);                                       // Defines the name of the mesh
@@ -165,6 +165,8 @@ namespace sre {
 
         friend class RenderPass;
         friend class Inspector;
+
+        bool hasAttribute(std::string name);
     };
 
     template<>

diff --git a/include/sre/MeshTopology.hpp b/include/sre/MeshTopology.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/ModelImporter.hpp b/include/sre/ModelImporter.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/RenderPass.hpp b/include/sre/RenderPass.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/RenderStats.hpp b/include/sre/RenderStats.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Renderer.hpp b/include/sre/Renderer.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 
@@ -71,7 +71,7 @@ namespace sre {
         ~Renderer();
         static constexpr int sre_version_major = 1;
         static constexpr int sre_version_minor = 0;
-        static constexpr int sre_version_point = 5;
+        static constexpr int sre_version_point = 6;
 
         glm::ivec2 getWindowSize();                         // Return the current size of the window
 
@@ -89,7 +89,7 @@ namespace sre {
 
         int getMaxSceneLights();                            // Get maximum amout of scenelights per object
 
-        DEPRECATED("Use sre::renderInfo() instead of getRenderInfo()")
+        DEPRECATED("Use sre::renderInfo() instead of Renderer::getRenderInfo()")
         const RenderInfo& getRenderInfo();                  // Get info about the renderer
     private:
         int maxSceneLights = 4;                             // Maximum of scene lights

diff --git a/include/sre/SDLRenderer.hpp b/include/sre/SDLRenderer.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 
@@ -101,6 +101,8 @@ class DllExport SDLRenderer {
     SDL_Window *getSDLWindow();                                 // Get a pointer to SDL_Window
 
     static SDLRenderer* instance;                               // Singleton reference to the engine after initialization.
+
+    glm::vec3 getLastFrameStats();                              // Returns delta time for last frame wrt event, update and render
 private:
     void frame(float deltaTimeSec);
     Renderer* r;

diff --git a/include/sre/Shader.hpp b/include/sre/Shader.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 
@@ -35,6 +35,7 @@ namespace sre {
         Mat4,
         Vec3,
         Vec4,
+        IVec4,
         Texture,
         TextureCube,
         Invalid

diff --git a/include/sre/Sprite.hpp b/include/sre/Sprite.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/SpriteAtlas.hpp b/include/sre/SpriteAtlas.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/SpriteBatch.hpp b/include/sre/SpriteBatch.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/Texture.hpp b/include/sre/Texture.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/VR.hpp b/include/sre/VR.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-J�rgensen ( http://www.nobel-joergensen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/WorldLights.hpp b/include/sre/WorldLights.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/imgui_sre.hpp b/include/sre/imgui_sre.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/impl/CPPShim.hpp b/include/sre/impl/CPPShim.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/impl/Export.hpp b/include/sre/impl/Export.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/impl/GL.hpp b/include/sre/impl/GL.hpp
@@ -1,7 +1,7 @@
 /*
  *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */
 

diff --git a/include/sre/impl/GL.inl b/include/sre/impl/GL.inl
@@ -1,7 +1,7 @@
 /*
- *  SimpleRenderEngine
+ *  SimpleRenderEngine (https://github.com/mortennobel/SimpleRenderEngine)
  *
- *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergnesen.com/ )
+ *  Created by Morten Nobel-Jørgensen ( http://www.nobel-joergensen.com/ )
  *  License: MIT
  */