Commit Graph

81 Commits

Author SHA1 Message Date
dean11 972cfa0d39 Fixed bugs with custom loading 2013-11-27 21:12:37 +01:00
dean11 48c812b033 Forgot to follow coding standard... 2013-11-26 21:51:40 +01:00
dean11 e4904870b3 Added a threading wrapper with basic functionality that needs real testing 2013-11-26 21:08:34 +01:00
dean11 1f27336b3f Added filename paramater in custom load function 2013-11-26 12:09:38 +01:00
dean11 e5cef4895e Added support for custom loading, unloading and reloading 2013-11-26 10:55:51 +01:00
dean11 7b0265db1d Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch 2013-11-22 12:05:58 +01:00
lanariel 3cd4c12172 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 2013-11-22 10:56:21 +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
Dander7BD 480a624019 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 2013-11-22 10:24:08 +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 3ef36547a9 Merge branch 'RigidBody' of https://github.com/dean11/Danbias into Graphics 2013-11-21 15:21:03 +01:00
Dander7BD 8af3cde642 Merge remote-tracking branch 'origin/RigidBody' into Graphics 2013-11-21 15:20:19 +01:00
Dander7BD dc9f4597e2 Added OrientationMatrix build methods + other stuff 2013-11-21 15:19:32 +01:00
lanariel b419849fd4 Merged Obj and Engine Restructure 2013-11-21 14:17:03 +01:00
lanariel 9a0206bf35 More 2013-11-21 14:14:30 +01:00
lanariel 7b31377be8 Engine Sructured 2013-11-21 13:50:43 +01:00
Tobias Grundel f08e9491ed ObjReader 2013-11-21 13:45:11 +01:00
Tobias Grundel ddbc808977 Re-fixed ObjReader 2013-11-21 12:47:47 +01:00
Dander7BD 938826b84e Forgot to test compile RigidBody
Compile Errors is fixed
2013-11-21 11:47:20 +01:00
Dander7BD f51d2312dd RigidBody DONE
Needs only testing for confirmations
2013-11-21 11:39:11 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00
lanariel dc9c448150 Fix compile Errors 2013-11-21 09:43:53 +01:00
Dander7BD d90074d909 Minor changes
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
2013-11-20 17:40:12 +01:00
Dander7BD 8dee300dc8 Merge remote-tracking branch 'origin/Physics' into RigidBody 2013-11-20 17:01:12 +01:00
Dander7BD baec4b0392 Box updated
orientation Matrix have been split into a rotation Matrix and a
translation Vector
2013-11-20 16:59:12 +01:00
lanariel 16be725743 Project Include Model 2013-11-20 16:55:13 +01:00
lanariel adfec528bf Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
Robin Engman da6eda2a8c Commented non-functional features. 2013-11-20 13:48:54 +01:00
Dander7BD 687fb6835a TangentialImpulseAcceleration
fixed selfexplanatory documentation
2013-11-20 11:58:27 +01:00
Robin Engman 80301ae02e Robin's fix part of RigidBody.cpp DONE 2013-11-20 11:48:54 +01:00
Dander7BD 2149ca8ab5 Dans fix part of RigidBody.cpp DONE 2013-11-20 11:44:54 +01:00
Dander7BD e41d16cc03 Task assignment in RigidBody.cpp 2013-11-20 11:36:17 +01:00
Dander7BD b8d0a106b3 Physics branch disaster Patch
critical changes in Sprint1 branch caused major problems for the physics
patch. Files had to be backed up, Physics branch destroyed along with
it's log data. So that a new Physics branch could be made from the new
Sprint1. This patch is those copied files put back into the new physics
branch. .. logdata and 3hours lost (1h/person)
2013-11-20 11:09:27 +01:00
lanariel 3512121f52 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/OysterGraphics.vcxproj
	Debug/Tester.ilk
	Debug/Tester.pdb
	OysterGraphics/Core/ShaderManager.cpp
	OysterGraphics/OysterGraphics.vcxproj.filters
	Tester/Debug/CL.read.1.tlog
	Tester/Debug/CL.write.1.tlog
	Tester/Debug/cl.command.1.tlog
	Tester/Debug/link.command.1.tlog
	Tester/Debug/link.read.1.tlog
	Tester/Debug/link.write.1.tlog
	Tester/Tester.vcxproj
2013-11-20 10:35:00 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
Tobias Grundel 86aac0c72a Link error fixed and ObjReader 2013-11-19 13:30:46 +01:00
dean11 c9e6bbf899 Forgot to update git ignore x) 2013-11-18 15:44:46 +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
lanariel a628d8a488 Merge branch 'master' of https://github.com/dean11/Danbias into Graphics 2013-11-18 14:18:25 +01:00
Dander7BD 7275b52609 Preliminary Rigidbody
Absolutly not done, but it compiles
2013-11-18 14:06:27 +01:00
Dander7BD d4b4973d3f GameLogic Properties edited
Now they will be properly linked to Physics, and everything else Physics
depends on
2013-11-18 14:06:22 +01:00
Dander7BD 74aee284f9 PhysicsAPI created 2013-11-18 14:06:17 +01:00
lanariel ab70bed60b Shader main Rename 2013-11-15 11:05:19 +01:00
lanariel ed3ad9fef3 GraphicTestTri 2013-11-15 08:41:11 +01:00
Dander7BD 19522d8ff6 References in solution adjusted
All references to ::Utility::Memory changed to ::Utility::DynamicMemory
2013-11-13 14:50:08 +01:00
Dander7BD 893e6427a5 UniquePointer and UniqeArray ready to use
All compile errors fixed.
Tested against Visual Leak detector. No leak detected!
2013-11-13 14:48:24 +01:00
Dander7BD fa43650439 Forgot to #include the inline implementation file For Utilities 2013-11-13 13:56:25 +01:00
Dander7BD ac1fb8bab9 UniquePointer and UniqueArray
UniquePointer - removed hazardous members.
UniqueArray - added
All Documented
2013-11-13 12:07:21 +01:00