Commit Graph

41 Commits

Author SHA1 Message Date
lanariel adb273bd5b Fixed las bug in 2d rendering 2014-02-10 09:35:03 +01:00
lanariel e6e56ba21b Done with 2D 2014-02-10 01:03:10 +01:00
lanariel 1121bbdebf TODO::
Fix Pixel Data to Post Pass
2014-02-07 16:51:35 +01:00
lanariel 1de325c5a6 Fixed cleaning up Deffered.cpp 2014-02-07 15:52:07 +01:00
lanariel 898fc883e9 Merge branch 'Graphics2D' into Graphics 2014-02-07 13:48:46 +01:00
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +01:00
lanariel 9a0f363146 framerate double 2014-02-07 13:15:38 +01:00
lanariel bab3ab0a78 Shader Restructure 2014-02-07 11:09:59 +01:00
lanariel a7480ebf70 Proper Animation 2014-02-07 08:34:01 +01:00
lanariel bfa54b9ccd Fixed Anim 2014-02-05 17:13:23 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +01:00
Robin Engman 98644e3fa0 Minimised to potential skinning problem 2014-02-04 17:59:04 +01:00
lanariel 97a3792bff Anim Test Not working Joints 2014-02-04 14:59:51 +01:00
lanariel 34f58d4140 Anim Testing 2014-02-03 12:09:11 +01:00
lanariel 069acee8cc Anim Error 2014-01-31 16:29:50 +01:00
lanariel 99a605a25b Iterpolated Animations 2014-01-28 13:48:15 +01:00
lanariel 15625ac5d2 Basic Animation (NOT STABLE) 2014-01-27 14:24:13 +01:00
lanariel 6b1dd34a72 Working SSAO + Read Animated .dan 2014-01-22 16:31:33 +01:00
Dennis Andersen 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
bladdidoo 61b8baed1b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
	Code/Tester/MainTest.cpp
2014-01-17 08:58:49 +01:00
bladdidoo c48f640cdf Loading .Dan geometry and material 2014-01-17 08:51:12 +01:00
lanariel 483236801f Fixed compile warnings and crash on non existing models 2014-01-16 09:30:01 +01:00
lindaandersson 32e64c0dbb GL - moved reciever struct to a separate file 2014-01-14 10:25:49 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
lanariel 341e33ee78 Rebased Lights to Use World Coordinates 2013-12-18 20:36:41 +01:00
lanariel 718b1ade2b Proper Lighting, supports Multiple Lights 2013-12-18 20:28:06 +01:00
lanariel fb51881fab Fixed Mem leaks on gpu and start on deffered pipeline 2013-12-05 14:56:34 +01:00
lanariel 07a616b252 Correct VertexShader 2013-11-29 10:44:04 +01:00
lanariel 469ccaab6c Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Bin/DLL/DebugCameraVertex.cso
	Bin/DLL/DebugPixel.cso
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Bin/DLL/OysterGraphics_x86D.dll
	Bin/DLL/OysterGraphics_x86D.exp
	Bin/DLL/OysterGraphics_x86D.ilk
	Bin/DLL/OysterGraphics_x86D.pdb
	Bin/DLL/TextureDebug.cso
	Bin/DLL/VertexGatherData.cso
	Code/OysterGraphics/FileLoader/ObjReader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.h
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/Render/Resources/Resources.cpp
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl
	Code/Tester/MainTest.cpp
2013-11-29 10:31:19 +01:00
lanariel 9bf84cdc65 Stable Graphics, hard coded texture read in ObjReader.ToModel 2013-11-28 14:34:52 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +01:00
lanariel 2de2ef9cd0 Pre merge Commit 2013-11-26 13:44:58 +01:00
lanariel 973aadac2d Engine tweaks + DefferedVertexDefinition 2013-11-26 09:09:35 +01:00
lanariel 59dcbc9729 Fixed Projection 2013-11-22 10:55:21 +01:00
lanariel 5abaef6e86 Fixed render errors 2013-11-21 23:54:12 +01:00
lanariel ff1695497f Debug From Home 2013-11-21 18:31:16 +01:00
lanariel 7b31377be8 Engine Sructured 2013-11-21 13:50:43 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00
lanariel adfec528bf Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00