Commit Graph

56 Commits

Author SHA1 Message Date
lanariel f0df377bcd Basic 2d Render + Anim Updates 2014-02-11 13:29:19 +01:00
lanariel e0f3031187 Pointlight no pointer Model render pointer 2014-02-10 16:08:03 +01:00
lanariel b80f594440 Changed Animated model 2014-02-10 15:11:33 +01:00
lanariel a3ba67e3c2 Fixed release compile and basic anim 2014-02-10 13:59:45 +01:00
lanariel d0f36302cf Fixed 2d render comment
Started on Anim API
2014-02-10 11:53:44 +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
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +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 aafbfa01f3 Calculate Graphics Memory Usage 2014-02-05 16:54:57 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +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 9cf82dd3b1 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/DanBias.sln
	Code/OysterGraphics/Model/Model.h
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
	Code/Tester/Tester.vcxproj
2014-01-27 15:38:09 +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 f7f59e8ac8 GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client 2014-01-21 09:52:48 +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 eb6ed13cce Merge remote-tracking branch 'origin/Graphics' into GameLogic 2014-01-14 09:25:16 +01:00
lanariel 0a3d68a407 Small bug fix and include new SSAO shader 2014-01-09 01:08:49 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +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 47aa2c89a2 Quick Error fix and using .png 2013-12-04 09:56:03 +01:00
lanariel f29af8b8bd Release Now Stable 2013-12-04 09:36:43 +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 ca20a5af9e Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +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
Erik Persson 61777e23df Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
Conflicts:
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
2013-11-27 09:12:21 +01:00
lanariel 4b6cdab17b Stable Rendering 2013-11-27 08:22:20 +01:00
lanariel f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +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 205c58430f Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics 2013-11-22 14:14:54 +01:00
lanariel 328e4777ce Started to wrap into dll 2013-11-22 14:09:47 +01:00
dean11 7b0265db1d Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch 2013-11-22 12:05:58 +01:00
lanariel 59dcbc9729 Fixed Projection 2013-11-22 10:55:21 +01:00
dean11 15455db1b2 Added a resource handler with basic byte loading 2013-11-22 10:46:25 +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