NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

post merge + minor edits 

derepetifified code in struct Gravity
and some cosmetic consistency edits.
This commit is contained in:
Dander7BD 2014-01-09 11:36:55 +01:00
parent c39e2fe791
commit 938447879f
3 changed files with 244 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Code/GamePhysics/GamePhysics.vcxproj.user
View File

@ -1,6 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

23
Code/GamePhysics/PhysicsStructs-Impl.h
View File

@ -12,7 +12,7 @@ namespace Oyster
inline SimpleBodyDescription::SimpleBodyDescription()
{
this->rotation = ::Oyster::Math::Float4x4::identity;
this->centerPosition = ::Oyster::Math::Float4::null;
this->centerPosition = ::Oyster::Math::Float4::standard_unit_w;
this->size = ::Oyster::Math::Float4( 1.0f );
this->mass = 12.0f;
this->inertiaTensor = ::Oyster::Math::Float4x4::identity;
@ -23,7 +23,7 @@ namespace Oyster
inline SphericalBodyDescription::SphericalBodyDescription()
{
this->rotation = ::Oyster::Math::Float4x4::identity;
this->centerPosition = ::Oyster::Math::Float4::null;
this->centerPosition = ::Oyster::Math::Float4::standard_unit_w;
this->radius = 0.5f;
this->mass = 10.0f;
this->subscription = NULL;
@ -385,6 +385,7 @@ namespace Oyster
this->mass = gravityDirectedField.mass;
this->magnitude = gravityDirectedField.magnitude;
}
inline GravityDirectedField& GravityDirectedField::operator = ( const GravityDirectedField &gravityDirectedField )
{
this->normalizedDirection = gravityDirectedField.normalizedDirection;
@ -404,16 +405,13 @@ namespace Oyster
switch( gravity.gravityType )
{
case GravityType_Well:
this->well.position = gravity.well.position;
this->well.mass = gravity.well.mass;
this->well = gravity.well;
break;
case GravityType_Directed:
this->directed.impulse = gravity.directed.impulse;
this->directed = gravity.directed;
break;
case GravityType_DirectedField:
this->directedField.normalizedDirection = gravity.directedField.normalizedDirection;
this->directedField.magnitude = gravity.directedField.magnitude;
this->directedField.mass = gravity.directedField.mass;
this->directedField = gravity.directedField;
break;
}
}
@ -423,16 +421,13 @@ namespace Oyster
switch( gravity.gravityType )
{
case GravityType_Well:
this->well.position = gravity.well.position;
this->well.mass = gravity.well.mass;
this->well = gravity.well;
break;
case GravityType_Directed:
this->directed.impulse = gravity.directed.impulse;
this->directed = gravity.directed;
break;
case GravityType_DirectedField:
this->directedField.normalizedDirection = gravity.directedField.normalizedDirection;
this->directedField.magnitude = gravity.directedField.magnitude;
this->directedField.mass = gravity.directedField.mass;
this->directedField = gravity.directedField;
break;
}

1
Code/GamePhysics/PhysicsStructs.h
View File

@ -177,7 +177,6 @@ namespace Oyster { namespace Physics
Gravity( );
Gravity( const Gravity &gravity );
Gravity & operator = ( const Gravity &gravity );
};
}
} }