mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-19 22:53:47 +00:00
Merge branch 'development' into AITurretClearIgnoreList
This commit is contained in:
Areloch
GitHub
commit
f2733d79f8
84 changed files with 255 additions and 216 deletions
|
|
@ -880,8 +880,8 @@ IMPLEMENT_CALLBACK( ShapeBase, validateCameraFov, F32, (F32 fov), (fov),
|
|||
ShapeBase::ShapeBase()
|
||||
: mDataBlock( NULL ),
|
||||
mIsAiControlled( false ),
|
||||
mAiPose( 0 ),
|
||||
mControllingObject( NULL ),
|
||||
mAiPose( 0 ),
|
||||
mMoveMotion( false ),
|
||||
mShapeBaseMount( NULL ),
|
||||
mShapeInstance( NULL ),
|
||||
|
|
|
|||
|
|
@ -569,6 +569,16 @@ void AITurretShape::clearIgnoreList()
|
|||
mIgnoreObjects.clear();
|
||||
}
|
||||
|
||||
S32 AITurretShape::ignoreListCount()
|
||||
{
|
||||
return mIgnoreObjects.size();
|
||||
}
|
||||
|
||||
SimObject* AITurretShape::getIgnoreListObject(S32 index)
|
||||
{
|
||||
return mIgnoreObjects.at(index);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
void AITurretShape::_initState()
|
||||
|
|
@ -1256,6 +1266,21 @@ DefineEngineMethod( AITurretShape, clearIgnoreList, void, (),,
|
|||
object->clearIgnoreList();
|
||||
}
|
||||
|
||||
DefineEngineMethod( AITurretShape, ignoreListCount, S32, (),,
|
||||
"@brief Returns the number of objects in the turrets ignore list.\n\n"
|
||||
"All objects in this list will be ignored by the turret's targeting.\n")
|
||||
{
|
||||
return object->ignoreListCount();
|
||||
}
|
||||
|
||||
DefineEngineMethod( AITurretShape, getIgnoreListObject, SimObject*, (S32 index),,
|
||||
"@brief Returns the object in the ignore list at index.\n\n"
|
||||
"All objects in this list will be ignored by the turret's targeting.\n"
|
||||
"@param index The index of the object in the ignore list being retrieved.\n")
|
||||
{
|
||||
return object->getIgnoreListObject(index);
|
||||
}
|
||||
|
||||
DefineEngineMethod( AITurretShape, setTurretState, void, (const char* newState, bool force), (false),
|
||||
"@brief Set the turret's current state.\n\n"
|
||||
"Normally the turret's state comes from updating the state machine but this method "
|
||||
|
|
|
|||
|
|
@ -258,6 +258,8 @@ public:
|
|||
void addToIgnoreList(ShapeBase* obj);
|
||||
void removeFromIgnoreList(ShapeBase* obj);
|
||||
void clearIgnoreList();
|
||||
S32 ignoreListCount();
|
||||
SimObject* getIgnoreListObject(S32 index);
|
||||
|
||||
void setTurretStateName(const char* newState, bool force=false);
|
||||
void setTurretState(U32 newState, bool force=false);
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ StringTableEntry assetPrivateField = StringTable->insert("AssetPrivate");
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
AssetBase::AssetBase() :
|
||||
mAcquireReferenceCount(0),
|
||||
mpOwningAssetManager(NULL),
|
||||
mAcquireReferenceCount(0),
|
||||
mAssetInitialized(false)
|
||||
{
|
||||
// Generate an asset definition.
|
||||
|
|
@ -349,4 +349,4 @@ void AssetBase::setOwned(AssetManager* pAssetManager, AssetDefinition* pAssetDef
|
|||
|
||||
// Flag asset as initialized.
|
||||
mAssetInitialized = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ AssetManager::AssetManager() :
|
|||
mLoadedPrivateAssetsCount( 0 ),
|
||||
mMaxLoadedInternalAssetsCount( 0 ),
|
||||
mMaxLoadedExternalAssetsCount( 0 ),
|
||||
mMaxLoadedPrivateAssetsCount( 0 ),
|
||||
mAcquiredReferenceCount( 0 ),
|
||||
mEchoInfo( false ),
|
||||
mAcquiredReferenceCount( 0 ),
|
||||
mMaxLoadedPrivateAssetsCount( 0 ),
|
||||
mIgnoreAutoUnload( true )
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,8 +122,8 @@ S32 QSORT_CALLBACK ArrayObject::_valueFunctionCompare( const void* a, const void
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
ArrayObject::ArrayObject()
|
||||
: mCurrentIndex( NULL ),
|
||||
mCaseSensitive( false )
|
||||
: mCaseSensitive( false ),
|
||||
mCurrentIndex( NULL )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ EngineExport::EngineExport( const char* name, EngineExportKind kind, EngineExpor
|
|||
: mExportName( name ),
|
||||
mExportKind( kind ),
|
||||
mExportScope( scope ),
|
||||
mNextExport( NULL ),
|
||||
mDocString( docString )
|
||||
mDocString( docString ),
|
||||
mNextExport( NULL )
|
||||
{
|
||||
AssertFatal( name != NULL, "EngineExport - export without name!" );
|
||||
AssertFatal( scope != NULL, avar( "EngineExport - export '%s' is in no scope" ) );
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ SimPersistID::SimPersistID( SimObject* object )
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
SimPersistID::SimPersistID( const Torque::UUID& uuid )
|
||||
: mUUID( uuid ),
|
||||
mObject( NULL )
|
||||
: mObject( NULL ),
|
||||
mUUID( uuid )
|
||||
{
|
||||
AssertFatal( !uuid.isNull(), "SimPersistID::SimPersistID - invalid UUID!" );
|
||||
smLookupTable->insertUnique( mUUID, this );
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ MemStream::MemStream( U32 bufferSize,
|
|||
mStreamSize( bufferSize ),
|
||||
mBufferBase( buffer ),
|
||||
mInstCaps( 0 ),
|
||||
mCurrentPosition( 0 ),
|
||||
mOwnsMemory( false )
|
||||
mOwnsMemory( false ),
|
||||
mCurrentPosition( 0 )
|
||||
{
|
||||
AssertFatal( bufferSize > 0, "Invalid buffer size");
|
||||
AssertFatal( allowRead || allowWrite, "Either write or read must be allowed");
|
||||
|
|
|
|||
|
|
@ -1620,7 +1620,7 @@ String String::GetTrailingNumber(const char* str, S32& number)
|
|||
if ((*p == '-') || (*p == '_'))
|
||||
number = -dAtoi(p + 1);
|
||||
else
|
||||
number = (isdigit(*p) && (p == base.c_str()) ? dAtoi(p) : dAtoi(++p));
|
||||
number = (isdigit(*p) ? dAtoi(p) : dAtoi(++p));
|
||||
|
||||
// Remove space between the name and the number
|
||||
while ((p > base.c_str()) && dIsspace(*(p-1)))
|
||||
|
|
|
|||
|
|
@ -608,8 +608,8 @@ IMPLEMENT_CO_NETOBJECT_V1(MeshRoad);
|
|||
MeshRoad::MeshRoad()
|
||||
: mTextureLength( 5.0f ),
|
||||
mBreakAngle( 3.0f ),
|
||||
mPhysicsRep( NULL ),
|
||||
mWidthSubdivisions( 0 )
|
||||
mWidthSubdivisions( 0 ),
|
||||
mPhysicsRep( NULL )
|
||||
{
|
||||
mConvexList = new Convex;
|
||||
|
||||
|
|
@ -2453,4 +2453,4 @@ DefineEngineMethod( MeshRoad, postApply, void, (),,
|
|||
)
|
||||
{
|
||||
object->inspectPostApply();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@ ConsoleDocClass( TimeOfDay,
|
|||
);
|
||||
|
||||
TimeOfDay::TimeOfDay()
|
||||
: mElevation( 0.0f ),
|
||||
mAzimuth( 0.0f ),
|
||||
mAxisTilt( 23.44f ), // 35 degree tilt
|
||||
: mStartTimeOfDay( 0.5f ), // High noon
|
||||
mDayLen( 120.0f ), // 2 minutes
|
||||
mStartTimeOfDay( 0.5f ), // High noon
|
||||
mAxisTilt( 23.44f ), // 35 degree tilt
|
||||
mAzimuth( 0.0f ),
|
||||
mElevation( 0.0f ),
|
||||
mTimeOfDay( 0.0f ), // initialized to StartTimeOfDay in onAdd
|
||||
mPlay( true ),
|
||||
mDayScale( 1.0f ),
|
||||
mPlay( true ),
|
||||
mNightScale( 1.5f ),
|
||||
mAnimateTime( 0.0f ),
|
||||
mAnimateSpeed( 0.0f ),
|
||||
|
|
|
|||
|
|
@ -196,15 +196,15 @@ WaterObject::WaterObject()
|
|||
mUndulateMaxDist(50.0f),
|
||||
mMiscParamW( 0.0f ),
|
||||
mUnderwaterPostFx( NULL ),
|
||||
mBasicLighting( false ),
|
||||
mOverallWaveMagnitude( 1.0f ),
|
||||
mOverallRippleMagnitude( 0.1f ),
|
||||
mCubemap( NULL ),
|
||||
mSoundAmbience( NULL ),
|
||||
mOverallWaveMagnitude( 1.0f ),
|
||||
mBasicLighting( false ),
|
||||
mSpecularPower( 48.0f ),
|
||||
mSoundAmbience( NULL ),
|
||||
mCubemap( NULL ),
|
||||
mSpecularColor( 1.0f, 1.0f, 1.0f, 1.0f ),
|
||||
mDepthGradientMax( 50.0f ),
|
||||
mEmissive( false )
|
||||
mEmissive( false ),
|
||||
mDepthGradientMax( 50.0f )
|
||||
{
|
||||
mTypeMask = WaterObjectType;
|
||||
|
||||
|
|
|
|||
|
|
@ -159,8 +159,8 @@ ConsoleDocClass( ForestSelectionTool,
|
|||
|
||||
ForestSelectionTool::ForestSelectionTool()
|
||||
: Parent(),
|
||||
mCurrAction( NULL ),
|
||||
mGizmo( NULL ),
|
||||
mCurrAction( NULL ),
|
||||
mGizmoProfile( NULL )
|
||||
{
|
||||
mBounds = Box3F::Invalid;
|
||||
|
|
|
|||
|
|
@ -81,8 +81,8 @@ ConsoleDocClass( Forest,
|
|||
|
||||
Forest::Forest()
|
||||
: mDataFileName( NULL ),
|
||||
mReflectionLodScalar( 2.0f ),
|
||||
mConvexList( new Convex() ),
|
||||
mReflectionLodScalar( 2.0f ),
|
||||
mZoningDirty( false )
|
||||
{
|
||||
mTypeMask |= EnvironmentObjectType | StaticShapeObjectType | StaticObjectType;
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@
|
|||
ForestCell::ForestCell( const RectF &rect ) :
|
||||
mRect( rect ),
|
||||
mBounds( Box3F::Invalid ),
|
||||
mLargestItem( ForestItem::Invalid ),
|
||||
mIsDirty( false ),
|
||||
mLargestItem( ForestItem::Invalid ),
|
||||
mIsInteriorOnly( false )
|
||||
{
|
||||
dMemset( mSubCells, 0, sizeof( mSubCells ) );
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ SimSet* ForestItemData::smSet = NULL;
|
|||
ForestItemData::ForestItemData()
|
||||
: mNeedPreload( true ),
|
||||
mShapeFile( NULL ),
|
||||
mRadius( 1 ),
|
||||
mCollidable( true ),
|
||||
mRadius( 1 ),
|
||||
mWindScale( 0.0f ),
|
||||
mTrunkBendScale( 0.0f ),
|
||||
mWindBranchAmp( 0.0f ),
|
||||
|
|
@ -215,9 +215,9 @@ ForestItem::ForestItem()
|
|||
: mDataBlock( NULL ),
|
||||
mTransform( true ),
|
||||
mScale( 0.0f ),
|
||||
mWorldBox( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ),
|
||||
mKey( 0 ),
|
||||
mRadius( 0.0f ),
|
||||
mKey( 0 )
|
||||
mWorldBox( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,12 +84,12 @@ ForestWind::ForestWind( ForestWindEmitter *emitter )
|
|||
mDirection( 1.0f, 0, 0 ),
|
||||
mLastGustTime( 0 ),
|
||||
mLastYawTime( 0 ),
|
||||
mCurrentTarget( 0, 0 ),
|
||||
mCurrentInterp( 0 ),
|
||||
mTargetYawAngle( 0 ),
|
||||
mCurrentInterp( 0 ),
|
||||
mCurrentTarget( 0, 0 ),
|
||||
mParent( emitter ),
|
||||
mIsDirty( false ),
|
||||
mRandom( Platform::getRealMilliseconds() + 1 )
|
||||
mRandom( Platform::getRealMilliseconds() + 1 ),
|
||||
mIsDirty( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -204,8 +204,9 @@ void ForestWind::setDirection( const VectorF &direction )
|
|||
IMPLEMENT_CO_NETOBJECT_V1(ForestWindEmitter);
|
||||
|
||||
ForestWindEmitter::ForestWindEmitter( bool makeClientObject )
|
||||
: mEnabled( true ),
|
||||
mAddedToScene( false ),
|
||||
:
|
||||
mAddedToScene( false ),
|
||||
mEnabled( true ),
|
||||
mWind( NULL ),
|
||||
mWindStrength( 1 ),
|
||||
mWindDirection( 1, 0, 0 ),
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ ConsoleDocClass( TSForestItemData,
|
|||
);
|
||||
|
||||
TSForestItemData::TSForestItemData()
|
||||
: mShapeInstance( NULL ),
|
||||
mIsClientObject( false )
|
||||
: mIsClientObject( false ),
|
||||
mShapeInstance( NULL )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1057,6 +1057,7 @@ bool GBitmap::write(Stream& io_rStream) const
|
|||
|
||||
bool GBitmap::readBitmap( const String &bmType, Stream &ioStream )
|
||||
{
|
||||
PROFILE_SCOPE(ResourceGBitmap_readBitmap);
|
||||
const GBitmap::Registration *regInfo = GBitmap::sFindRegInfo( bmType );
|
||||
|
||||
if ( regInfo == NULL )
|
||||
|
|
|
|||
|
|
@ -39,6 +39,9 @@
|
|||
#include "gfx/gfxEnums.h" // For the format
|
||||
#endif
|
||||
|
||||
#ifndef _PROFILER_H_
|
||||
#include "platform/profiler.h"
|
||||
#endif
|
||||
//-------------------------------------- Forward decls.
|
||||
class Stream;
|
||||
class RectI;
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ struct BITMAPINFOHEADER
|
|||
|
||||
static bool sReadBMP(Stream &stream, GBitmap *bitmap)
|
||||
{
|
||||
PROFILE_SCOPE(sReadBMP);
|
||||
BITMAPINFOHEADER bi;
|
||||
BITMAPFILEHEADER bf;
|
||||
RGBQUAD rgb[256];
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ static S32 gifWriteDataFn(GifFileType *gifinfo, GifByteType *data, S32 length)
|
|||
//--------------------------------------
|
||||
static bool sReadGIF( Stream &stream, GBitmap *bitmap )
|
||||
{
|
||||
PROFILE_SCOPE(sReadGIF);
|
||||
GifFileType *gifinfo = DGifOpen( (void*)&stream, gifReadDataFn);
|
||||
if (!gifinfo)
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ static S32 jpegErrorFn(void *client_data)
|
|||
//--------------------------------------
|
||||
static bool sReadJPG(Stream &stream, GBitmap *bitmap)
|
||||
{
|
||||
PROFILE_SCOPE(sReadJPG);
|
||||
JFREAD = jpegReadDataFn;
|
||||
JFERROR = jpegErrorFn;
|
||||
|
||||
|
|
|
|||
|
|
@ -206,6 +206,7 @@ static mng_bool mngFatalErrorFn(mng_handle mng, mng_int32 code, mng_int8 severit
|
|||
|
||||
static bool sReadMNG(Stream &stream, GBitmap *bitmap)
|
||||
{
|
||||
PROFILE_SCOPE(sReadMNG);
|
||||
mngstuff mnginfo;
|
||||
dMemset(&mnginfo, 0, sizeof(mngstuff));
|
||||
|
||||
|
|
|
|||
|
|
@ -136,6 +136,7 @@ static void pngWarningFn(png_structp, png_const_charp /*pMessage*/)
|
|||
//--------------------------------------
|
||||
static bool sReadPNG(Stream &stream, GBitmap *bitmap)
|
||||
{
|
||||
PROFILE_SCOPE(sReadPNG);
|
||||
static const U32 cs_headerBytesChecked = 8;
|
||||
|
||||
U8 header[cs_headerBytesChecked];
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ is_15_bit_in_disguise:
|
|||
|
||||
static bool sReadTGA(Stream &stream, GBitmap *bitmap)
|
||||
{
|
||||
PROFILE_SCOPE(sReadTGA);
|
||||
struct Header
|
||||
{
|
||||
U8 idLength; // length of the image_id string below.
|
||||
|
|
|
|||
|
|
@ -240,8 +240,8 @@ void GenericConstBufferLayout::clear()
|
|||
|
||||
|
||||
GenericConstBuffer::GenericConstBuffer(GenericConstBufferLayout* layout)
|
||||
: mBuffer( NULL ),
|
||||
mLayout( layout ),
|
||||
: mLayout( layout ),
|
||||
mBuffer( NULL ),
|
||||
mDirtyStart( U32_MAX ),
|
||||
mDirtyEnd( 0 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ U32 GFXVertexElement::getSizeInBytes() const
|
|||
|
||||
GFXVertexFormat::GFXVertexFormat()
|
||||
: mDirty( true ),
|
||||
mHasColor( false ),
|
||||
mHasNormal( false ),
|
||||
mHasColor( false ),
|
||||
mHasTangent( false ),
|
||||
mHasInstancing( false ),
|
||||
mTexCoordCount( 0 ),
|
||||
|
|
|
|||
|
|
@ -36,8 +36,9 @@ GLCircularVolatileBuffer* getCircularVolatileIndexBuffer()
|
|||
}
|
||||
|
||||
GFXGLPrimitiveBuffer::GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType) :
|
||||
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), mZombieCache(NULL),
|
||||
mBufferOffset(0)
|
||||
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType),
|
||||
mBufferOffset(0),
|
||||
mZombieCache(NULL)
|
||||
{
|
||||
if( mBufferType == GFXBufferTypeVolatile )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ GFX_ImplementTextureProfile( BackBufferDepthProfile,
|
|||
GFXTextureProfile::NONE );
|
||||
|
||||
GFXGLWindowTarget::GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d)
|
||||
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mFullscreenContext(NULL)
|
||||
, mCopyFBO(0), mBackBufferFBO(0), mSecondaryWindow(false)
|
||||
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mCopyFBO(0)
|
||||
, mFullscreenContext(NULL), mBackBufferFBO(0), mSecondaryWindow(false)
|
||||
{
|
||||
win->appEvent.notify(this, &GFXGLWindowTarget::_onAppSignal);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ inline void sBlendPixelRGB888( U8* src, U8* dst, F32 factor )
|
|||
ScreenShot::ScreenShot()
|
||||
: mPending( false ),
|
||||
mWriteJPG( false ),
|
||||
mCurrTile( 0, 0 ),
|
||||
mTiles( 1 )
|
||||
mTiles( 1 ),
|
||||
mCurrTile( 0, 0 )
|
||||
{
|
||||
mFilename[0] = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,8 +227,8 @@ void TheoraTexture::FrameStream::releaseTextureLocks()
|
|||
TheoraTexture::AsyncState::AsyncState( const ThreadSafeRef< OggInputStream >& oggStream, bool looping )
|
||||
: mOggStream( oggStream ),
|
||||
mTheoraDecoder( dynamic_cast< OggTheoraDecoder* >( oggStream->getDecoder( "Theora" ) ) ),
|
||||
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) ),
|
||||
mCurrentTime( 0 )
|
||||
mCurrentTime( 0 ),
|
||||
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) )
|
||||
{
|
||||
if( mTheoraDecoder )
|
||||
{
|
||||
|
|
@ -276,8 +276,8 @@ bool TheoraTexture::AsyncState::isAtEnd()
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
TheoraTexture::TheoraTexture()
|
||||
: mPlaybackQueue( NULL ),
|
||||
mCurrentFrame( NULL ),
|
||||
: mCurrentFrame( NULL ),
|
||||
mPlaybackQueue( NULL ),
|
||||
mIsPaused( true )
|
||||
{
|
||||
GFXTextureManager::addEventDelegate( this, &TheoraTexture::_onTextureEvent );
|
||||
|
|
|
|||
|
|
@ -54,15 +54,15 @@ MODULE_END;
|
|||
|
||||
VideoCapture::VideoCapture() :
|
||||
mEncoder(NULL),
|
||||
mIsRecording(false),
|
||||
mCanvas(NULL),
|
||||
mFrameGrabber(NULL),
|
||||
mWaitingForCanvas(false),
|
||||
mResolution(0,0),
|
||||
mCanvas(NULL),
|
||||
mIsRecording(false),
|
||||
mFrameRate(30.0f),
|
||||
mResolution(0,0),
|
||||
mWaitingForCanvas(false),
|
||||
mEncoderName("THEORA"),
|
||||
mFileName(""),
|
||||
mMsPerFrameError(0)
|
||||
mMsPerFrameError(0),
|
||||
mFileName("")
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@ GuiAutoScrollCtrl::GuiAutoScrollCtrl()
|
|||
mStartDelay( 3.f ),
|
||||
mResetDelay( 5.f ),
|
||||
mChildBorder( 10 ),
|
||||
mScrollSpeed( 1.f ),
|
||||
mScrollOutOfSight( false )
|
||||
mScrollOutOfSight( false ),
|
||||
mScrollSpeed( 1.f )
|
||||
{
|
||||
mIsContainer = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,25 +55,25 @@ IMPLEMENT_CALLBACK( GuiScrollCtrl, onScroll, void, (), (),
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
GuiScrollCtrl::GuiScrollCtrl()
|
||||
: mChildMargin( 0, 0 ),
|
||||
mBorderThickness( 1 ),
|
||||
: mBorderThickness( 1 ),
|
||||
mChildMargin( 0, 0 ),
|
||||
mScrollBarThickness( 16 ),
|
||||
mScrollBarArrowBtnLength( 16 ),
|
||||
mScrollBarDragTolerance( 130 ),
|
||||
mStateDepressed( false ),
|
||||
mHitRegion( None ),
|
||||
mWillFirstRespond( true ),
|
||||
mUseConstantHeightThumb( false ),
|
||||
mForceVScrollBar( ScrollBarAlwaysOn ),
|
||||
mUseConstantHeightThumb( false ),
|
||||
mWillFirstRespond( true ),
|
||||
mForceHScrollBar( ScrollBarAlwaysOn ),
|
||||
mLockHorizScroll( false ),
|
||||
mLockVertScroll( false ),
|
||||
mIgnoreChildResized( false ),
|
||||
mAnimating( false ),
|
||||
mScrollAnimSpeed( -1 ),
|
||||
mScrollTargetPos( -1, -1 ),
|
||||
mChildExt(0, 0),
|
||||
mChildPos(0, 0),
|
||||
mChildExt(0, 0),
|
||||
mScrollTargetPos( -1, -1 ),
|
||||
mBaseThumbSize(0)
|
||||
{
|
||||
mIsContainer = true;
|
||||
|
|
|
|||
|
|
@ -70,16 +70,16 @@ IMPLEMENT_CALLBACK( GuiWindowCtrl, onRestore, void, (), (),
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
GuiWindowCtrl::GuiWindowCtrl()
|
||||
: mResizeEdge(edgeNone),
|
||||
mResizeWidth(true),
|
||||
: mResizeWidth(true),
|
||||
mResizeEdge(edgeNone),
|
||||
mResizeHeight(true),
|
||||
mResizeMargin(2.f),
|
||||
mCanMove(true),
|
||||
mResizeMargin(2.f),
|
||||
mCanClose(true),
|
||||
mCanMinimize(true),
|
||||
mCanMaximize(true),
|
||||
mCanDock(false),
|
||||
mCanCollapse(false),
|
||||
mCanDock(false),
|
||||
mEdgeSnap(true),
|
||||
mCollapseGroup(-1),
|
||||
mCollapseGroupNum(-1),
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ ConsoleDocClass( GuiDecoyCtrl,
|
|||
"Currently editor use only, no real application without extension.\n\n "
|
||||
"@internal");
|
||||
|
||||
GuiDecoyCtrl::GuiDecoyCtrl() : mIsDecoy(true),
|
||||
mMouseOver(false),
|
||||
GuiDecoyCtrl::GuiDecoyCtrl() : mMouseOver(false),
|
||||
mIsDecoy(true),
|
||||
mDecoyReference(NULL)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
|
||||
GuiGameListMenuCtrl::GuiGameListMenuCtrl()
|
||||
: mSelected(NO_ROW),
|
||||
mHighlighted(NO_ROW),
|
||||
mDebugRender(false)
|
||||
mDebugRender(false),
|
||||
mHighlighted(NO_ROW)
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION(mRows);
|
||||
|
||||
|
|
|
|||
|
|
@ -237,8 +237,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
|||
mCurY( 0 ),
|
||||
mCurClipX( 0 ),
|
||||
mLineAtoms( NULL ),
|
||||
mLineAtomPtr( &mLineAtoms ),
|
||||
mLineList( NULL ),
|
||||
mLineAtomPtr( &mLineAtoms ),
|
||||
mLineInsert( &mLineList ),
|
||||
mScanPos( 0 ),
|
||||
mCurX( 0 ),
|
||||
|
|
@ -247,8 +247,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
|||
mLineStart( 0 ),
|
||||
mVertMoveAnchor( 0 ),
|
||||
mVertMoveAnchorValid( false ),
|
||||
mSelectionAnchor( 0 ),
|
||||
mIsEditCtrl( false ),
|
||||
mSelectionAnchor( 0 ),
|
||||
mCursorPosition( false ),
|
||||
mMaxBufferSize( -1 ),
|
||||
mInitialText( StringTable->EmptyString() ),
|
||||
|
|
@ -257,13 +257,13 @@ GuiMLTextCtrl::GuiMLTextCtrl()
|
|||
mSelectionEnd( 0 ),
|
||||
mLineSpacingPixels( 2 ),
|
||||
mAllowColorChars( false ),
|
||||
mUseURLMouseCursor( false ),
|
||||
mBitmapList( 0 ),
|
||||
mUseURLMouseCursor( false ),
|
||||
mBitmapRefList( 0 ),
|
||||
mDirty( true ),
|
||||
mTagList( NULL ),
|
||||
mHitURL( 0 ),
|
||||
mDirty( true ),
|
||||
mAlpha( 1.0f ),
|
||||
mHitURL( 0 ),
|
||||
mFontList( NULL )
|
||||
{
|
||||
mActive = true;
|
||||
|
|
|
|||
|
|
@ -97,8 +97,8 @@ GuiSliderCtrl::GuiSliderCtrl()
|
|||
mIncAmount( 0.f ),
|
||||
mDisplayValue( false ),
|
||||
mMouseOver( false ),
|
||||
mMouseDragged( false ),
|
||||
mDepressed( false )
|
||||
mDepressed( false ),
|
||||
mMouseDragged( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,33 +100,33 @@ GuiCanvas::GuiCanvas(): GuiControl(),
|
|||
mCursorEnabled(true),
|
||||
mForceMouseToGUI(false),
|
||||
mAlwaysHandleMouseButtons(false),
|
||||
mCursorChanged(0),
|
||||
mClampTorqueCursor(true),
|
||||
mShowCursor(true),
|
||||
mClampTorqueCursor(true),
|
||||
mCursorChanged(0),
|
||||
mLastCursorEnabled(false),
|
||||
mMouseControl(NULL),
|
||||
mMouseCapturedControl(NULL),
|
||||
mMouseControl(NULL),
|
||||
mMouseControlClicked(false),
|
||||
mMouseButtonDown(false),
|
||||
mMouseRightButtonDown(false),
|
||||
mMouseMiddleButtonDown(false),
|
||||
mDefaultCursor(NULL),
|
||||
mLastCursor(NULL),
|
||||
mLastCursorPt(0,0),
|
||||
mMouseMiddleButtonDown(false),
|
||||
mCursorPt(0,0),
|
||||
mLastCursorPt(0,0),
|
||||
mLastCursor(NULL),
|
||||
mLastMouseClickCount(0),
|
||||
mLastMouseDownTime(0),
|
||||
mPrevMouseTime(0),
|
||||
mRenderFront(false),
|
||||
mPrevMouseTime(0),
|
||||
mLastMouseDownTime(0),
|
||||
mHoverControl(NULL),
|
||||
mHoverPositionSet(false),
|
||||
mHoverLeftControlTime(0),
|
||||
mLeftMouseLast(false),
|
||||
mHoverLeftControlTime(0),
|
||||
mMiddleMouseLast(false),
|
||||
mRightMouseLast(false),
|
||||
mMouseDownPoint(0.0f,0.0f),
|
||||
mPlatformWindow(NULL),
|
||||
mLastRenderMs(0),
|
||||
mPlatformWindow(NULL),
|
||||
mDisplayWindow(true),
|
||||
mMenuBarCtrl(NULL)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -95,12 +95,12 @@ GuiEditCtrl::GuiEditCtrl()
|
|||
mDragBeginPoint( -1, -1 ),
|
||||
mSnapToControls( true ),
|
||||
mSnapToEdges( true ),
|
||||
mSnapToCenters( true ),
|
||||
mSnapToGuides( true ),
|
||||
mSnapToCenters( true ),
|
||||
mSnapToCanvas( true ),
|
||||
mSnapSensitivity( 2 ),
|
||||
mFullBoxSelection( false ),
|
||||
mDrawBorderLines( true ),
|
||||
mFullBoxSelection( false ),
|
||||
mSnapSensitivity( 2 ),
|
||||
mDrawGuides( true )
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION( mSelectedControls );
|
||||
|
|
|
|||
|
|
@ -63,28 +63,28 @@ GuiShapeEdPreview::GuiShapeEdPreview()
|
|||
: mOrbitDist( 5.0f ),
|
||||
mMoveSpeed ( 1.0f ),
|
||||
mZoomSpeed ( 1.0f ),
|
||||
mModel( NULL ),
|
||||
mGridDimension( 30, 30 ),
|
||||
mModel( NULL ),
|
||||
mRenderGhost( false ),
|
||||
mRenderNodes( false ),
|
||||
mRenderBounds( false ),
|
||||
mRenderObjBox( false ),
|
||||
mRenderMounts( true ),
|
||||
mSunDiffuseColor( 255, 255, 255, 255 ),
|
||||
mSunAmbientColor( 140, 140, 140, 255 ),
|
||||
mSelectedNode( -1 ),
|
||||
mSunAmbientColor( 140, 140, 140, 255 ),
|
||||
mHoverNode( -1 ),
|
||||
mSelectedObject( -1 ),
|
||||
mSelectedObjDetail( 0 ),
|
||||
mUsingAxisGizmo( false ),
|
||||
mGizmoDragID( 0 ),
|
||||
mSelectedObjDetail( 0 ),
|
||||
mEditingSun( false ),
|
||||
mGizmoDragID( 0 ),
|
||||
mTimeScale( 1.0f ),
|
||||
mActiveThread( -1 ),
|
||||
mLastRenderTime( 0 ),
|
||||
mFakeSun( NULL ),
|
||||
mSunRot( 45.0f, 0, 135.0f ),
|
||||
mLastRenderTime( 0 ),
|
||||
mCameraRot( 0, 0, 3.9f ),
|
||||
mSunRot( 45.0f, 0, 135.0f ),
|
||||
mRenderCameraAxes( false ),
|
||||
mOrbitPos( 0, 0, 0 ),
|
||||
mFixedDetail( true ),
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ ConsoleDocClass( GuiInspectorField,
|
|||
GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
|
||||
GuiInspectorGroup* parent,
|
||||
AbstractClassRep::Field* field )
|
||||
: mInspector( inspector ),
|
||||
mParent( parent ),
|
||||
: mParent( parent ),
|
||||
mInspector( inspector ),
|
||||
mField( field ),
|
||||
mFieldArrayIndex( NULL ),
|
||||
mEdit( NULL )
|
||||
|
|
@ -66,12 +66,12 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
GuiInspectorField::GuiInspectorField()
|
||||
: mInspector( NULL ),
|
||||
mParent( NULL ),
|
||||
: mParent( NULL ),
|
||||
mInspector( NULL ),
|
||||
mField( NULL ),
|
||||
mEdit( NULL ),
|
||||
mField( NULL ),
|
||||
mFieldArrayIndex( NULL ),
|
||||
mCaption( StringTable->EmptyString() ),
|
||||
mFieldArrayIndex( NULL ),
|
||||
mHighlighted( false )
|
||||
{
|
||||
setCanSave( false );
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ CreatorTree::Node::Node() :
|
|||
mFlags(0),
|
||||
mParent(0),
|
||||
mName(0),
|
||||
mValue(0),
|
||||
mId(0),
|
||||
mValue(0),
|
||||
mTab(0)
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION(mChildren);
|
||||
|
|
|
|||
|
|
@ -292,10 +292,10 @@ F32 Gizmo::smProjectDistance = 20000.0f;
|
|||
|
||||
Gizmo::Gizmo()
|
||||
: mProfile( NULL ),
|
||||
mSelectionIdx( -1 ),
|
||||
mCameraMat( true ),
|
||||
mTransform( true ),
|
||||
mObjectMat( true ),
|
||||
mTransform( true ),
|
||||
mCameraMat( true ),
|
||||
mSelectionIdx( -1 ),
|
||||
mObjectMatInv( true ),
|
||||
mCurrentTransform( true ),
|
||||
mSavedTransform( true ),
|
||||
|
|
@ -303,23 +303,23 @@ Gizmo::Gizmo()
|
|||
mDeltaScale( 0,0,0 ),
|
||||
mDeltaRot( 0,0,0 ),
|
||||
mDeltaPos( 0,0,0 ),
|
||||
mDeltaTotalPos( 0,0,0 ),
|
||||
mDeltaTotalRot( 0,0,0 ),
|
||||
mDeltaTotalScale( 0,0,0 ),
|
||||
mCurrentAlignment( World ),
|
||||
mDeltaTotalScale( 0,0,0 ),
|
||||
mDeltaTotalRot( 0,0,0 ),
|
||||
mDeltaTotalPos( 0,0,0 ),
|
||||
mCurrentMode( MoveMode ),
|
||||
mDirty( false ),
|
||||
mMouseDownPos( -1,-1 ),
|
||||
mDirty( false ),
|
||||
mMouseDown( false ),
|
||||
mLastWorldMat( true ),
|
||||
mLastProjMat( true ),
|
||||
mLastViewport( 0, 0, 10, 10 ),
|
||||
mLastCameraFOV( 1.f ),
|
||||
mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
|
||||
mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
|
||||
mHighlightCentroidHandle( false ),
|
||||
mHighlightAll( false ),
|
||||
mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
|
||||
mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
|
||||
mGridPlaneEnabled( true ),
|
||||
mHighlightAll( false ),
|
||||
mMoveGridEnabled( true ),
|
||||
mMoveGridSize( 20.f ),
|
||||
mMoveGridSpacing( 1.f )
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ ConsoleDocClass( GuiConvexEditorCtrl,
|
|||
|
||||
GuiConvexEditorCtrl::GuiConvexEditorCtrl()
|
||||
: mIsDirty( false ),
|
||||
mFaceHL( -1 ),
|
||||
mFaceSEL( -1 ),
|
||||
mFaceHL( -1 ),
|
||||
mFaceSavedXfm( true ),
|
||||
mSavedUndo( false ),
|
||||
mDragging( false ),
|
||||
|
|
@ -68,12 +68,12 @@ GuiConvexEditorCtrl::GuiConvexEditorCtrl()
|
|||
mUsingPivot( false ),
|
||||
mSettingPivot( false ),
|
||||
mActiveTool( NULL ),
|
||||
mCreateTool( NULL ),
|
||||
mMouseDown( false ),
|
||||
mUndoManager( NULL ),
|
||||
mLastUndo( NULL ),
|
||||
mHasCopied( false ),
|
||||
mCreateTool( NULL ),
|
||||
mSavedGizmoFlags( -1 ),
|
||||
mHasCopied( false ),
|
||||
mLastUndo( NULL ),
|
||||
mUndoManager( NULL ),
|
||||
mCtrlDown( false )
|
||||
{
|
||||
mMaterialName = StringTable->insert("Grid512_OrangeLines_Mat");
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ ConsoleDocClass( GuiTerrPreviewCtrl,
|
|||
"@internal"
|
||||
);
|
||||
|
||||
GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainEditor(NULL), mTerrainSize(2048.0f)
|
||||
GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainSize(2048.0f), mTerrainEditor(NULL)
|
||||
{
|
||||
mRoot.set( 0, 0 );
|
||||
mOrigin.set( 0, 0 );
|
||||
|
|
|
|||
|
|
@ -668,11 +668,11 @@ TerrainEditor::TerrainEditor() :
|
|||
mMousePos(0,0,0),
|
||||
mMouseBrush(0),
|
||||
mInAction(false),
|
||||
mUndoSel(0),
|
||||
mGridUpdateMin( S32_MAX, S32_MAX ),
|
||||
mUndoSel(0),
|
||||
mGridUpdateMax( 0, 0 ),
|
||||
mMaxBrushSize(256,256),
|
||||
mNeedsGridUpdate( false ),
|
||||
mMaxBrushSize(256,256),
|
||||
mNeedsMaterialUpdate( false ),
|
||||
mMouseDown( false )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ ConsoleDocClass( WorldEditorSelection,
|
|||
WorldEditorSelection::WorldEditorSelection()
|
||||
: mCentroidValid(false),
|
||||
mAutoSelect(false),
|
||||
mPrevCentroid(0.0f, 0.0f, 0.0f),
|
||||
mContainsGlobalBounds(false)
|
||||
mContainsGlobalBounds(false),
|
||||
mPrevCentroid(0.0f, 0.0f, 0.0f)
|
||||
{
|
||||
// Selections are transient by default.
|
||||
setCanSave( false );
|
||||
|
|
|
|||
|
|
@ -158,8 +158,8 @@ public:
|
|||
blTerrainProxy::blTerrainProxy( SceneObject *obj ) :
|
||||
Parent( obj ),
|
||||
mLightMapSize( getObject()->getLightMapSize() ),
|
||||
mTerrainBlockSize( getObject()->getBlockSize() ),
|
||||
mShadowVolume( NULL ),
|
||||
mTerrainBlockSize( getObject()->getBlockSize() ),
|
||||
mLightmap( NULL ),
|
||||
sgBakedLightmap( NULL )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ LightInfoExType::LightInfoExType( const char *type )
|
|||
|
||||
|
||||
LightInfo::LightInfo()
|
||||
: mTransform( true ),
|
||||
mColor( 0.0f, 0.0f, 0.0f, 1.0f ),
|
||||
: mColor( 0.0f, 0.0f, 0.0f, 1.0f ),
|
||||
mTransform( true ),
|
||||
mBrightness( 1.0f ),
|
||||
mAmbient( 0.0f, 0.0f, 0.0f, 1.0f ),
|
||||
mRange( 1.0f, 1.0f, 1.0f ),
|
||||
mInnerConeAngle( 90.0f ),
|
||||
mOuterConeAngle( 90.0f ),
|
||||
mType( Vector ),
|
||||
mOuterConeAngle( 90.0f ),
|
||||
mCastShadows( false ),
|
||||
mStaticRefreshFreq( 250 ),
|
||||
mDynamicRefreshFreq( 8 ),
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ LightManager *LightManager::smActiveLM = NULL;
|
|||
LightManager::LightManager( const char *name, const char *id )
|
||||
: mName( name ),
|
||||
mId( id ),
|
||||
mIsActive( false ),
|
||||
mSceneManager( NULL ),
|
||||
mIsActive( false ),
|
||||
mDefaultLight( NULL ),
|
||||
mAvailableSLInterfaces( NULL ),
|
||||
mCullPos( Point3F::Zero )
|
||||
mSceneManager( NULL ),
|
||||
mCullPos( Point3F::Zero ),
|
||||
mAvailableSLInterfaces( NULL )
|
||||
{
|
||||
_getLightManagers().insert( mName, this );
|
||||
|
||||
|
|
|
|||
|
|
@ -83,12 +83,12 @@ GFX_ImplementTextureProfile( ShadowMapZProfile,
|
|||
|
||||
LightShadowMap::LightShadowMap( LightInfo *light )
|
||||
: mWorldToLightProj( true ),
|
||||
mLight( light ),
|
||||
mTexSize( 0 ),
|
||||
mLastShader( NULL ),
|
||||
mLight( light ),
|
||||
mLastUpdate( 0 ),
|
||||
mLastCull( 0 ),
|
||||
mLastShader( NULL ),
|
||||
mIsViewDependent( false ),
|
||||
mLastCull( 0 ),
|
||||
mLastScreenSize( 0.0f ),
|
||||
mLastPriority( 0.0f ),
|
||||
mIsDynamic( false )
|
||||
|
|
@ -580,8 +580,8 @@ MODULE_END;
|
|||
LightInfoExType ShadowMapParams::Type( "" );
|
||||
|
||||
ShadowMapParams::ShadowMapParams( LightInfo *light )
|
||||
: mLight( light ),
|
||||
mShadowMap( NULL ),
|
||||
: mShadowMap( NULL ),
|
||||
mLight( light ),
|
||||
mDynamicShadowMap ( NULL ),
|
||||
isDynamic ( true )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -91,8 +91,8 @@ NamedTexTarget* NamedTexTarget::find( const String &name )
|
|||
}
|
||||
|
||||
NamedTexTarget::NamedTexTarget()
|
||||
: mViewport( RectI::One ),
|
||||
mIsRegistered( false ),
|
||||
: mIsRegistered( false ),
|
||||
mViewport( RectI::One ),
|
||||
mConditioner( NULL )
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ mModuleId(StringTable->EmptyString()),
|
|||
mModuleScriptFilePath(StringTable->EmptyString()),
|
||||
mSignature(StringTable->EmptyString()),
|
||||
mLoadCount( 0 ),
|
||||
mLocked( false ),
|
||||
mScopeSet( 0 ),
|
||||
mLocked( false ),
|
||||
mpModuleManager( NULL )
|
||||
{
|
||||
// Set Vector Associations.
|
||||
|
|
|
|||
|
|
@ -142,9 +142,9 @@ Taml::Taml() :
|
|||
mJSONStrict( true ),
|
||||
mBinaryCompression(true),
|
||||
mWriteDefaults(false),
|
||||
mProgenitorUpdate(true),
|
||||
mAutoFormatXmlExtension("taml"),
|
||||
mAutoFormat(true),
|
||||
mAutoFormatXmlExtension("taml"),
|
||||
mProgenitorUpdate(true),
|
||||
mAutoFormatBinaryExtension("baml"),
|
||||
mAutoFormatJSONExtension("json")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -165,8 +165,8 @@ AsyncBufferedInputStream< T, Stream >::AsyncBufferedInputStream
|
|||
ThreadPool* threadPool,
|
||||
ThreadContext* threadContext )
|
||||
: Parent( stream ),
|
||||
mIsStopped( false ),
|
||||
mIsLooping( isLooping ),
|
||||
mIsStopped( false ),
|
||||
mNumRemainingSourceElements( numSourceElementsToRead ),
|
||||
mNumBufferedElements( 0 ),
|
||||
mMaxBufferedElements( numReadAhead ),
|
||||
|
|
|
|||
|
|
@ -245,8 +245,8 @@ AsyncPacketBufferedInputStream< Stream, Packet >::AsyncPacketBufferedInputStream
|
|||
ThreadContext* threadContext )
|
||||
: Parent( stream, numSourceElementsToRead, numReadAhead, isLooping, threadPool, threadContext ),
|
||||
mPacketSize( packetSize ),
|
||||
mNumTotalSourceElements( numSourceElementsToRead ),
|
||||
mNextPacketIndex( 0 )
|
||||
mNextPacketIndex( 0 ),
|
||||
mNumTotalSourceElements( numSourceElementsToRead )
|
||||
{
|
||||
AssertFatal( mPacketSize > 0,
|
||||
"AsyncPacketStream::AsyncPacketStream() - packet size cannot be zero" );
|
||||
|
|
|
|||
|
|
@ -228,8 +228,8 @@ struct HeapIterator
|
|||
|
||||
HeapIterator( bool allocatedOnly = true )
|
||||
: mCurrentPage( gPageList ),
|
||||
mAllocatedOnly( allocatedOnly ),
|
||||
mCurrentHeader( NULL )
|
||||
mCurrentHeader( NULL ),
|
||||
mAllocatedOnly( allocatedOnly )
|
||||
{
|
||||
if( mCurrentPage )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@ ThreadPool::Context ThreadPool::Context::smRootContext( "ROOT", NULL, 1.0 );
|
|||
//--------------------------------------------------------------------------
|
||||
|
||||
ThreadPool::Context::Context( const char* name, ThreadPool::Context* parent, F32 priorityBias )
|
||||
: mName( name ),
|
||||
mParent( parent ),
|
||||
mSibling( 0 ),
|
||||
: mParent( parent ),
|
||||
mName( name ),
|
||||
mChildren( 0 ),
|
||||
mSibling( 0 ),
|
||||
mPriorityBias( priorityBias ),
|
||||
mAccumulatedPriorityBias( 0.0 )
|
||||
{
|
||||
|
|
@ -215,8 +215,8 @@ private:
|
|||
};
|
||||
|
||||
ThreadPool::WorkerThread::WorkerThread( ThreadPool* pool, U32 index )
|
||||
: mPool( pool ),
|
||||
mIndex( index )
|
||||
: mIndex( index ),
|
||||
mPool( pool )
|
||||
{
|
||||
// Link us to the pool's thread list.
|
||||
|
||||
|
|
@ -311,8 +311,8 @@ ThreadPool::ThreadPool( const char* name, U32 numThreads )
|
|||
mNumThreads( numThreads ),
|
||||
mNumThreadsAwake( 0 ),
|
||||
mNumPendingItems( 0 ),
|
||||
mThreads( 0 ),
|
||||
mSemaphore( 0 )
|
||||
mSemaphore( 0 ),
|
||||
mThreads( 0 )
|
||||
{
|
||||
// Number of worker threads to create.
|
||||
|
||||
|
|
|
|||
|
|
@ -266,21 +266,21 @@ PostEffect::PostEffect()
|
|||
: mRenderTime( PFXAfterDiffuse ),
|
||||
mRenderPriority( 1.0 ),
|
||||
mEnabled( false ),
|
||||
mSkip( false ),
|
||||
mUpdateShader( true ),
|
||||
mStateBlockData( NULL ),
|
||||
mUpdateShader( true ),
|
||||
mSkip( false ),
|
||||
mAllowReflectPass( false ),
|
||||
mTargetClear( PFXTargetClear_None ),
|
||||
mTargetViewport( PFXTargetViewport_TargetSize ),
|
||||
mTargetScale( Point2F::One ),
|
||||
mTargetViewport( PFXTargetViewport_TargetSize ),
|
||||
mTargetSize( Point2I::Zero ),
|
||||
mTargetFormat( GFXFormatR8G8B8A8 ),
|
||||
mTargetClearColor( ColorF::BLACK ),
|
||||
mOneFrameOnly( false ),
|
||||
mOnThisFrame( true ),
|
||||
mShaderReloadKey( 0 ),
|
||||
mIsValid( false ),
|
||||
mRTSizeSC( NULL ),
|
||||
mIsValid( false ),
|
||||
mShaderReloadKey( 0 ),
|
||||
mOneOverRTSizeSC( NULL ),
|
||||
mViewportOffsetSC( NULL ),
|
||||
mTargetViewportSC( NULL ),
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ MODULE_END;
|
|||
bool PostEffectManager::smRenderEffects = true;
|
||||
|
||||
PostEffectManager::PostEffectManager() :
|
||||
mFrameStateSwitch( false ),
|
||||
mLastBackBufferTarget( NULL )
|
||||
mLastBackBufferTarget( NULL ),
|
||||
mFrameStateSwitch( false )
|
||||
{
|
||||
GFXDevice::getDeviceEventSignal().notify( this, &PostEffectManager::_handleDeviceEvent );
|
||||
RenderPassManager::getRenderBinSignal().notify( this, &PostEffectManager::_handleBinEvent );
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ IMPLEMENT_CONOBJECT(RenderBinManager);
|
|||
|
||||
|
||||
RenderBinManager::RenderBinManager( const RenderInstType& ritype, F32 renderOrder, F32 processAddOrder ) :
|
||||
mRenderInstType( ritype ),
|
||||
mRenderOrder( renderOrder ),
|
||||
mProcessAddOrder( processAddOrder ),
|
||||
mRenderOrder( renderOrder ),
|
||||
mRenderInstType( ritype ),
|
||||
mRenderPass( NULL ),
|
||||
mBasicOnly ( false )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ F32 SceneCullingState::smOccluderMinHeightPercentage = 0.1f;
|
|||
SceneCullingState::SceneCullingState( SceneManager* sceneManager, const SceneCameraState& viewState )
|
||||
: mSceneManager( sceneManager ),
|
||||
mCameraState( viewState ),
|
||||
mDisableZoneCulling( smDisableZoneCulling ),
|
||||
mDisableTerrainOcclusion( smDisableTerrainOcclusion )
|
||||
mDisableTerrainOcclusion( smDisableTerrainOcclusion ),
|
||||
mDisableZoneCulling( smDisableZoneCulling )
|
||||
{
|
||||
AssertFatal( sceneManager->getZoneManager(), "SceneCullingState::SceneCullingState - SceneManager must have a zone manager!" );
|
||||
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ U32 ReflectionManager::smFrameReflectionMS = 10;
|
|||
F32 ReflectionManager::smRefractTexScale = 0.5f;
|
||||
|
||||
ReflectionManager::ReflectionManager()
|
||||
: mUpdateRefract( true ),
|
||||
mReflectFormat( GFXFormatR8G8B8A8 ),
|
||||
: mReflectFormat( GFXFormatR8G8B8A8 ),
|
||||
mUpdateRefract( true ),
|
||||
mLastUpdateMs( 0 )
|
||||
{
|
||||
mTimer = PlatformTimer::create();
|
||||
|
|
|
|||
|
|
@ -39,16 +39,16 @@ SceneRenderState::SceneRenderState( SceneManager* sceneManager,
|
|||
RenderPassManager* renderPass /* = NULL */,
|
||||
bool usePostEffects /* = true */ )
|
||||
: mSceneManager( sceneManager ),
|
||||
mCullingState( sceneManager, view ),
|
||||
mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
|
||||
mScenePassType( passType ),
|
||||
mRenderNonLightmappedMeshes( true ),
|
||||
mRenderLightmappedMeshes( true ),
|
||||
mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
|
||||
mCullingState( sceneManager, view ),
|
||||
mUsePostEffects( usePostEffects ),
|
||||
mDisableAdvancedLightingBins( false ),
|
||||
mRenderLightmappedMeshes( true ),
|
||||
mRenderNonLightmappedMeshes( true ),
|
||||
mRenderArea( view.getFrustum().getBounds() ),
|
||||
mAmbientLightColor( sceneManager->getAmbientLightColor() ),
|
||||
mSceneRenderStyle( SRS_Standard )
|
||||
mDisableAdvancedLightingBins( false ),
|
||||
mSceneRenderStyle( SRS_Standard ),
|
||||
mAmbientLightColor( sceneManager->getAmbientLightColor() )
|
||||
{
|
||||
// Setup the default parameters for the screen metrics methods.
|
||||
mDiffuseCameraTransform = view.getHeadWorldViewMatrix();
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
SceneObjectLink::SceneObjectLink( SceneTracker* tracker, SceneObject* object )
|
||||
: mTracker( tracker ),
|
||||
mObject( object ),
|
||||
: mObject( object ),
|
||||
mTracker( tracker ),
|
||||
mNextLink( NULL ),
|
||||
mPrevLink( NULL )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ ClassChunker< SceneZoneSpace::ZoneSpaceRef > SceneZoneSpace::smZoneSpaceRefChunk
|
|||
|
||||
SceneZoneSpace::SceneZoneSpace()
|
||||
: mManager( NULL ),
|
||||
mZoneGroup( InvalidZoneGroup ),
|
||||
mZoneRangeStart( SceneZoneSpaceManager::InvalidZoneId ),
|
||||
mZoneFlags( ZoneFlag_IsClosedOffSpace ),
|
||||
mZoneGroup( InvalidZoneGroup ),
|
||||
mNumZones( 0 ),
|
||||
mZoneFlags( ZoneFlag_IsClosedOffSpace ),
|
||||
mConnectedZoneSpaces( NULL )
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION( mOccluders );
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ ClassChunker< SceneObject::ZoneRef > SceneZoneSpaceManager::smZoneRefChunker;
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
SceneZoneSpaceManager::SceneZoneSpaceManager( SceneContainer* container )
|
||||
: mContainer( container ),
|
||||
mRootZone( new SceneRootZone() ),
|
||||
: mRootZone( new SceneRootZone() ),
|
||||
mContainer( container ),
|
||||
mNumTotalAllocatedZones( 0 ),
|
||||
mNumActiveZones( 0 ),
|
||||
mDirtyArea( Box3F::Invalid )
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ SFXALBuffer::SFXALBuffer( const OPENALFNTABLE &oalft,
|
|||
SFXDescription* description,
|
||||
bool useHardware )
|
||||
: Parent( stream, description ),
|
||||
mOpenAL( oalft ),
|
||||
mIs3d( description->mIs3D ),
|
||||
mUseHardware( useHardware ),
|
||||
mIs3d( description->mIs3D )
|
||||
mOpenAL( oalft )
|
||||
{
|
||||
// Set up device buffers.
|
||||
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ SFXALDevice::SFXALDevice( SFXProvider *provider,
|
|||
S32 maxBuffers )
|
||||
: Parent( name, provider, useHardware, maxBuffers ),
|
||||
mOpenAL( openal ),
|
||||
mDevice( NULL ),
|
||||
mContext( NULL ),
|
||||
mDevice( NULL ),
|
||||
mRolloffFactor( 1.0f )
|
||||
{
|
||||
mMaxBuffers = getMax( maxBuffers, 8 );
|
||||
|
|
|
|||
|
|
@ -83,10 +83,10 @@ SFXAmbience::ChangeSignal SFXAmbience::smChangeSignal;
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
SFXAmbience::SFXAmbience()
|
||||
: mEnvironment( NULL ),
|
||||
mSoundTrack( NULL ),
|
||||
: mDopplerFactor( 0.5f ),
|
||||
mRolloffFactor( 1.f ),
|
||||
mDopplerFactor( 0.5f )
|
||||
mSoundTrack( NULL ),
|
||||
mEnvironment( NULL )
|
||||
{
|
||||
dMemset( mState, 0, sizeof( mState ) );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ SFXDescription::SFXDescription()
|
|||
mFadeLoops( false ),
|
||||
mStreamPacketSize( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_PACKET_LENGTH ),
|
||||
mStreamReadAhead( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_LOOKAHEAD ),
|
||||
mPriority( 1.0f ),
|
||||
mScatterDistance( 0.f, 0.f, 0.f ),
|
||||
mPriority( 1.0f ),
|
||||
mSourceGroup( NULL )
|
||||
{
|
||||
dMemset( mParameters, 0, sizeof( mParameters ) );
|
||||
|
|
@ -164,11 +164,11 @@ SFXDescription::SFXDescription( const SFXDescription& desc )
|
|||
mFadeOutEase( desc.mFadeOutEase ),
|
||||
mFadeLoops( desc.mFadeLoops ),
|
||||
mStreamPacketSize( desc.mStreamPacketSize ),
|
||||
mStreamReadAhead( desc.mStreamReadAhead ),
|
||||
mUseReverb( desc.mUseReverb ),
|
||||
mStreamReadAhead( desc.mStreamReadAhead ),
|
||||
mReverb( desc.mReverb ),
|
||||
mPriority( desc.mPriority ),
|
||||
mScatterDistance( desc.mScatterDistance )
|
||||
mScatterDistance( desc.mScatterDistance ),
|
||||
mPriority( desc.mPriority )
|
||||
{
|
||||
for( U32 i = 0; i < MaxNumParameters; ++ i )
|
||||
mParameters[ i ] = desc.mParameters[ i ];
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ bool SFXOneShotModifier::update()
|
|||
SFXRangeModifier::SFXRangeModifier( SFXSource* source, F32 startTime, F32 endTime, bool removeWhenDone )
|
||||
: Parent( source, removeWhenDone ),
|
||||
mStartTime( startTime ),
|
||||
mEndTime( endTime ),
|
||||
mIsActive( false )
|
||||
mIsActive( false ),
|
||||
mEndTime( endTime )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -217,8 +217,8 @@ EndImplementEnumType;
|
|||
SFXPlayList::SFXPlayList()
|
||||
: mRandomMode( RANDOM_NotRandom ),
|
||||
mLoopMode( LOOP_All ),
|
||||
mNumSlotsToPlay( NUM_SLOTS ),
|
||||
mTrace( false )
|
||||
mTrace( false ),
|
||||
mNumSlotsToPlay( NUM_SLOTS )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ void SFXProvider::regProvider( SFXProvider* provider )
|
|||
}
|
||||
|
||||
SFXProvider::SFXProvider( const String& name )
|
||||
: mName( name ),
|
||||
mNextProvider( NULL )
|
||||
: mNextProvider( NULL ),
|
||||
mName( name )
|
||||
{
|
||||
VECTOR_SET_ASSOCIATION( mDeviceInfo );
|
||||
|
||||
|
|
|
|||
|
|
@ -198,8 +198,8 @@ SFXSystem::SFXSystem()
|
|||
mStatNumVoices( 0 ),
|
||||
mStatSourceUpdateTime( 0 ),
|
||||
mStatParameterUpdateTime( 0 ),
|
||||
mStatAmbientUpdateTime( 0 ),
|
||||
mDistanceModel( SFXDistanceModelLinear ),
|
||||
mStatAmbientUpdateTime( 0 ),
|
||||
mDopplerFactor( 0.5 ),
|
||||
mRolloffFactor( 1.0 ),
|
||||
mSoundscapeMgr( NULL )
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@ public:
|
|||
ShaderFeature()
|
||||
: output( NULL ),
|
||||
mProcessIndex( 0 ),
|
||||
mInstancingFormat( NULL ),
|
||||
mVertexFormat( NULL )
|
||||
mVertexFormat( NULL ),
|
||||
mInstancingFormat( NULL )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -98,8 +98,8 @@ class InterpolatedChangeProperty
|
|||
///
|
||||
InterpolatedChangeProperty( const T& initialValue = T() )
|
||||
: mCurrentValue( initialValue ),
|
||||
mTargetValue( initialValue ),
|
||||
mBlendPhaseTime( DEFAULT_TRANSITION_TIME ),
|
||||
mTargetValue( initialValue ),
|
||||
mTransitionStartTime( 0 )
|
||||
{
|
||||
// By default, start time source right away.
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ datablock LightDescription(GrenadeLauncherLightDesc)
|
|||
datablock ParticleData(GrenadeDebrisFireParticle)
|
||||
{
|
||||
textureName = "art/particles/impact";
|
||||
dragCoeffiecient = 0;
|
||||
dragCoefficient = 0;
|
||||
gravityCoefficient = -1.00366;
|
||||
inheritedVelFactor = 0.0;
|
||||
constantAcceleration = 0.0;
|
||||
|
|
@ -298,7 +298,7 @@ datablock SplashData(GrenadeSplash)
|
|||
datablock ParticleData(GrenadeExpFire)
|
||||
{
|
||||
textureName = "art/particles/fireball.png";
|
||||
dragCoeffiecient = 0;
|
||||
dragCoefficient = 0;
|
||||
windCoeffiecient = 0.5;
|
||||
gravityCoefficient = -1;
|
||||
inheritedVelFactor = 0;
|
||||
|
|
@ -462,7 +462,7 @@ datablock ParticleEmitterData(GrenadeExpSparksEmitter)
|
|||
datablock ParticleData(GrenadeExpSmoke)
|
||||
{
|
||||
textureName = "art/particles/smoke";
|
||||
dragCoeffiecient = 0;
|
||||
dragCoefficient = 0;
|
||||
gravityCoefficient = -0.40293;
|
||||
inheritedVelFactor = 0.0;
|
||||
constantAcceleration = 0.0;
|
||||
|
|
@ -630,7 +630,7 @@ datablock ParticleEmitterData(GLWaterExpSparkEmitter)
|
|||
datablock ParticleData(GLWaterExpSmoke)
|
||||
{
|
||||
textureName = "art/particles/smoke";
|
||||
dragCoeffiecient = 0.4;
|
||||
dragCoefficient = 0.4;
|
||||
gravityCoefficient = -0.25;
|
||||
inheritedVelFactor = 0.025;
|
||||
constantAcceleration = -1.1;
|
||||
|
|
@ -845,7 +845,7 @@ datablock ParticleEmitterData(GrenadeTrailWaterEmitter)
|
|||
datablock ParticleData(GrenadeProjSmokeTrail)
|
||||
{
|
||||
textureName = "art/particles/smoke";
|
||||
dragCoeffiecient = 0.0;
|
||||
dragCoefficient = 0.0;
|
||||
gravityCoefficient = -0.2;
|
||||
inheritedVelFactor = 0.0;
|
||||
constantAcceleration = 0.0;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ datablock SFXProfile(RocketLauncherExplosionSound)
|
|||
datablock ParticleData(RocketDebrisTrailParticle)
|
||||
{
|
||||
textureName = "art/particles/impact";
|
||||
dragCoeffiecient = 0;
|
||||
dragCoefficient = 0;
|
||||
inheritedVelFactor = 0.0;
|
||||
constantAcceleration = 0.0;
|
||||
lifetimeMS = 1200;//1000;
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ datablock DecalData(ScorchRXDecal)
|
|||
texRows = "2";
|
||||
texCols = "2";
|
||||
clippingAngle = "80";
|
||||
screenStartRadius = "200";
|
||||
screenEndRadius = "100";
|
||||
fadeStartPixelSize = "200";
|
||||
fadeEndPixelSize = "100";
|
||||
};
|
||||
|
||||
datablock DecalData(bulletHoleDecal)
|
||||
|
|
@ -51,7 +51,7 @@ datablock DecalData(bulletHoleDecal)
|
|||
randomize = "1";
|
||||
texRows = "2";
|
||||
texCols = "2";
|
||||
screenStartRadius = "20";
|
||||
screenEndRadius = "5";
|
||||
fadeStartPixelSize = "20";
|
||||
fadeEndPixelSize = "5";
|
||||
clippingAngle = "180";
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue