Commit Graph

79 Commits

Author SHA1 Message Date
Jace 4494e7592d How NOT to do normal maps 2014-05-10 16:01:36 +02:00
Jace 62ca923821 Defucked defucked rendering 2014-05-07 22:34:38 +02:00
Tleety b1b60bce61 WIP 2014-05-07 14:23:01 +00:00
Tleety 4389f2db4c Fixed being able to switch between Quad view and normal view. 2014-04-27 04:59:11 +02:00
Tleety a199e777bc Working Debug mode 2014-04-27 03:59:41 +02:00
Tleety 90e929131f Merge remote-tracking branch 'origin/master' into deffered_rendering
Conflicts:
	src/GameWorld.cpp
	src/Shaders/Fragment.glsl
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-27 02:51:04 +02:00
Tleety 87cac66cd8 Basic working deferred rendering 2014-04-27 02:44:04 +02:00
Tleety 9c329145c4 Deferred rendering base mostly complete. 2014-04-25 04:09:42 +02:00
Jace 7da030d8cd Bloody .orig files! 2014-04-25 00:23:49 +02:00
Jace 0567aab8c6 Merge branch 'havok' 2014-04-24 23:12:41 +02:00
Jace 0b7c383e8a Merge branch 'havok'
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-24 23:11:16 +02:00
ViktorLjung 8facd9dc9a Rigidbody physics fixed. 2014-04-24 23:10:59 +02:00
ViktorLjung 824b31ff6b FreeSteering fixed 2014-04-24 20:09:46 +02:00
ViktorLjung 613610d5b1 Fixed camera view matrix. 2014-04-24 19:49:14 +02:00
Jace 0fbce570ff Extended Model to support specular and normal maps 2014-04-24 02:36:31 +02:00
ViktorLjung 6ccb196b3b Jeep physics 2014-04-24 01:20:13 +02:00
ViktorLjung afbe58e4f3 Wheels now turning and spinning properly. 2014-04-24 00:11:49 +02:00
Tleety 6d75336496 Started on deferred rendering framework. 2014-04-24 00:11:16 +02:00
ViktorLjung c1cb4da684 Fixed quaternion relative rotations! 2014-04-24 00:03:22 +02:00
ViktorLjung e95d78aba6 Fixed quaternion relative rotations! 2014-04-24 00:02:06 +02:00
Jace 3412fa42f7 Jeep entity setup. 2014-04-23 23:25:41 +02:00
Jace de1290bf67 Added a few debug messages to ResourceManager.
No longer warns about hot-loading when a resource which causes a load chain is preloaded.
2014-04-23 17:58:11 +02:00
Jace 530b16e31b Extended OBJ loader to parse specular and normal maps 2014-04-23 17:56:04 +02:00
ViktorLjung eb6cc266a3 Vehicle component based, wheel rotation and position not working. 2014-04-22 19:14:35 +02:00
ViktorLjung f0b2f2a659 Barebones entity component commit events
Conflicts:
	src/GameWorld.cpp
2014-04-22 17:18:54 +02:00
ViktorLjung 4481c95681 VehicleSetup componentbased. 2014-04-22 17:14:29 +02:00
Jace 84d6911744 Barebones entity component commit events 2014-04-22 15:42:40 +02:00
Jace d2f3adb07e Vehicle keyboard steering!
Steering: Direction keys
Handbrake: Right control
2014-04-22 01:46:29 +02:00
Jace 4e5038a163 Fixed vehicle steering bug.
"The distance between the axles must be non zero"
Weird Havok coordinate system for specifying hardpoints was different to our coordinate system. Resulted in wheel axels without any separation!
2014-04-22 01:45:36 +02:00
Tleety f9a7425249 Added Comments in Renderer.cpp 2014-04-17 00:54:01 +02:00
ViktorLjung aa64b7074c Vehicle working, ready for entity-component implementation. 2014-04-17 00:47:53 +02:00
Tleety b1edefcf26 La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt. 2014-04-17 00:05:19 +02:00
ViktorLjung fe263784ae Visual studio crap stuff 2014-04-16 14:46:41 +02:00
ViktorLjung e8aa3bf890 Fixed timestep, forgot header declaration. 2014-04-16 14:40:42 +02:00
ViktorLjung 0338a06836 Fixed timestep. 2014-04-16 14:38:26 +02:00
ViktorLjung 069d079594 Car physics not working, yet! 2014-04-16 01:33:05 +02:00
Jace cf6e16222a Boost and Havok environment variables changed to be version specific 2014-04-16 01:17:37 +02:00
Jace 62abb3f964 Merge branch 'havok'
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-16 00:38:30 +02:00
ViktorLjung 1697627f69 Missing libs 2014-04-15 23:34:23 +02:00
Jace 062242ab8e Refactored existing systems to register their own components and resource types. 2014-04-13 17:15:46 +02:00
Jace e4e5068727 Resource manager refactoring 2014-04-13 03:42:12 +02:00
ViktorLjung 84484b3703 Box and Sphere Rigidbodies working 2014-04-13 02:20:50 +02:00
Jace 14feb3659b Initial work for pre-caching resources in render system 2014-04-13 01:25:21 +02:00
Jace 04cb1f1204 Created resource manager 2014-04-13 00:20:51 +02:00
ViktorLjung f6090679b7 Havok includes and libs working, ready for implementation. 2014-04-12 23:53:14 +02:00
ViktorLjung 41db395f61 Still trying to get it working. 2014-04-12 20:53:35 +02:00
Jace d13c19d654 Removed unused components 2014-04-12 18:36:06 +02:00
Jace 1bd914991a Revamped project layout 2014-04-12 18:31:03 +02:00
ViktorLjung 04fff4a27b Changed toolset to vs11, for future Havok implementation. 2014-04-12 01:59:55 +02:00
Jace 3470a80f40 Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
2014-04-12 01:48:15 +02:00