TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-02 02:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/development' into development

Browse source
This commit is contained in:
marauder2k7 2026-04-18 19:19:37 +01:00
commit 4fa4233ae4
19 changed files with 694 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Engine/source/T3D/assets/SoundAsset.cpp
View file

@ -189,12 +189,6 @@ SoundAsset::SoundAsset()
SoundAsset::~SoundAsset()
{
for (U32 i = 0; i < SFXPlayList::NUM_SLOTS; i++)
{
if(mSFXProfile[i].isProperlyAdded() && !mSFXProfile[i].isDeleted())
mSFXProfile[i].unregisterObject();
}
if (mPlaylist.isProperlyAdded() && !mPlaylist.isDeleted())
mPlaylist.unregisterObject();
@ -404,22 +398,17 @@ U32 SoundAsset::load()
{
Con::errorf("SoundAsset::initializeAsset: Attempted to load file %s but it was not valid!", mSoundFile[i]);
mLoadedState = BadFileReference;
mSFXProfile[i].setDescription(NULL);
mSFXProfile[i].setSoundFileName(StringTable->insert(StringTable->EmptyString()));
mSFXProfile[i].setPreload(false);
return mLoadedState;
}
else
{
SFXProfile* trackProfile = new SFXProfile();
trackProfile->setDescription(&mProfileDesc);
trackProfile->setSoundFileName(mSoundPath[i]);
trackProfile->setPreload(mPreload);
mSFXProfile[i] = new SFXProfile;
mSFXProfile[i]->setDescription(&mProfileDesc);
mSFXProfile[i]->setSoundFileName(mSoundPath[i]);
mSFXProfile[i]->setPreload(mPreload);
mSFXProfile[i]->registerObject(String::ToString("%s_profile_track%d", getAssetName()).c_str());
mSFXProfile[i] = *trackProfile;
mSFXProfile[i].registerObject(String::ToString("%s_profile_track%d", getAssetName()).c_str());
mPlaylist.mSlots.mTrack[i] = trackProfile;
mPlaylist.mSlots.mTrack[i] = mSFXProfile[i];
}
}
@ -436,18 +425,15 @@ U32 SoundAsset::load()
{
Con::errorf("SoundAsset::initializeAsset: Attempted to load file %s but it was not valid!", mSoundFile[0]);
mLoadedState = BadFileReference;
mSFXProfile[0].setDescription(NULL);
mSFXProfile[0].setSoundFileName(StringTable->insert(StringTable->EmptyString()));
mSFXProfile[0].setPreload(false);
return mLoadedState;
}
else
{
mSFXProfile[0].setDescription(&mProfileDesc);
mSFXProfile[0].setSoundFileName(mSoundPath[0]);
mSFXProfile[0].setPreload(mPreload);
mSFXProfile[0].registerObject(String::ToString("%s_profile", getAssetName()).c_str());
mSFXProfile[0] = new SFXProfile;
mSFXProfile[0]->setDescription(&mProfileDesc);
mSFXProfile[0]->setSoundFileName(mSoundPath[0]);
mSFXProfile[0]->setPreload(mPreload);
mSFXProfile[0]->registerObject(String::ToString("%s_profile", getAssetName()).c_str());
}
}

12
Engine/source/T3D/assets/SoundAsset.h
View file

@ -87,9 +87,9 @@ class SoundAsset : public AssetBase
typedef AssetPtr<SoundAsset> ConcreteAssetPtr;
protected:
StringTableEntry mSoundFile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
StringTableEntry mSoundPath[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
SFXProfile mSFXProfile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
StringTableEntry mSoundFile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
StringTableEntry mSoundPath[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
SimObjectPtr<SFXProfile> mSFXProfile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
SFXDescription mProfileDesc;
SFXPlayList mPlaylist;
@ -150,7 +150,7 @@ public:
void copyTo(SimObject* object) override;
//SFXResource* getSound() { return mSoundResource; }
Resource<SFXResource> getSoundResource(const U32 slotId = 0) { load(); return mSFXProfile[slotId].getResource(); }
Resource<SFXResource> getSoundResource(const U32 slotId = 0) { load(); return mSFXProfile[slotId]->getResource(); }
/// Declare Console Object.
DECLARE_CONOBJECT(SoundAsset);
@ -158,9 +158,9 @@ public:
static bool _setSoundFile(void* object, const char* index, const char* data);
U32 load() override;
inline StringTableEntry getSoundPath(const U32 slotId = 0) const { return mSoundPath[slotId]; };
SFXProfile* getSfxProfile(const U32 slotId = 0) { return &mSFXProfile[slotId]; }
SFXProfile* getSfxProfile(const U32 slotId = 0) { return mSFXProfile[slotId]; }
SFXPlayList* getSfxPlaylist() { return &mPlaylist; }
SFXTrack* getSFXTrack() { load(); return mIsPlaylist ? dynamic_cast<SFXTrack*>(&mPlaylist) : dynamic_cast<SFXTrack*>(&mSFXProfile[0]); }
SFXTrack* getSFXTrack() { load(); return mIsPlaylist ? dynamic_cast<SFXTrack*>(&mPlaylist) : dynamic_cast<SFXTrack*>(mSFXProfile[0].getPointer()); }
SFXDescription* getSfxDescription() { return &mProfileDesc; }
bool isPlaylist(){ return mIsPlaylist; }

1
Engine/source/T3D/player.cpp
View file

@ -471,6 +471,7 @@ bool PlayerData::preload(bool server, String &errorStr)
if (!server) {
for (U32 i = 0; i < MaxSounds; ++i)
{
_setPlayerSound(getPlayerSound(i), i);
if (!isPlayerSoundValid(i))
{
//return false; -TODO: trigger asset download

2
Engine/source/T3D/rigidShape.cpp
View file

@ -348,6 +348,7 @@ bool RigidShapeData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < Body::MaxSounds; i++)
{
_setBodySounds(getBodySounds(i), i);
if (!isBodySoundsValid(i))
{
//return false; -TODO: trigger asset download
@ -356,6 +357,7 @@ bool RigidShapeData::preload(bool server, String &errorStr)
for (S32 j = 0; j < Sounds::MaxSounds; j++)
{
_setWaterSounds(getWaterSounds(j), j);
if (!isWaterSoundsValid(j))
{
//return false; -TODO: trigger asset download

1
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -141,6 +141,7 @@ bool FlyingVehicleData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < MaxSounds; i++)
{
_setFlyingSounds(getFlyingSounds(i), i);
if (!isFlyingSoundsValid(i))
{
//return false; -TODO: trigger asset download

1
Engine/source/T3D/vehicles/hoverVehicle.cpp
View file

@ -313,6 +313,7 @@ bool HoverVehicleData::preload(bool server, String &errorStr)
for (S32 i = 0; i < MaxSounds; i++)
{
_setHoverSounds(getHoverSounds(i), i);
if (!isHoverSoundsValid(i))
{
//return false; -TODO: trigger asset download

1
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -348,6 +348,7 @@ bool WheeledVehicleData::preload(bool server, String &errorStr)
if (!server) {
for (S32 i = 0; i < MaxSounds; i++)
{
_setWheeledVehicleSounds(getWheeledVehicleSounds(i), i);
if (!isWheeledVehicleSoundsValid(i))
{
//return false; -TODO: trigger asset download

71
Engine/source/console/simObject.h
View file

@ -40,7 +40,10 @@
#ifndef _TAML_CALLBACKS_H_
#include "persistence/taml/tamlCallbacks.h"
#endif
#ifndef _OBJECTTYPES_H_
#include "T3D/objectTypes.h"
#endif
class Stream;
class LightManager;
@ -606,6 +609,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
/// @name Events
/// @{
//virtual void onPrepare();
/// Called when the object is added to the sim.
virtual bool onAdd();
@ -1045,56 +1049,47 @@ DefineBitfieldType(GameTypeMasksType);
template< typename T >
class SimObjectPtr : public WeakRefPtr< T >
{
public:
public:
typedef WeakRefPtr< T > Parent;
typedef WeakRefPtr< T > Parent;
SimObjectPtr() {}
SimObjectPtr(T *ptr) { this->mReference = NULL; set(ptr); }
SimObjectPtr( const SimObjectPtr& ref ) { this->mReference = NULL; set(ref.mReference); }
SimObjectPtr() = default;
SimObjectPtr(T* ptr) { set(ptr); }
SimObjectPtr(const SimObjectPtr&) = default;
SimObjectPtr& operator=(const SimObjectPtr&) = default;
SimObjectPtr& operator=(T* ptr)
{
set(ptr);
return *this;
}
T* getObject() const { return Parent::getPointer(); }
T* getObject() const { return Parent::getPointer(); }
~SimObjectPtr() { set((WeakRefBase::WeakReference*)NULL); }
protected:
void set(T* obj)
{
// Nothing to do if same object
if (obj && this->mWeak.lock() == obj->getWeakControl().lock())
return;
SimObjectPtr<T>& operator=(const SimObjectPtr ref)
// Before overwriting, check old object for auto-delete
if (auto old_ctrl = this->mWeak.lock())
{
set(ref.mReference);
return *this;
}
SimObjectPtr<T>& operator=(T *ptr)
{
set(ptr);
return *this;
}
protected:
void set(WeakRefBase::WeakReference * ref)
{
if( ref == this->mReference )
return;
if( this->mReference )
T* old_obj = getObject();
if (this->mWeak.use_count() == 1 && old_obj && old_obj->isAutoDeleted())
{
// Auto-delete
T* obj = this->getPointer();
if ( this->mReference->getRefCount() == 2 && obj && obj->isAutoDeleted() )
obj->deleteObject();
this->mReference->decRefCount();
}
this->mReference = NULL;
if( ref )
{
this->mReference = ref;
this->mReference->incRefCount();
old_obj->destroySelf();
}
}
void set(T * obj)
// Assign new weak reference
this->mWeak.reset();
if (obj)
{
set(obj ? obj->getWeakReference() : (WeakRefBase::WeakReference *)NULL);
auto obj_ctrl = obj->getWeakControl().lock();
this->mWeak = obj_ctrl;
}
}
};
#endif // _SIMOBJECT_H_

18
Engine/source/core/util/refBase.cpp Normal file
View file

@ -0,0 +1,18 @@
#include "refBase.h"
WeakRefBase::~WeakRefBase()
{
if (mControl)
mControl->object = NULL;
}
WeakControlBlock::WeakControlBlock(WeakRefBase* obj)
: object(obj)
{
}
WeakControlBlock::~WeakControlBlock()
{
}

397
Engine/source/core/util/refBase.h
View file

@ -30,52 +30,52 @@
# include "platform/typetraits.h"
#endif
#include <memory>
#include <type_traits>
class WeakRefBase;
struct WeakControlBlock
{
explicit WeakControlBlock(WeakRefBase* obj);
~WeakControlBlock();
WeakRefBase* object;
};
/// Base class for objects which can be weakly referenced
/// (i.e., reference goes away when object is destroyed).
class WeakRefBase
{
public:
/// Weak reference to WeakRefBase.
class WeakReference
WeakRefBase()
: mControl(std::make_shared<WeakControlBlock>(this))
{
public:
}
[[nodiscard]] constexpr WeakRefBase* get() const { return mObject; }
[[nodiscard]] constexpr U32 getRefCount() const { return mRefCount; }
virtual ~WeakRefBase();
constexpr void incRefCount() { mRefCount++; }
constexpr void decRefCount() {
AssertFatal( mRefCount > 0, "WeakReference - decrementing count of zero!" );
if (--mRefCount==0)
delete this;
}
private:
// Copy constructor
WeakRefBase(const WeakRefBase&) = delete;
WeakRefBase& operator=(const WeakRefBase&) = delete;
WeakRefBase(WeakRefBase&&) = delete;
WeakRefBase& operator=(WeakRefBase&&) = delete;
friend class WeakRefBase;
constexpr explicit WeakReference(WeakRefBase *object) :mObject(object), mRefCount(0) {}
std::weak_ptr<WeakControlBlock> getWeakControl()
{
return mControl;
}
~WeakReference() { AssertFatal(mObject==NULL, "Deleting weak reference which still points at an object."); }
// Object we reference
WeakRefBase *mObject;
// reference count for this structure (not WeakObjectRef itself)
U32 mRefCount;
};
public:
constexpr WeakRefBase() : mReference(NULL) {}
virtual ~WeakRefBase() { clearWeakReferences(); }
WeakReference* getWeakReference();
std::shared_ptr<WeakControlBlock> getSharedControl()
{
return mControl;
}
protected:
void clearWeakReferences();
std::shared_ptr<WeakControlBlock> mControl;
private:
WeakReference * mReference;
};
template< typename T > class SimObjectPtr;
@ -88,100 +88,48 @@ template< typename T > class SimObjectPtr;
template <class T> class WeakRefPtr
{
public:
constexpr WeakRefPtr() : mReference(NULL) {}
WeakRefPtr(T *ptr) : mReference(NULL) { set(ptr); }
WeakRefPtr(const WeakRefPtr<T> & ref) { mReference = NULL; set(ref.mReference); }
~WeakRefPtr() { set(static_cast<WeakRefBase::WeakReference *>(NULL)); }
WeakRefPtr() = default;
WeakRefPtr(T* obj) { set(obj); }
WeakRefPtr<T>& operator=(const WeakRefPtr<T>& ref)
{
if (this == &ref) { return *this; } // handle self assignment ( x = x; )
set(ref.mReference);
return *this;
}
WeakRefPtr<T>& operator=(T *ptr)
{
set(ptr);
return *this;
}
WeakRefPtr(const WeakRefPtr&) = default;
WeakRefPtr& operator=(const WeakRefPtr&) = default;
/// Returns true if the pointer is not set.
[[nodiscard]] constexpr bool isNull() const { return mReference == NULL || mReference->get() == NULL; }
/// Returns true if the pointer is set.
[[nodiscard]] constexpr bool isValid() const { return mReference && mReference->get(); }
WeakRefPtr& operator=(T* obj)
{
set(obj);
return *this;
}
bool isValid() const { return getPointer() != NULL; }
bool isNull() const { return getPointer() == NULL; }
[[nodiscard]] constexpr T* operator->() const { return getPointer(); }
[[nodiscard]] constexpr T& operator*() const { return *getPointer(); }
[[nodiscard]] constexpr operator T*() const { return getPointer(); }
/// Returns the pointer.
[[nodiscard]] constexpr T* getPointer() const { return mReference ? (T*)mReference->get() : NULL; }
[[nodiscard]] constexpr T* getPointer() const
{
auto ctrl = mWeak.lock();
if (!ctrl || !ctrl->object)
return NULL;
return (T*)(ctrl->object);
}
protected:
void set(WeakRefBase::WeakReference* ref)
{
if (mReference)
mReference->decRefCount();
mReference = NULL;
if (ref)
void set(T* obj)
{
if (!obj)
{
mReference = ref;
mReference->incRefCount();
mWeak.reset();
return;
}
}
void set(T* obj) { set(obj ? obj->getWeakReference() : NULL); }
mWeak = obj->getWeakControl();
}
private:
template< typename > friend class SimObjectPtr;
WeakRefBase::WeakReference * mReference {NULL};
};
/// Union of an arbitrary type with a WeakRefBase. The exposed type will
/// remain accessible so long as the WeakRefBase is not cleared. Once
/// it is cleared, accessing the exposed type will result in a NULL pointer.
template<class ExposedType>
class WeakRefUnion
{
typedef WeakRefUnion<ExposedType> Union;
public:
constexpr WeakRefUnion() : mPtr(NULL) {}
constexpr WeakRefUnion(const WeakRefPtr<WeakRefBase> & ref, ExposedType * ptr) : mPtr(NULL) { set(ref, ptr); }
constexpr WeakRefUnion(const Union & lock) : mPtr(NULL) { *this = lock; }
constexpr WeakRefUnion(WeakRefBase * ref) : mPtr(NULL) { set(ref, dynamic_cast<ExposedType*>(ref)); }
~WeakRefUnion() { mWeakReference = NULL; }
Union & operator=(const Union & ptr)
{
if (this == *ptr) { return *this; }
set(ptr.mWeakReference, ptr.getPointer());
return *this;
}
void set(const WeakRefPtr<WeakRefBase> & ref, ExposedType * ptr)
{
mWeakReference = ref;
mPtr = ptr;
}
[[nodiscard]] constexpr bool operator == (const ExposedType * t ) const { return getPointer() == t; }
[[nodiscard]] constexpr bool operator != (const ExposedType * t ) const { return getPointer() != t; }
[[nodiscard]] constexpr bool operator == (const Union &t ) const { return getPointer() == t.getPointer(); }
[[nodiscard]] constexpr bool operator != (const Union &t ) const { return getPointer() != t.getPointer(); }
[[nodiscard]] constexpr bool isNull() const { return mWeakReference.isNull() || !mPtr; }
[[nodiscard]] constexpr ExposedType* getPointer() const { return !mWeakReference.isNull() ? mPtr : NULL; }
[[nodiscard]] constexpr ExposedType* operator->() const { return getPointer(); }
[[nodiscard]] constexpr ExposedType& operator*() const { return *getPointer(); }
[[nodiscard]] constexpr operator ExposedType*() const { return getPointer(); }
[[nodiscard]] WeakRefPtr<WeakRefBase> getRef() const { return mWeakReference; }
private:
WeakRefPtr<WeakRefBase> mWeakReference;
ExposedType * mPtr;
std::weak_ptr<WeakControlBlock> mWeak;
};
/// Base class for objects which can be strongly referenced
@ -189,34 +137,40 @@ private:
/// when all strong references go away, object is destroyed).
class StrongRefBase : public WeakRefBase
{
friend class StrongObjectRef;
friend class StrongObjectRef;
public:
StrongRefBase() { mRefCount = 0; }
StrongRefBase()
{
mRefCount = 0;
}
U32 getRefCount() const { return mRefCount; }
virtual ~StrongRefBase() = default;
/// object destroy self call (from StrongRefPtr). Override if this class has specially allocated memory.
virtual void destroySelf() { delete this; }
U32 getRefCount() const { return mRefCount; }
/// Increments the reference count.
void incRefCount()
{
mRefCount++;
}
/// object destroy self call (from StrongRefPtr). Override if this class has specially allocated memory.
virtual void destroySelf() { delete this; }
/// Decrements the reference count.
void decRefCount()
{
AssertFatal(mRefCount, "Decrementing a reference with refcount 0!");
if(!--mRefCount)
destroySelf();
}
/// Increments the reference count.
void incRefCount()
{
mRefCount++;
}
/// Decrements the reference count.
void decRefCount()
{
AssertFatal(mRefCount, "Decrementing a reference with refcount 0!");
if (!--mRefCount)
destroySelf();
}
protected:
U32 mRefCount; ///< reference counter for StrongRefPtr objects
U32 mRefCount; ///< reference counter for StrongRefPtr objects
};
/// Base class for StrongRefBase strong reference pointers.
class StrongObjectRef
{
@ -289,55 +243,6 @@ public:
T* getPointer() const { return const_cast<T*>(static_cast<T* const>(mObject)); }
};
/// Union of an arbitrary type with a StrongRefBase. StrongRefBase will remain locked
/// until the union is destructed. Handy for when the exposed class will
/// become invalid whenever the reference becomes invalid and you want to make sure that doesn't
/// happen.
template<class ExposedType>
class StrongRefUnion
{
typedef StrongRefUnion<ExposedType> Union;
public:
StrongRefUnion() : mPtr(NULL) {}
StrongRefUnion(const StrongRefPtr<StrongRefBase> & ref, ExposedType * ptr) : mPtr(NULL) { set(ref, ptr); }
StrongRefUnion(const Union & lock) : mPtr(NULL) { *this = lock; }
StrongRefUnion(StrongRefBase * ref) : mPtr(NULL) { set(ref, dynamic_cast<ExposedType*>(ref)); }
~StrongRefUnion() { mReference = NULL; }
Union & operator=(const Union & ptr)
{
set(ptr.mReference, ptr.mPtr);
return *this;
}
void set(const StrongRefPtr<StrongRefBase> & ref, ExposedType * ptr)
{
mReference = ref;
mPtr = ptr;
}
[[nodiscard]] constexpr bool operator == (const ExposedType * t ) const { return mPtr == t; }
[[nodiscard]] constexpr bool operator != (const ExposedType * t ) const { return mPtr != t; }
[[nodiscard]] constexpr bool operator == (const Union &t ) const { return mPtr == t.mPtr; }
[[nodiscard]] constexpr bool operator != (const Union &t ) const { return mPtr != t.mPtr; }
[[nodiscard]] constexpr bool isNull() const { return mReference.isNull() || !mPtr; }
[[nodiscard]] constexpr bool isValid() const { return mReference.isValid() && mPtr; }
ExposedType* operator->() const { return mPtr; }
ExposedType& operator*() const { return *mPtr; }
operator ExposedType*() const { return mPtr; }
ExposedType* getPointer() const { return mPtr; }
StrongRefPtr<StrongRefBase> getRef() const { return mReference; }
private:
StrongRefPtr<StrongRefBase> mReference;
ExposedType * mPtr;
};
/// This oxymoron is a pointer that reference-counts the referenced
/// object but also NULLs out if the object goes away.
///
@ -347,97 +252,91 @@ private:
/// StrongWeakRefs that keep object live as long as the superior entity doesn't
/// step in and kill them (in which case, the client code sees the reference
/// disappear).
template< class T >
template<class T>
class StrongWeakRefPtr
{
public:
constexpr StrongWeakRefPtr() : mReference( NULL ) {}
constexpr StrongWeakRefPtr( T* ptr ) : mReference( NULL ) { _set( ptr ); }
~StrongWeakRefPtr()
{
if( mReference )
{
T* ptr = _get();
if( ptr )
ptr->decRefCount();
StrongWeakRefPtr() = default;
mReference->decRefCount();
}
StrongWeakRefPtr(T* ptr) { set(ptr); }
StrongWeakRefPtr(const StrongWeakRefPtr& other)
{
set(other.getPointer());
}
[[nodiscard]] constexpr bool isNull() const { return ( _get() == NULL ); }
[[nodiscard]] constexpr bool operator ==( T* ptr ) const { return ( _get() == ptr ); }
[[nodiscard]] constexpr bool operator !=( T* ptr ) const { return ( _get() != ptr ); }
[[nodiscard]] constexpr bool operator !() const { return isNull(); }
[[nodiscard]] constexpr T* operator ->() const { return _get(); }
[[nodiscard]] constexpr T& operator *() const { return *( _get() ); }
constexpr operator T*() const { return _get(); } // consider making this explicit
T* getPointer() const { return _get(); }
StrongWeakRefPtr& operator =( T* ptr )
StrongWeakRefPtr& operator=(const StrongWeakRefPtr& other)
{
_set( ptr );
if (this != &other)
set(other.getPointer());
return *this;
}
private:
WeakRefBase::WeakReference* mReference;
T* _get() const
~StrongWeakRefPtr()
{
if( mReference )
return static_cast< T* >( mReference->get() );
else
return NULL;
release();
}
void _set( T* ptr )
StrongWeakRefPtr& operator=(T* ptr)
{
set(ptr);
return *this;
}
bool isValid() const { return getPointer() != NULL; }
bool isNull() const { return getPointer() == NULL; }
[[nodiscard]] bool operator==(T* ptr) const { return getPointer() == ptr; }
[[nodiscard]] bool operator!=(T* ptr) const { return getPointer() != ptr; }
[[nodiscard]] bool operator!() const { return isNull(); }
[[nodiscard]] T* operator->() const { return getPointer(); }
[[nodiscard]] T& operator*() const { return *getPointer(); }
constexpr operator T* () const { return getPointer(); }
[[nodiscard]] T* getPointer() const
{
if( mReference )
{
T* old = _get();
if( old )
old->decRefCount();
return mControl ? static_cast<T*>(mControl->object) : NULL;
}
mReference->decRefCount();
private:
std::shared_ptr<WeakControlBlock> mControl;
T* mPtr = NULL;
void set(T* ptr)
{
release();
if (!ptr) return;
// Always hold the identity
mControl = ptr->getWeakControl().lock();
if (!mControl) return;
mPtr = ptr;
// Conditionally retain object lifetime if T supports intrusive refcount
// runtime check: only strong ref if T inherits StrongRefBase
if constexpr (std::is_base_of_v<StrongRefBase, T>)
{
mPtr->incRefCount();
}
}
void release()
{
if (mPtr)
{
if constexpr (std::is_base_of_v<StrongRefBase, T>)
{
mPtr->decRefCount();
}
}
if( ptr )
{
ptr->incRefCount();
mReference = ptr->getWeakReference();
mReference->incRefCount();
}
else
mReference = NULL;
mPtr = NULL;
mControl.reset();
}
};
//---------------------------------------------------------------
inline void WeakRefBase::clearWeakReferences()
{
if (mReference)
{
mReference->mObject = NULL;
mReference->decRefCount();
mReference = NULL;
}
}
inline WeakRefBase::WeakReference* WeakRefBase::getWeakReference()
{
if (!mReference)
{
mReference = new WeakReference(this);
mReference->incRefCount();
}
return mReference;
}
//---------------------------------------------------------------
template< typename T >
struct TypeTraits< WeakRefPtr< T > > : public _TypeTraits< WeakRefPtr< T > >
{

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

@ -1094,7 +1094,7 @@ void ScatterSky::_render( ObjectRenderInst *ri, SceneRenderState *state, BaseMat
}
else
{
GFX->setCubeTexture( 0, NULL );
GFX->setTexture( 0, NULL );
mShaderConsts->setSafe( mUseCubemapSC, 0.0f );
}

861
Engine/source/gfx/bitmap/loaders/bitmapPng.cpp
View file

File diff suppressed because it is too large Load diff

22
Engine/source/gfx/gl/gfxGLDevice.cpp
View file

@ -57,6 +57,24 @@
#include "gfx/gl/tGL/tXGL.h"
#endif
#pragma region GL WARNINGS
// #131204 - Texture state usage warning: The texture object (0) bound to texture image unit 0
#define GL_LOW_WARN_TEXTURE_STATE 131204
// #131169 - Framebuffer detailed info: The driver allocated storage for renderbuffer 2. (severity: low)
#define GL_LOW_WARN_FRAMEBUFFER 131169
// #131185 - Buffer detailed info: Buffer object 1 (bound to GL_ELEMENT_ARRAY_BUFFER_ARB, usage hint is GL_ENUM_88e4)
// will use VIDEO memory as the source for buffer object operations. (severity: low)
#define GL_LOW_WARN_VIDEO_MEMORY 131185
// #131218 - Program/shader state performance warning: Vertex shader in program #
// is being recompiled based on GL state. (severity: medium)
#define GL_MED_WARN_PERFORMANCE_RECOMPILE 131218
#pragma endregion
GFXAdapter::CreateDeviceInstanceDelegate GFXGLDevice::mCreateDeviceInstance(GFXGLDevice::createInstance);
GFXDevice *GFXGLDevice::createInstance( U32 adapterIndex )
@ -104,6 +122,10 @@ void APIENTRY glDebugCallback(
if (severity == GL_DEBUG_SEVERITY_NOTIFICATION)
return;
// Silence: Texture state usage warning: The texture object (0) bound to texture image unit 0
if (id == GL_LOW_WARN_TEXTURE_STATE)
return;
const char* srcStr = "UNKNOWN";
const char* typeStr = "UNKNOWN";
const char* sevStr = "UNKNOWN";

8
Engine/source/gfx/gl/gfxGLTextureManager.cpp
View file

@ -480,10 +480,9 @@ bool GFXGLTextureManager::_loadTexture(GFXTextureObject *aTexture, GBitmap *pDL)
}
}
if(!ImageUtil::isCompressedFormat(pDL->getFormat()))
if (mipLevels > 1 && !ImageUtil::isCompressedFormat(pDL->getFormat()))
glGenerateMipmap(texture->getBinding());
glBindTexture(target, 0);
return true;
}
@ -560,10 +559,9 @@ bool GFXGLTextureManager::_loadTexture(GFXTextureObject *aTexture, DDSFile *dds)
}
}
if (numMips != 1 && !isCompressed)
if (numMips > 1 && !isCompressed)
glGenerateMipmap(texture->getBinding());
glBindTexture(target, 0);
return true;
}
@ -608,7 +606,7 @@ bool GFXGLTextureManager::_refreshTexture(GFXTextureObject *texture)
_loadTexture(texture, texture->mBitmap);
if(texture->mDDS)
return false;
_loadTexture(texture, texture->mDDS);
usedStrategies++;
}

103
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

@ -102,79 +102,36 @@ GFXLockedRect* GFXGLTextureObject::lock(U32 mipLevel /*= 0*/, RectI* inRect /*=
void GFXGLTextureObject::unlock(U32 mipLevel /*= 0*/, U32 faceIndex /*= 0*/)
{
if (!mLockedRect.bits)
return;
if (!mLockedRect.bits)
return;
PROFILE_SCOPE(GFXGLTextureObject_unlock);
// I know this is in unlock, but in GL we actually do our submission in unlock.
PROFILE_SCOPE(GFXGLTextureObject_lockRT);
PRESERVE_TEXTURE(mBinding);
glBindTexture(mBinding, mHandle);
PRESERVE_TEXTURE(mBinding);
glBindTexture(mBinding, mHandle);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, mBuffer);
glBufferData(GL_PIXEL_UNPACK_BUFFER, (mLockedRectRect.extent.x + 1) * (mLockedRectRect.extent.y + 1) * mBytesPerTexel, mFrameAllocatorPtr, GL_STREAM_DRAW);
S32 z = getDepth();
if (mBinding == GL_TEXTURE_3D)
glTexSubImage3D(mBinding, mipLevel, mLockedRectRect.point.x, mLockedRectRect.point.y, z,
mLockedRectRect.extent.x, mLockedRectRect.extent.y, z, GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], NULL);
else if (mBinding == GL_TEXTURE_2D)
glTexSubImage2D(mBinding, mipLevel, mLockedRectRect.point.x, mLockedRectRect.point.y,
mLockedRectRect.extent.x, mLockedRectRect.extent.y, GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], NULL);
else if (mBinding == GL_TEXTURE_1D)
glTexSubImage1D(mBinding, mipLevel, (mLockedRectRect.point.x > 1 ? mLockedRectRect.point.x : mLockedRectRect.point.y),
(mLockedRectRect.extent.x > 1 ? mLockedRectRect.extent.x : mLockedRectRect.extent.y), GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], NULL);
// --- Save pixel store state ---
GLint prevUnpackAlign;
glGetIntegerv(GL_UNPACK_ALIGNMENT, &prevUnpackAlign);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
const U32 width = mLockedRectRect.extent.x;
const U32 height = mLockedRectRect.extent.y;
const U32 depth = getDepth();
if (mBinding == GL_TEXTURE_3D)
{
glTexSubImage3D(
mBinding,
mipLevel,
mLockedRectRect.point.x,
mLockedRectRect.point.y,
0,
width,
height,
depth,
GFXGLTextureFormat[mFormat],
GFXGLTextureType[mFormat],
mLockedRect.bits
);
}
else if (mBinding == GL_TEXTURE_2D)
{
glTexSubImage2D(
mBinding,
mipLevel,
mLockedRectRect.point.x,
mLockedRectRect.point.y,
width,
height,
GFXGLTextureFormat[mFormat],
GFXGLTextureType[mFormat],
mLockedRect.bits
);
}
else if (mBinding == GL_TEXTURE_1D)
{
glTexSubImage1D(
mBinding,
mipLevel,
mLockedRectRect.point.x,
width,
GFXGLTextureFormat[mFormat],
GFXGLTextureType[mFormat],
mLockedRect.bits
);
}
// --- Restore state ---
glPixelStorei(GL_UNPACK_ALIGNMENT, prevUnpackAlign);
mLockedRect.bits = NULL;
FrameAllocator::setWaterMark(mFrameAllocatorMark);
mFrameAllocatorMark = 0;
mFrameAllocatorPtr = NULL;
#ifdef TORQUE_DEBUG
glCheckErrors();
mLockedRect.bits = NULL;
#if TORQUE_DEBUG
AssertFatal(mFrameAllocatorMarkGuard == FrameAllocator::getWaterMark(), "");
#endif
FrameAllocator::setWaterMark(mFrameAllocatorMark);
mFrameAllocatorMark = 0;
mFrameAllocatorPtr = NULL;
}
void GFXGLTextureObject::release()
@ -281,7 +238,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
} // face
} // mip
glBindTexture(mBinding, 0);
return true;
}
@ -298,6 +254,9 @@ void GFXGLTextureObject::updateTextureSlot(const GFXTexHandle& texHandle, const
const GLenum srcTarget = srcTex->getBinding(); // source binding
const bool srcIsCube = (srcTarget == GL_TEXTURE_CUBE_MAP || srcTarget == GL_TEXTURE_CUBE_MAP_ARRAY);
PRESERVE_TEXTURE(srcTarget);
PRESERVE_TEXTURE(dstTarget);
// Determine list of faces to copy from source
U32 firstFace = 0;
U32 faceCount = 1;
@ -435,9 +394,6 @@ void GFXGLTextureObject::updateTextureSlot(const GFXTexHandle& texHandle, const
GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], buffer);
}
}
glBindTexture(dstTarget, 0);
glBindTexture(srcTarget, 0);
}
}
@ -462,6 +418,9 @@ void GFXGLTextureObject::initSamplerState(const GFXSamplerStateDesc &ssd)
void GFXGLTextureObject::bind(U32 textureUnit)
{
if (!mHandle || mIsZombie)
return;
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(mBinding, mHandle);
GFXGL->getOpenglCache()->setCacheBindedTex(textureUnit, mBinding, mHandle);

2
Engine/source/gui/editor/guiInspectorTypes.cpp
View file

@ -1174,7 +1174,7 @@ GuiControl* GuiInspectorTypeColor::constructEditControl()
if( inspector->isMethod( "onInspectorPreFieldModification" ) )
{
dSprintf( szBuffer, sizeof( szBuffer ),
"%d.onInspectorPreFieldModification(\"%s\",\"%s\"); %s(%s, \"%d.onInspectorPostFieldModification(); %d.applyWithoutUndo\", %d.getRoot(), \"%d.applyWithoutUndo\", \"%d.onInspectorDiscardFieldModification(); %%unused=\");",
"%d.onInspectorPreFieldModification(\"%s\",\"%s\"); %s(%s, \"%d.onInspectorPostFieldModification(); %d.applyWithoutUndo\", %d.getRoot(), \"%d.applyWithoutUndo\", \"%d.onInspectorDiscardFieldModification(); %$unused=\");",
inspector->getId(), getRawFieldName(), getArrayIndex(),
mColorFunction, szColor, inspector->getId(), getId(),
getId(),

25
Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file

@ -434,25 +434,22 @@ void dampen(inout Surface surface, sampler2D WetnessTexture, float accumTime, fl
{
if (degree<=0.0) return;
vec3 n = abs(surface.N);
float ang = clamp(n.z, 0.04, 0.96);
float ang = 1.1-(abs(surface.N.z)*sign(surface.N.z));
float speed = -accumTime*(1.0-surface.linearRoughnessSq)*clamp((2.0-ang), 0.04, 0.96);
if ((n.x > 0.0) || (n.y > 0.0))
speed *= -1.0;
vec2 wetoffset = vec2(speed,speed)*0.1;
float speed = accumTime * (1.0 - surface.linearRoughnessSq);
vec3 wetoffset = (surface.P+vec3(speed,speed,speed)) * 0.33;
vec3 wetNormal = texture(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).xyz;
wetNormal = lerp(wetNormal,texture(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).rgb ,n.y);
wetNormal = lerp(wetNormal,texture(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).rgb ,n.x);
surface.N = lerp(surface.N, wetNormal, degree);
vec3 wetNormal = texture(WetnessTexture, wetoffset.xy).xyz * (1.1-(n.z* n.z));
wetNormal = lerp(wetNormal, texture(WetnessTexture, wetoffset.zx).rgb, n.y);
wetNormal = lerp(wetNormal, texture(WetnessTexture, wetoffset.zy).rgb, n.x);
wetNormal = normalize(wetNormal);
float wetness = wetNormal.b* degree;
float wetness = texture(WetnessTexture, vec2(surface.P.xy*0.1+wetoffset)).b;
wetness = lerp(wetness,texture(WetnessTexture,vec2(surface.P.zx*0.1+wetoffset)).b,n.y);
wetness = lerp(wetness,texture(WetnessTexture,vec2(surface.P.zy*0.1+wetoffset)).b,n.x);
wetness = pow(wetness*ang*degree,3);
wetNormal = normalize(wetNormal * 2.0 - 1.0);
surface.N = normalize(vec3(surface.N.xy + wetNormal.xy * wetness, surface.N.z));
surface.roughness = lerp(surface.roughness, 0.04f, wetness);
surface.baseColor.rgb = lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+float3(0.4,0.4,0.4)*wetness, wetness);
surface.baseColor = vec4(lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+vec3(0.4,0.4,0.4)*wetness, wetness), max(surface.baseColor.a, 0.4* wetness));
surface.metalness = lerp(surface.metalness, 0.96, wetness);
updateSurface(surface);
}

27
Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file

@ -436,25 +436,22 @@ void dampen(inout Surface surface, TORQUE_SAMPLER2D(WetnessTexture), float accum
{
if (degree<=0.0) return;
float3 n = abs(surface.N);
float ang = clamp(n.z, 0.04, 0.96);
float ang = 1.1-(abs(surface.N.z)*sign(surface.N.z));
float speed = -accumTime*(1.0-surface.linearRoughnessSq)*clamp((2.0-ang), 0.04, 0.96);
if ((n.x > 0.0) || (n.y > 0.0))
speed *= -1.0;
float2 wetoffset = float2(speed,speed)*0.1;
float speed = accumTime * (1.0 - surface.linearRoughnessSq);
float3 wetoffset = (surface.P+float3(speed,speed,speed)) * 0.33;
float3 wetNormal = TORQUE_TEX2D(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).xyz;
wetNormal = lerp(wetNormal,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).rgb ,n.y);
wetNormal = lerp(wetNormal,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).rgb ,n.x);
surface.N = lerp(surface.N, wetNormal, degree);
float wetness = TORQUE_TEX2D(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).b;
wetness = lerp(wetness,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).b,n.y);
wetness = lerp(wetness,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).b,n.x);
wetness = pow(wetness*ang*degree,3);
float3 wetNormal = TORQUE_TEX2D(WetnessTexture, wetoffset.xy).xyz * (1.1-(n.z* n.z));
wetNormal = lerp(wetNormal, TORQUE_TEX2D(WetnessTexture, wetoffset.zx).rgb, n.y);
wetNormal = lerp(wetNormal, TORQUE_TEX2D(WetnessTexture, wetoffset.zy).rgb, n.x);
wetNormal = normalize(wetNormal);
float wetness = wetNormal.b* degree;
wetNormal = normalize(wetNormal * 2.0 - 1.0);
surface.N = normalize(float3(surface.N.xy + wetNormal.xy * wetness, surface.N.z));
surface.roughness = lerp(surface.roughness, 0.04f, wetness);
surface.baseColor.rgb = lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+float3(0.4,0.4,0.4)*wetness, wetness);
surface.baseColor = float4(lerp(surface.baseColor.rgb, surface.baseColor.rgb * 0.6 + float3(0.4, 0.4, 0.4) * wetness, wetness), max(surface.baseColor.a, 0.4* wetness));
surface.metalness = lerp(surface.metalness, 0.96, wetness);
surface.Update();
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -2101,7 +2101,7 @@ function EditorTree::onRightMouseUp( %this, %itemId, %mouse, %obj )
%popup.item[ 0 ] = "Delete" TAB "" TAB "EditorMenuEditDelete();";
%popup.item[ 1 ] = "Group" TAB "" TAB "EWorldEditor.addSimGroup( true );";
%popup.item[ 2 ] = "-";
%popup.item[ 3 ] = "Make selected a Prefab" TAB "" TAB "EWorldEditor.makeSelectionPrefab();";
%popup.item[ 3 ] = "Make selected a Prefab" TAB "" TAB "EditorMakePrefab();";
%popup.item[ 4 ] = "Bake selected into Mesh" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"ShapeAsset\", AssetBrowser.selectedModule, \"makeSelectedAMesh\");";
%popup.item[ 5 ] = "-";
%popup.item[ 6 ] = "Make selected a Sub-Level" TAB "" TAB "MakeSelectionASublevel();";