Commit Graph

37 Commits

Author SHA1 Message Date
Erik Persson c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic
Conflicts:
	Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +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 080bbf68fd Collideables fixed
Missing returns
2013-12-04 11:42:11 +01:00
Linda Andersson e658071643 GL- open a red window from lancher project 2013-12-04 11:32:43 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00
Dander7BD 89fd71fb02 SimpleRigidBody factory done
not tested though
2013-11-28 12:08:41 +01:00
Dander7BD 3a6cb98b08 SimpleRigidBody factory done
not tested though
2013-11-28 11:58:46 +01:00
Dander7BD 36741de19b Evil Incompotent Compiler fix
Sometimes the compiler decides to not compile constructors properly. :(
Edited all constructors in Collision3D to reduce chance of this.
2013-11-27 15:20:29 +01:00
Dander7BD a869771ffa Simple Rigid Body implementation
Second Iteration
[iteration 1]: stubs
[iteration 2]: implementations with shortcuts
[iteration final]: implementations with real solutions
2013-11-25 16:35:56 +01:00
Dander7BD 311beaac14 ICollideable edited
For some reason the Intersects() and Contains() methods were taking a
pointer as parameter then I am certain that I wrote it as a &-reference.
If someone edited this, there is no GIT history logged about it.

Please, DO NOT CHANGE this again, thanks
2013-11-25 14:22:38 +01:00
Robin Engman 6494bcb09e Added more inertia functions. 2013-11-22 08:58:00 +01:00
Dander7BD 91af42c0bd Merge conflict fixed 2013-11-21 17:27:28 +01:00
Dander7BD eba7995374 Merge remote-tracking branch 'origin/RigidBody' into Physics 2013-11-21 17:25:19 +01:00
Dander7BD 9749749748 IRigidBody done
Renamed to ICustomBody
* Added bunch of other stuff
2013-11-21 17:22:13 +01:00
Dander7BD af2b01d975 Fixed commit errors + other stuff 2013-11-21 15:29:35 +01:00
Dander7BD dc9f4597e2 Added OrientationMatrix build methods + other stuff 2013-11-21 15:19:32 +01:00
Dander7BD c6064887b7 Forgot to test compile RigidBody
Compile Errors is fixed
2013-11-21 13:15:10 +01:00
Dander7BD 4362b88a74 RigidBody DONE
Needs only testing for confirmations
2013-11-21 13:15:09 +01:00
Dander7BD 5aa8e07b0d Minor changes
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
2013-11-21 13:15:09 +01:00
Dander7BD 5cd36f1995 TangentialImpulseAcceleration
fixed selfexplanatory documentation
2013-11-21 13:15:08 +01:00
Robin Engman fbeeb5f72c Robin's fix part of RigidBody.cpp DONE 2013-11-21 13:15:07 +01:00
Dander7BD caa61d3ae9 Dans fix part of RigidBody.cpp DONE 2013-11-21 13:15:07 +01:00
Dander7BD 1b2c49457c Task assignment in RigidBody.cpp 2013-11-21 13:15:06 +01:00
Robin Engman 3f518c72e8 Added inertia functions. 2013-11-21 11:47:34 +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
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
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
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00