Simple test shaders added to platformer

Author: technik

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

engine/prj/vs13/engine.vcxproj

@@ -112,6 +112,7 @@
     <ClInclude Include="..\..\src\video\graphics\driver\graphicsDriver.h" />
     <ClInclude Include="..\..\src\video\graphics\driver\openGL\openGLDriver.h" />
     <ClInclude Include="..\..\src\video\graphics\driver\openGL\windows\openGLDriverWindows.h" />
+    <ClInclude Include="..\..\src\video\graphics\renderer\rendererBackEnd.h" />
     <ClInclude Include="..\..\src\video\graphics\shader\openGL\openGLShader.h" />
     <ClInclude Include="..\..\src\video\graphics\shader\shader.h" />
     <ClInclude Include="..\..\src\video\window\window.h" />

engine/prj/vs13/engine.vcxproj.filters

@@ -58,6 +58,12 @@
     <Filter Include="src\video\graphics\shader\openGL">
       <UniqueIdentifier>{bdde83ec-408f-413c-9572-82c4221ba5a3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\video\graphics\renderer">
+      <UniqueIdentifier>{b4c5805b-d870-4c60-9a94-921f34517d33}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\video\graphics\renderer\backend">
+      <UniqueIdentifier>{da008397-3b92-4190-af72-799293d85199}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\engine.h">
@@ -120,6 +126,9 @@
     <ClInclude Include="..\..\src\video\graphics\shader\openGL\openGLShader.h">
       <Filter>src\video\graphics\shader\openGL</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\video\graphics\renderer\rendererBackEnd.h">
+      <Filter>src\video\graphics\renderer\backend</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\core\memory\stdAllocator.inl">

engine/src/engine.inl

@@ -30,6 +30,8 @@ namespace rev {
 		core::Platform::startUp(*this);
 		mMainWindow = create<video::Window>(math::Vec2u(100, 100), math::Vec2u(640, 480), "Rev window");
 		mGfxDriver = create<video::OpenGLDriver>(mMainWindow);
+		mGfxDriver->setZCompare(true);
+		mGfxDriver->setClearColor(video::Color(0.6f, 0.8f, 1.f));
 	}
 
 	//----------------------------------------------------------------------------------------------------------------------
@@ -45,8 +47,8 @@ namespace rev {
 		if(!core::OSHandler::get()->update())
 			return false;
 
-		mGfxDriver->setClearColor(video::Color(0.f, 1.f, 0.f));
 		mGfxDriver->clearColorBuffer();
+		mGfxDriver->clearZBuffer();
 
 		mGfxDriver->finishFrame();
 		return true;

engine/src/video/graphics/renderer/rendererBackEnd.h

@@ -0,0 +1,21 @@
+//----------------------------------------------------------------------------------------------------------------------
+// Revolution Engine
+// Created by Carmelo J. Fdez-Agüera Tortosa (a.k.a. Technik)
+// 2014/April/07
+//----------------------------------------------------------------------------------------------------------------------
+// Render system's back end, the layer right on top of the video driver
+#ifndef _REV_VIDEO_GRAPHICS_RENDERER_BACKEND_RENDERERBACKEND_H_
+#define _REV_VIDEO_GRAPHICS_RENDERER_BACKEND_RENDERERBACKEND_H_
+
+namespace rev {
+	namespace video {
+
+		class RendererBackEnd {
+		public:
+
+		};
+
+	}
+}
+
+#endif // _REV_VIDEO_GRAPHICS_RENDERER_BACKEND_BACKENDRENDERER_H_

projects/platformer/bin/test.pxl

@@ -0,0 +1,4 @@
+
+void main (void) {
+	gl_FragColor = vec4(1.0);
+}

projects/platformer/bin/test.vtx

@@ -0,0 +1,6 @@
+attribute vec3 vertex;
+
+void main ( void )
+{
+	gl_Position = vec4(vertex, 1.0);
+}