ff936133fc
Physics engine now using struct MomentOfInertia
...
Some API impact for the other modules.
* Desc. structs
* State struct
2014-01-23 19:13:02 +01:00
c3ed5e78ac
struct ::Oyster::Physics3D::MomentOfInertia
2014-01-23 18:45:33 +01:00
ee5392c60d
Vector::PiecewiseMultiplicationAdd
...
and a few other minor changes in the math lib
2014-01-23 18:34:48 +01:00
163481ce4f
Documentation edit
...
Were missing a final step about the ang. momentum toang. velocity
conversion documentation.
2014-01-23 18:33:48 +01:00
ff1fbdffa1
Vector::PiecewiseMultiplication
2014-01-23 17:13:50 +01:00
76e4b23f19
Added documentation
...
Mathematical exercise on how to convert angular momentum to angular
velocity
2014-01-23 14:54:53 +01:00
fb2cf714c6
GL - sending dir to server, forward and backward walking works
2014-01-23 14:28:53 +01:00
07e5519850
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 09:25:02 +01:00
8c297d1e9b
GL - starting to send lookdir to server
2014-01-23 09:24:55 +01:00
bd739f8acb
GL - Creation of objects kinda sorted
2014-01-23 09:14:04 +01:00
121fd51c45
GL collision with level should worm
2014-01-23 08:57:46 +01:00
3f144289ec
GL - merge with gameserver, crash on collision in gameLogic
2014-01-23 08:30:26 +01:00
a591903d8f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 08:25:10 +01:00
f657a58a4f
GL - adding a camera on the client
2014-01-23 08:24:35 +01:00
6a888cb154
GL - adjusting collisionManager
2014-01-22 15:47:44 +01:00
9c18ba14b9
Fixed kinetic calculation
2014-01-22 15:29:50 +01:00
22a5db97f8
Added final protocols, and a bit of support for them on server side
2014-01-22 15:22:52 +01:00
467cf1eb68
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-22 14:41:53 +01:00
ce80e8155c
GL - formatting mistake
2014-01-22 14:39:10 +01:00
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
bcbe67b620
Made default value of onCollisionResponse null
2014-01-22 14:09:53 +01:00
53961f0e88
Added new onCollisionResponse handle
2014-01-22 13:50:54 +01:00
80204ecbe3
GL - Massdriver usage of applyeffect
2014-01-22 13:02:13 +01:00
0cae6261e9
ApplyEffect is now easier to handle for the user
...
Only needs a function with a pointer to an ICustomBody now.
2014-01-22 12:36:12 +01:00
0443e753e8
GameLogic, Uml for levelLoader updated
2014-01-22 11:32:11 +01:00
c178ec34fd
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-22 10:51:24 +01:00
db593f65a2
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-22 10:51:13 +01:00
1b86500ab0
GameLogic - Uml for LevelLoader
2014-01-22 10:39:16 +01:00
954de26b43
GL - mergeproblems
2014-01-21 16:11:02 +01:00
0aae9de92b
blah
2014-01-21 16:10:07 +01:00
ebaa668382
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
2014-01-21 16:09:39 +01:00
6cf5ed3a22
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 14:58:08 +01:00
5c85580ffd
Added gravity normal to state struct
2014-01-21 14:56:34 +01:00
8792aab992
GL - merge with gameServer
2014-01-21 14:36:46 +01:00
50c09547f3
GameServer - Added protocols and stuff
2014-01-21 14:32:42 +01:00
561418c427
GL - gravity working
2014-01-21 14:28:27 +01:00
39e4f7881b
Added typedef for collision response
2014-01-21 14:24:45 +01:00
b0227ab513
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2014-01-21 14:11:17 +01:00
090d44b518
Added visit function to API
...
Called with collideable and hit action
2014-01-21 14:10:31 +01:00
65db1bf90d
lerp fix 3
2014-01-21 12:11:30 +01:00
0d39240fc2
lerp fix 2
2014-01-21 12:08:31 +01:00
b422d2d509
lerp fix
2014-01-21 12:01:12 +01:00
94f1c20817
Added more data to rigid body description.
...
Friction and restitution coeffs
2014-01-21 11:48:04 +01:00
ea647c185c
Merge branch 'LERP' into Physics
2014-01-21 11:23:32 +01:00
9a2d2b9490
Interpolation methods referred in ::Oyster::Math & Math3D
2014-01-21 11:23:03 +01:00
408d51e46b
SnapAxisYToNormal_UsingNlerp implemented
2014-01-21 11:15:33 +01:00
c7b3c1ec30
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 10:38:03 +01:00
06d468299a
GL - linking problem fix
2014-01-21 10:37:45 +01:00
43e5561995
Gravity fix 3
2014-01-21 10:34:22 +01:00
7087421bb9
InterpolateAxisYToAxis_Nlerp implemented
2014-01-21 10:32:44 +01:00
a1d98b9357
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 10:05:03 +01:00
44929f005d
Merge remote-tracking branch 'origin/GameServer' into GameLogic
2014-01-21 10:03:51 +01:00
76723cf2d8
Gravity fix 2
2014-01-21 09:58:33 +01:00
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
98563b6c33
Gravity fix
2014-01-21 09:27:52 +01:00
748023bf9e
Vector Nlerp fix
2014-01-21 08:57:18 +01:00
2ec8662a83
Utility::Value::Clamp
2014-01-20 18:46:08 +01:00
28fbcebf98
general lerp & vector nlerp
2014-01-20 18:45:34 +01:00
24a6e7478e
Merge remote-tracking branch 'origin/Physics' into Sprint3
2014-01-20 17:08:52 +01:00
0a41d20099
GameLogic - Merged with graphics
2014-01-20 16:36:25 +01:00
386b27e2f7
GameLogic - Merge with sprint2.5
2014-01-20 16:17:01 +01:00
7cdfa726ea
GameLogic - Merged with Sprint2.5, fixed physics errors
2014-01-20 16:09:58 +01:00
1a3c63cda9
GameLogic - fixed some minor merging errors
2014-01-20 16:02:26 +01:00
ab2a3a3892
GameLogic - fixed some minor merging errors
2014-01-20 16:01:54 +01:00
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
0107745c7e
Disable rotation
...
disabled at:
* RigidBody::Update_LeapFrog
* SimpleRigidBody::SetState
* SphericalRigidBody::SetState
2014-01-20 15:31:19 +01:00
82d1a03450
ICustomBody :: Custom Tag added
2014-01-20 13:44:12 +01:00
a1128986d5
Merge with Gamle Logic
2014-01-20 11:59:43 +01:00
0b8ecd740a
Added ICustombody event subscription
...
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.
External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-20 11:29:43 +01:00
a8c87273e2
Gravity normal fix
...
Forgot to update that value. Done
2014-01-20 11:29:42 +01:00
80c835be58
BoxVsBox pointOfContact fix
...
it was not translated
2014-01-20 11:29:42 +01:00
ff4a39cdac
Gravity implemented
2014-01-20 11:29:41 +01:00
337c92a5b8
Added Equal operators to Gravity struct
...
== & !=
2014-01-20 11:29:40 +01:00
0f3c92cd52
Obsolete code removed
...
More commentated out than deleted actually
2014-01-20 11:29:39 +01:00
acb344ca44
Added missing mass and inertia
2014-01-20 11:29:39 +01:00
2dfe312e04
AngularVelocity fix
2014-01-20 11:29:38 +01:00
a41d53b911
Revert "Inertia tensor fix"
...
This reverts commit 23dab9dea6
2014-01-20 11:29:37 +01:00
461d153036
Inertia tensor fix
...
should produce radian anglevelocities
2014-01-20 11:29:37 +01:00
34dc27655b
Tangiential formula fixes
2014-01-20 11:29:36 +01:00
f2c6cc5306
Revert "Work asssignment split line"
...
This reverts commit 8ecd263318
2014-01-20 11:29:35 +01:00
2314935f48
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-20 11:29:35 +01:00
ee5e5ff8ce
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-20 11:29:34 +01:00
727b2acb82
angular collision response fix
...
Incorrect formula found and corrected
2014-01-20 11:29:33 +01:00
502513d4f8
Work asssignment split line
2014-01-20 11:29:33 +01:00
7834264e5f
Physics proj .. show all files should be set to false
...
That is how we in Physics rolls
2014-01-20 11:29:32 +01:00
ce4c57bab3
GL - player inherits dynamicobject instead of object
2014-01-20 08:40:41 +01:00
b85439bd5e
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-18 18:01:23 +01:00
f660a5c64e
Added ICustombody event subscription
...
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.
External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-17 16:07:25 +01:00
7c448792dd
Gravity normal fix
...
Forgot to update that value. Done
2014-01-17 13:30:07 +01:00
893934dcf4
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/Tester/MainTest.cpp
2014-01-17 09:07:42 +01:00
ab0b9a925a
/Graphics Fixed stable pipeline with no warnings
2014-01-17 09:05:18 +01:00
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
eaf0ae1479
GL - can now compile
2014-01-17 08:52:34 +01:00
c48f640cdf
Loading .Dan geometry and material
2014-01-17 08:51:12 +01:00
7b2be02113
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-16 12:26:33 +01:00
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +01:00
d08e999f07
Create level and initiate it with a rigidbody etc
2014-01-16 12:08:24 +01:00
df7801336a
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:40:58 +01:00
225d8912da
GL - make rigidbody level
2014-01-16 11:40:29 +01:00
36a8372072
Merge branch 'Gravity' into Physics
2014-01-16 11:36:31 +01:00
Dander7BD
lindaandersson
Erik Persson
Robin Engman
Dennis Andersen
Sam Mario Svensson
lanariel
bladdidoo