Version 0.4.0.5: mat4 array uniforms, torus geometry, marching cubes …

…fix, colored gui text, fixes --HG-- branch : stable
iondune · Apr 30, 2016 · 191b673 · 191b673
2 parents 8449d04 + a209ca3
commit 191b673
Show file tree

Hide file tree

Showing 40 changed files with 492 additions and 319 deletions.
diff --git a/Demo03-GUI/DemoGUI.cpp b/Demo03-GUI/DemoGUI.cpp
@@ -34,7 +34,15 @@ int main()
 			ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiSetCond_FirstUseEver);
 			ImGui::ShowTestWindow();
 		}
-		GUIManager->Text(vec2i(Window->GetCursorLocation()) + 100, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 100), Colors::White, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 120), Colors::Red, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 140), Colors::Orange, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 160), Colors::Yellow, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 180), Colors::Green, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 200), Colors::Cyan, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 220), Colors::Blue, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 240), Colors::Magenta, "Hello, world!");
+		GUIManager->Text(vec2i(Window->GetCursorLocation()) + vec2i(100, 260), Colors::Black, "Hello, world!");
 		GUIManager->Draw();
 
 		Window->SwapBuffers();

diff --git a/Demo05-Application/DemoApplication.cpp b/Demo05-Application/DemoApplication.cpp
@@ -32,7 +32,7 @@ int main()
 
 	CWindow * Window = WindowManager->CreateWindow(vec2i(1600, 900), "DemoApplication", EWindowType::Windowed);
 
-	AssetManager->SetAssetPath("Assets/");
+	AssetManager->AddAssetPath("Assets/");
 	AssetManager->SetShaderPath("Shaders/");
 	AssetManager->SetTexturePath("Images/");
 

diff --git a/Properties/Include/Build.props b/Properties/Include/Build.props
@@ -25,7 +25,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>GLM_FORCE_RADIANS;NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GLM_FORCE_RADIANS;NOMINMAX;_CRT_SECURE_NO_WARNINGS;ION_PROJECT_BASE_DIRECTORY= "$(ProjectDir.Replace('\', '/'))";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/ionApplication/CAssetManager.cpp b/ionApplication/CAssetManager.cpp
@@ -16,45 +16,67 @@ namespace ion
 			return nullptr;
 		}
 
-		SharedPointer<Graphics::IVertexShader> VertexShader = GraphicsAPI->CreateVertexShaderFromFile(AssetPath + ShaderPath + Name + ".vert");
-		SharedPointer<Graphics::IPixelShader> PixelShader = GraphicsAPI->CreatePixelShaderFromFile(AssetPath + ShaderPath + Name + ".frag");
-
-		if (! VertexShader)
-		{
-			Log::Error("Failed to compile vertex shader '%s'", Name);
-			return nullptr;
-		}
-
-		if (! PixelShader)
+		for (string AssetPath : AssetPaths)
 		{
-			Log::Error("Failed to compile pixel shader '%s'", Name);
-			return nullptr;
+			if (! File::Exists(AssetPath + ShaderPath + Name + ".vert"))
+			{
+				continue;
+			}
+
+			SharedPointer<Graphics::IVertexShader> VertexShader = GraphicsAPI->CreateVertexShaderFromFile(AssetPath + ShaderPath + Name + ".vert");
+			SharedPointer<Graphics::IPixelShader> PixelShader = GraphicsAPI->CreatePixelShaderFromFile(AssetPath + ShaderPath + Name + ".frag");
+
+			if (! VertexShader)
+			{
+				Log::Error("Failed to compile vertex shader '%s'", Name);
+				return nullptr;
+			}
+
+			if (! PixelShader)
+			{
+				Log::Error("Failed to compile pixel shader '%s'", Name);
+				return nullptr;
+			}
+
+			SharedPointer<Graphics::IShaderProgram> ShaderProgram = GraphicsAPI->CreateShaderProgram();
+			ShaderProgram->SetVertexStage(VertexShader);
+			ShaderProgram->SetPixelStage(PixelShader);
+
+			return ShaderProgram;
 		}
 
-		SharedPointer<Graphics::IShaderProgram> ShaderProgram = GraphicsAPI->CreateShaderProgram();
-		ShaderProgram->SetVertexStage(VertexShader);
-		ShaderProgram->SetPixelStage(PixelShader);
-
-		return ShaderProgram;
+		Log::Error("Cannot find shader file in any asset directory: '%s'", Name);
+		return nullptr;
 	}
 
-	SharedPointer<Graphics::ITexture2D> CAssetManager::LoadTexture(string const & FileName)
+	SharedPointer<Graphics::ITexture2D> CAssetManager::LoadTexture(string const & FileName, Graphics::ITexture::EMipMaps const MipMaps)
 	{
 		if (! GraphicsAPI)
 		{
 			Log::Error("CAssetManager being used without being initialized, Texture '%s' will not be loaded.", FileName);
 			return nullptr;
 		}
 
-		CImage * Image = CImage::Load(AssetPath + TexturePath + FileName);
-		if (Image)
+		for (string AssetPath : AssetPaths)
 		{
-			return GraphicsAPI->CreateTexture2D(Image);
-		}
-		else
-		{
-			return nullptr;
+			if (! File::Exists(AssetPath + TexturePath + FileName))
+			{
+				continue;
+			}
+
+			CImage * Image = CImage::Load(AssetPath + TexturePath + FileName);
+			if (Image)
+			{
+				return GraphicsAPI->CreateTexture2D(Image, MipMaps);
+			}
+			else
+			{
+				return nullptr;
+			}
 		}
+
+		Log::Error("Cannot find image file in any asset directory: '%s'", FileName);
+		return nullptr;
 	}
 
 	Scene::CSimpleMesh * CAssetManager::LoadMesh(string const & FileName)
@@ -65,24 +87,35 @@ namespace ion
 			return nullptr;
 		}
 
-		vector<Scene::CSimpleMesh *> Shapes = Scene::CGeometryCreator::LoadOBJFile(AssetPath + MeshPath + FileName, AssetPath + MeshPath);
-
-		if (Shapes.size() == 0)
-		{
-			Log::Error("Failed to load mesh: %s", FileName);
-			return nullptr;
-		}
-		else if (Shapes.size() > 1)
+		for (string AssetPath : AssetPaths)
 		{
-			Log::Error("Mesh contains %d shapes but only one was expected: %s", Shapes.size(), FileName);
+			if (! File::Exists(AssetPath + MeshPath + FileName))
+			{
+				continue;
+			}
+
+			vector<Scene::CSimpleMesh *> Shapes = Scene::CGeometryCreator::LoadOBJFile(AssetPath + MeshPath + FileName, AssetPath + MeshPath);
+
+			if (Shapes.size() == 0)
+			{
+				Log::Error("Failed to load mesh: %s", FileName);
+				return nullptr;
+			}
+			else if (Shapes.size() > 1)
+			{
+				Log::Error("Mesh contains %d shapes but only one was expected: %s", Shapes.size(), FileName);
+			}
+
+			return Shapes[0];
 		}
 
-		return Shapes[0];
+		Log::Error("Cannot find mesh file in any asset directory: '%s'", FileName);
+		return nullptr;
 	}
 
-	void CAssetManager::SetAssetPath(string const & Path)
+	void CAssetManager::AddAssetPath(string const & Path)
 	{
-		AssetPath = Path + "/";
+		AssetPaths.push_back(Path + "/");
 	}
 
 	void CAssetManager::SetTexturePath(string const & Path)

diff --git a/ionApplication/CAssetManager.h b/ionApplication/CAssetManager.h
@@ -19,10 +19,10 @@ namespace ion
 		void Init(CGraphicsAPI * GraphicsAPI);
 
 		SharedPointer<Graphics::IShaderProgram> LoadShader(string const & Name);
-		SharedPointer<Graphics::ITexture2D> LoadTexture(string const & FileName);
+		SharedPointer<Graphics::ITexture2D> LoadTexture(string const & FileName, Graphics::ITexture::EMipMaps const MipMaps = Graphics::ITexture::EMipMaps::True);
 		Scene::CSimpleMesh * LoadMesh(string const & FileName);
 
-		void SetAssetPath(string const & Path);
+		void AddAssetPath(string const & Path);
 		void SetTexturePath(string const & Path);
 		void SetShaderPath(string const & Path);
 		void SetMeshPath(string const & Path);
@@ -31,10 +31,10 @@ namespace ion
 
 		SingletonPointer<CGraphicsAPI> GraphicsAPI;
 
-		string AssetPath;
-		string TexturePath;
-		string ShaderPath;
-		string MeshPath;
+		vector<string> AssetPaths;
+		string TexturePath = "Textures/";
+		string ShaderPath = "Shaders/";
+		string MeshPath = "Meshes/";
 
 	private:
 

diff --git a/ionGUI/CGUIManager.cpp b/ionGUI/CGUIManager.cpp
@@ -121,7 +121,7 @@ namespace ion
 			switch (MouseEvent.Type)
 			{
 			case SMouseEvent::EType::Click:
-				if (ImGui::IsMouseHoveringAnyWindow())
+				if (IO.WantCaptureMouse)
 				{
 					Event.Block();
 				}
@@ -387,7 +387,10 @@ void CGUIManager::Draw()
 
 		for (auto Text : TextQueue)
 		{
-			DrawList->AddText(ImVec2((float) Text.Position.X, (float) Text.Position.Y), 0xFFFFFFFF, Text.Text.c_str());
+			uint Red = Text.Color.Red;
+			uint Green = Text.Color.Green;
+			uint Blue = Text.Color.Blue;
+			DrawList->AddText(ImVec2((float) Text.Position.X, (float) Text.Position.Y), (0xFF000000) | (Blue << 16) | (Green << 8) | (Red), Text.Text.c_str());
 		}
 		TextQueue.clear();
 
@@ -396,11 +399,12 @@ void CGUIManager::Draw()
 	ImGui::Render();
 }
 
-void CGUIManager::TextUnformatted(vec2i const & Position, string const & Text)
+void CGUIManager::TextUnformatted(vec2i const & Position, color3i const & Color, string const & Text)
 {
 	SDrawText Draw;
 	Draw.Text = Text;
 	Draw.Position = Position;
+	Draw.Color = Color;
 
 	TextQueue.push_back(Draw);
 }

diff --git a/ionGUI/CGUIManager.h b/ionGUI/CGUIManager.h
@@ -21,12 +21,12 @@ namespace ion
 	void Draw();
 
 	template <typename... Args>
-	void Text(vec2i const & Position, char const * const Format, Args const &... args)
+	void Text(vec2i const & Position, color3i const & Color, char const * const Format, Args const &... args)
 	{
-		TextUnformatted(Position, tfm::format(Format, args...));
+		TextUnformatted(Position, Color, tfm::format(Format, args...));
 	}
 
-	void TextUnformatted(vec2i const & Position, string const & Text);
+	void TextUnformatted(vec2i const & Position, color3i const & Color, string const & Text);
 
 		void OnEvent(IEvent & Event);
 		void AddFontFromFile(string const & FileName, float const Size);
@@ -54,6 +54,7 @@ namespace ion
 	struct SDrawText
 	{
 		vec2i Position;
+		color3i Color;
 		string Text;
 	};
 

diff --git a/ionGraphics/CGraphicsAPI.cpp b/ionGraphics/CGraphicsAPI.cpp
@@ -184,7 +184,7 @@ namespace ion
 		return Texture;
 	}
 
-	SharedPointer<Graphics::ITexture2D> CGraphicsAPI::CreateTexture2D(CImage * Image)
+	SharedPointer<Graphics::ITexture2D> CGraphicsAPI::CreateTexture2D(CImage * Image, Graphics::ITexture::EMipMaps MipMaps)
 	{
 		if (! Image)
 		{
@@ -207,7 +207,7 @@ namespace ion
 		}
 		SharedPointer<Graphics::ITexture2D> Texture = CreateTexture2D(
 			Image->GetSize(),
-			Graphics::ITexture::EMipMaps::True,
+			MipMaps,
 			Format,
 			Graphics::ITexture::EInternalFormatType::Fix8);
 		Texture->Upload(

diff --git a/ionGraphics/CGraphicsAPI.h b/ionGraphics/CGraphicsAPI.h
@@ -66,7 +66,7 @@ namespace ion
 		SharedPointer<Graphics::IDepthBuffer> CreateDepthBuffer(vec2u const & Size);
 
 		SharedPointer<Graphics::ITexture2D> CreateTexture2D(vec2u const & Size, Graphics::ITexture::EMipMaps const MipMaps, Graphics::ITexture::EFormatComponents const Components, Graphics::ITexture::EInternalFormatType const Type);
-		SharedPointer<Graphics::ITexture2D> CreateTexture2D(CImage * Image);
+		SharedPointer<Graphics::ITexture2D> CreateTexture2D(CImage * Image, Graphics::ITexture::EMipMaps const MipMaps = Graphics::ITexture::EMipMaps::True);
 		SharedPointer<Graphics::ITexture3D> CreateTexture3D(vec3u const & Size, Graphics::ITexture::EMipMaps const MipMaps, Graphics::ITexture::EFormatComponents const Components, Graphics::ITexture::EInternalFormatType const Type);
 
 		SharedPointer<Graphics::IGraphicsContext> GetWindowContext(CWindow * Window);

diff --git a/ionGraphics/IRenderTarget.h b/ionGraphics/IRenderTarget.h
@@ -3,6 +3,7 @@
 
 #include <ionCore.h>
 #include <ionMath.h>
+#include <ionFramework.h>
 
 #include "ITexture.h"
 
@@ -21,7 +22,11 @@ namespace ion
 			virtual void ClearDepth() = 0;
 			virtual void ClearColorAndDepth() = 0;
 
-			virtual void SetClearColor(color3f const & Color) = 0;
+			virtual void SetClearColor(color4f const & Color) = 0;
+
+			virtual void Bind() = 0;
+
+			virtual CImage * ReadImage() = 0;
 
 			virtual ~IRenderTarget()
 			{}
@@ -47,6 +52,8 @@ namespace ion
 			virtual void AttachDepthTexture(SharedPointer<ITexture2D> Texture) = 0;
 			virtual void AttachDepthBuffer(SharedPointer<IDepthBuffer> DepthBuffer) = 0;
 
+			virtual bool CheckCorrectness() = 0;
+
 			virtual ~IFrameBuffer()
 			{}
 

diff --git a/ionGraphics/ITexture.h b/ionGraphics/ITexture.h
@@ -42,7 +42,9 @@ namespace ion
 			enum class EInternalFormatType
 			{
 				Fix8 = 0,
-				Float32 = 1,
+				Float16 = 1,
+				Float32 = 2,
+				Depth = 3,
 			};
 
 			enum class EMipMaps