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"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <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> </PropertyGroup>
</Project> </Project>

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

@ -12,7 +12,7 @@ namespace Oyster
inline SimpleBodyDescription::SimpleBodyDescription() inline SimpleBodyDescription::SimpleBodyDescription()
{ {
this->rotation = ::Oyster::Math::Float4x4::identity; 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->size = ::Oyster::Math::Float4( 1.0f );
this->mass = 12.0f; this->mass = 12.0f;
this->inertiaTensor = ::Oyster::Math::Float4x4::identity; this->inertiaTensor = ::Oyster::Math::Float4x4::identity;
@ -23,7 +23,7 @@ namespace Oyster
inline SphericalBodyDescription::SphericalBodyDescription() inline SphericalBodyDescription::SphericalBodyDescription()
{ {
this->rotation = ::Oyster::Math::Float4x4::identity; 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->radius = 0.5f;
this->mass = 10.0f; this->mass = 10.0f;
this->subscription = NULL; this->subscription = NULL;
@ -341,13 +341,13 @@ namespace Oyster
this->mass = 0.0f; this->mass = 0.0f;
} }
inline GravityWell::GravityWell( const GravityWell& gravityWell ) inline GravityWell::GravityWell( const GravityWell &gravityWell )
{ {
this->position = gravityWell.position; this->position = gravityWell.position;
this->mass = gravityWell.mass; this->mass = gravityWell.mass;
} }
GravityWell& GravityWell::operator=( const GravityWell& gravityWell ) GravityWell & GravityWell::operator = ( const GravityWell &gravityWell )
{ {
this->position = gravityWell.position; this->position = gravityWell.position;
this->mass = gravityWell.mass; this->mass = gravityWell.mass;
@ -360,12 +360,12 @@ namespace Oyster
this->impulse = ::Oyster::Math::Float3::null; this->impulse = ::Oyster::Math::Float3::null;
} }
inline GravityDirected::GravityDirected( const GravityDirected& gravityDirected ) inline GravityDirected::GravityDirected( const GravityDirected &gravityDirected )
{ {
this->impulse = gravityDirected.impulse; this->impulse = gravityDirected.impulse;
} }
inline GravityDirected& GravityDirected::operator=( const GravityDirected& gravityDirected ) inline GravityDirected & GravityDirected::operator = ( const GravityDirected &gravityDirected )
{ {
this->impulse = gravityDirected.impulse; this->impulse = gravityDirected.impulse;
@ -379,13 +379,14 @@ namespace Oyster
this->magnitude = 0.0f; this->magnitude = 0.0f;
} }
inline GravityDirectedField::GravityDirectedField( const GravityDirectedField& gravityDirectedField ) inline GravityDirectedField::GravityDirectedField( const GravityDirectedField &gravityDirectedField )
{ {
this->normalizedDirection = gravityDirectedField.normalizedDirection; this->normalizedDirection = gravityDirectedField.normalizedDirection;
this->mass = gravityDirectedField.mass; this->mass = gravityDirectedField.mass;
this->magnitude = gravityDirectedField.magnitude; this->magnitude = gravityDirectedField.magnitude;
} }
inline GravityDirectedField& GravityDirectedField::operator=( const GravityDirectedField& gravityDirectedField )
inline GravityDirectedField& GravityDirectedField::operator = ( const GravityDirectedField &gravityDirectedField )
{ {
this->normalizedDirection = gravityDirectedField.normalizedDirection; this->normalizedDirection = gravityDirectedField.normalizedDirection;
this->mass = gravityDirectedField.mass; this->mass = gravityDirectedField.mass;
@ -399,40 +400,34 @@ namespace Oyster
this->gravityType = GravityType_Undefined; this->gravityType = GravityType_Undefined;
} }
inline Gravity::Gravity( const Gravity& gravity ) inline Gravity::Gravity( const Gravity &gravity )
{ {
switch(gravity.gravityType) switch( gravity.gravityType )
{ {
case GravityType_Well: case GravityType_Well:
this->well.position = gravity.well.position; this->well = gravity.well;
this->well.mass = gravity.well.mass;
break; break;
case GravityType_Directed: case GravityType_Directed:
this->directed.impulse = gravity.directed.impulse; this->directed = gravity.directed;
break; break;
case GravityType_DirectedField: case GravityType_DirectedField:
this->directedField.normalizedDirection = gravity.directedField.normalizedDirection; this->directedField = gravity.directedField;
this->directedField.magnitude = gravity.directedField.magnitude;
this->directedField.mass = gravity.directedField.mass;
break; break;
} }
} }
inline Gravity& Gravity::operator=( const Gravity& gravity ) inline Gravity & Gravity::operator = ( const Gravity &gravity )
{ {
switch(gravity.gravityType) switch( gravity.gravityType )
{ {
case GravityType_Well: case GravityType_Well:
this->well.position = gravity.well.position; this->well = gravity.well;
this->well.mass = gravity.well.mass;
break; break;
case GravityType_Directed: case GravityType_Directed:
this->directed.impulse = gravity.directed.impulse; this->directed = gravity.directed;
break; break;
case GravityType_DirectedField: case GravityType_DirectedField:
this->directedField.normalizedDirection = gravity.directedField.normalizedDirection; this->directedField = gravity.directedField;
this->directedField.magnitude = gravity.directedField.magnitude;
this->directedField.mass = gravity.directedField.mass;
break; break;
} }

17
Code/GamePhysics/PhysicsStructs.h
View File

@ -122,8 +122,8 @@ namespace Oyster { namespace Physics
::Oyster::Math::Float mass; ::Oyster::Math::Float mass;
GravityWell( ); GravityWell( );
GravityWell( const GravityWell& gravityWell ); GravityWell( const GravityWell &gravityWell );
GravityWell& operator=( const GravityWell& gravityWell ); GravityWell& operator=( const GravityWell &gravityWell );
}; };
struct GravityDirected struct GravityDirected
@ -131,8 +131,8 @@ namespace Oyster { namespace Physics
::Oyster::Math::Float3 impulse; ::Oyster::Math::Float3 impulse;
GravityDirected( ); GravityDirected( );
GravityDirected( const GravityDirected& gravityDirected ); GravityDirected( const GravityDirected &gravityDirected );
GravityDirected& operator=( const GravityDirected& gravityDirected ); GravityDirected & operator = ( const GravityDirected &gravityDirected );
}; };
struct GravityDirectedField struct GravityDirectedField
@ -142,8 +142,8 @@ namespace Oyster { namespace Physics
::Oyster::Math::Float magnitude; ::Oyster::Math::Float magnitude;
GravityDirectedField( ); GravityDirectedField( );
GravityDirectedField( const GravityDirectedField& gravityDirectedField ); GravityDirectedField( const GravityDirectedField &gravityDirectedField );
GravityDirectedField& operator=( const GravityDirectedField& gravityDirectedField ); GravityDirectedField & operator=( const GravityDirectedField &gravityDirectedField );
}; };
struct Gravity struct Gravity
@ -175,9 +175,8 @@ namespace Oyster { namespace Physics
}; };
Gravity( ); Gravity( );
Gravity( const Gravity& gravity ); Gravity( const Gravity &gravity );
Gravity& operator=( const Gravity& gravity ); Gravity & operator = ( const Gravity &gravity );
}; };
} }
} } } }