TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 05:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/environment/scatterSky.cpp
View file

@ -1057,7 +1057,7 @@ void ScatterSky::_renderMoon( ObjectRenderInst *ri, SceneRenderState *state, Bas
const MatrixF &camView = state->getCameraTransform();
// Finalize points
for(int i = 0; i < 4; i++)
for(S32 i = 0; i < 4; i++)
{
// align with camera
camView.mulV(points[i]);
@ -1114,13 +1114,13 @@ void ScatterSky::_generateSkyPoints()
F32 deltaSegAngle = ( 2.0f * M_PI_F / (F32)segments );
// Generate the group of rings for the sphere.
for( int ring = 0; ring < 2; ring++ )
for( S32 ring = 0; ring < 2; ring++ )
{
F32 r0 = mSin( ring * deltaRingAngle );
F32 y0 = mCos( ring * deltaRingAngle );
// Generate the group of segments for the current ring.
for( int seg = 0; seg < segments + 1 ; seg++ )
for( S32 seg = 0; seg < segments + 1 ; seg++ )
{
F32 x0 = r0 * sinf( seg * deltaSegAngle );
F32 z0 = r0 * cosf( seg * deltaSegAngle );

2
Engine/source/environment/sun.cpp
View file

@ -470,7 +470,7 @@ void Sun::_renderCorona( ObjectRenderInst *ri, SceneRenderState *state, BaseMatI
const MatrixF &camView = state->getCameraTransform();
// Finalize points
for(int i = 0; i < 4; i++)
for(S32 i = 0; i < 4; i++)
{
// align with camera
camView.mulV(points[i]);

2
Engine/source/environment/waterPlane.cpp
View file

@ -163,7 +163,7 @@ void WaterPlane::unpackUpdate(NetConnection* con, BitStream* stream)
if( stream->readFlag() ) // UpdateMask
{
float posZ;
F32 posZ;
stream->read( &posZ );
Point3F newPos = getPosition();
newPos.z = posZ;