Commit Graph

325 Commits

Author SHA1 Message Date
Dander7BD 632570f66b Updated the BoxVsBox collision alghorithm
and added overloaded
2013-12-20 12:01:06 +01:00
Dander7BD a03568e19e Updated formula for BoxVsBox point of contact
good enough approximation. Tested
2013-12-20 12:01:05 +01:00
Dander7BD ec6cd72f3c SeperatingAxisTest_AxisAlignedVsTransformedBox overloaded 2013-12-20 12:01:05 +01:00
Dander7BD 4858f573e6 Added more collision subs 2013-12-20 12:01:04 +01:00
Robin Engman d8b323e230 Extractable collision point for SphereVSSphere 2013-12-20 12:01:03 +01:00
Dander7BD a3ced24fea Some compile error fixes 2013-12-20 12:01:02 +01:00
Robin Engman 61e1d20748 Fixed const problem 2013-12-20 12:01:02 +01:00
Robin Engman 5f305b7086 Oops 2013-12-20 11:59:38 +01:00
Robin Engman 283633c6c6 Added stub functions
More funcitonallity for intersect functions.
2013-12-20 11:59:37 +01:00
Dander7BD de0078265c Stub response to new ICollideAble method
Stubbed: Box, BoxAxisAligned, Frustrum
Fully implemented: Line & Universe
2013-12-20 11:59:36 +01:00
Dander7BD da996a5deb Added cirtual function to ICollideAble
Overload of Intersects(...)
2013-12-20 11:59:35 +01:00
Dander7BD c854b1af58 Stuff 2013-12-20 11:59:35 +01:00
Robin Engman c740bd5935 Added some data to PhysicsAPI
GetRigidLinearVelocity() and void* as reference to game object.
2013-12-12 10:02:35 +01:00
Dander7BD 5835a72acc Setstruct introduction done
Can be found as:
Physics::Struct::CustomBodyState
Physics::ICustomBody::State
Is all inline thus no expensive API calls, as intended.
Will be expanded to move API call methods from Physics::ICustomBody to
it.
2013-12-06 09:46:30 +01:00
Dander7BD d0936f9133 InverseRotationMatrix fixed
Compiler overstepping its bound, doing whatever it wants.
2013-12-04 14:22:25 +01:00
Dander7BD 7ad60969fc Sphere Vs Box collision detect fix
second ed. ... Works now! :3
2013-12-04 14:12:06 +01:00
Dander7BD e0adc0ae93 Sphere Vs Box collision detect fix 2013-12-04 13:52:07 +01:00
Dander7BD 202ee23b25 Octtree::leafData Container should be kept updated now 2013-12-04 11:49:33 +01:00
Dander7BD 080bbf68fd Collideables fixed
Missing returns
2013-12-04 11:42:11 +01:00
Dander7BD 1d94ed0ddc Fixed MomentOfInertia methods 2013-12-04 11:30:56 +01:00
Dander7BD f10f3b0bef Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-04 10:05:02 +01:00
Dander7BD 87e9d137ea Merge remote-tracking branch 'origin/Graphics' into Physics 2013-12-04 09:58:11 +01:00
lanariel 47aa2c89a2 Quick Error fix and using .png 2013-12-04 09:56:03 +01:00
Robin Engman f2548c43ce Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-04 09:52:03 +01:00
Robin Engman b03e9af027 Fixed octree and API
Rewrote AddObject function in octree and OnPossibleCollision in
PhysocsAPI_Impl
2013-12-04 09:51:48 +01:00
lanariel ce294cd1d7 Forgot to add a folder 2013-12-04 09:43:43 +01:00
lanariel d03f1eaf44 Merge to sprint2 2013-12-04 09:42:52 +01:00
lanariel f29af8b8bd Release Now Stable 2013-12-04 09:36:43 +01:00
Dander7BD e4476f7757 Added function for ICustomBody
void ICustomBody::SetMomentum( const ::Oyster::Math::Float3 &worldG )
- Added and implemented
2013-12-03 15:11:24 +01:00
Robin Engman 0a0e327d71 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-03 11:31:24 +01:00
dean11 10c786b745 Update .gitignore 2013-11-29 21:23:05 +01:00
dean11 afd7652b6e Update .gitignore 2013-11-29 20:58:53 +01:00
dean11 c0807442a4 Fixed some minor errors with project linking 2013-11-29 11:04:52 +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 ca20a5af9e Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
Linda Andersson 2ca3cdd705 merge with sprint branch - working 2013-11-29 10:13:18 +01:00
Linda Andersson 4cb82e6396 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 10:04:59 +01:00
Linda Andersson 7a663b2e16 GL - camera movement working 2013-11-29 10:04:44 +01:00
Erik Persson f31bf1db5f some fixing 2013-11-29 10:03:32 +01:00
Dander7BD 026b427deb Implemented a temporary collision test update
Will only call the subscribed CollisioEventAction whenevera collision is
detected.
2013-11-29 10:00:07 +01:00
Robin Engman 1a06c7c7e6 Changed from pointer to reference
Did it in sample and visit functions
2013-11-29 10:00:06 +01:00
Robin Engman c31ea9730b Added overloads for visitor and sample functions
They now have an overload for accepting ICollideable
2013-11-29 10:00:05 +01:00
Dander7BD 5d5f684ad6 minor compilation error fix
Forgot that UniquePointer had a special operator for checking if it is
not NULL >.<
2013-11-29 10:00:04 +01:00
Dander7BD ec7185f463 Bunch of implementations 2013-11-29 10:00:03 +01:00
Pontus Fransson 10f8df45a8 Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Network 2013-11-29 09:36:31 +01:00
Erik Persson f9a1aaf43c Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:26:16 +01:00
Erik Persson b28a558732 fix transpose 2013-11-29 09:24:41 +01:00
Linda Andersson 04e48ec550 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:23:42 +01:00
dean11 de01d23d1d Fixed some structure issues and commented 2013-11-29 09:23:08 +01:00