Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conditionnal fixes.

Browse source
This commit is contained in:
Atlante45 2015-07-10 15:36:17 -07:00
parent 49993695a5
commit a3848f08d2
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.cpp
View file

@ -622,7 +622,7 @@ void Avatar::renderBillboard(RenderArgs* renderArgs) {
_billboardTexture = DependencyManager::get<TextureCache>()->getTexture( _billboardTexture = DependencyManager::get<TextureCache>()->getTexture(
uniqueUrl, DEFAULT_TEXTURE, false, _billboard); uniqueUrl, DEFAULT_TEXTURE, false, _billboard);
} }
if (!_billboardTexture->isLoaded()) { if (!_billboardTexture || !_billboardTexture->isLoaded()) {
return; return;
} }
// rotate about vertical to face the camera // rotate about vertical to face the camera

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -544,7 +544,7 @@ const FBXGeometry* EntityTreeRenderer::getCollisionGeometryForEntity(EntityItemP
Model* model = modelEntityItem->getModel(this); Model* model = modelEntityItem->getModel(this);
if (model) { if (model) {
const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = model->getCollisionGeometry(); const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = model->getCollisionGeometry();
if (!collisionNetworkGeometry || !collisionNetworkGeometry->isLoaded()) { if (collisionNetworkGeometry && collisionNetworkGeometry->isLoaded()) {
result = &collisionNetworkGeometry->getFBXGeometry(); result = &collisionNetworkGeometry->getFBXGeometry();
} }
} }

6
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -397,8 +397,8 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = _model->getCollisionGeometry(); const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = _model->getCollisionGeometry();
const QSharedPointer<NetworkGeometry> renderNetworkGeometry = _model->getGeometry(); const QSharedPointer<NetworkGeometry> renderNetworkGeometry = _model->getGeometry();
if ((!collisionNetworkGeometry && collisionNetworkGeometry->isLoadedWithTextures()) && if ((collisionNetworkGeometry && collisionNetworkGeometry->isLoadedWithTextures()) &&
(!renderNetworkGeometry && renderNetworkGeometry->isLoadedWithTextures())) { (renderNetworkGeometry && renderNetworkGeometry->isLoadedWithTextures())) {
// we have both URLs AND both geometries AND they are both fully loaded. // we have both URLs AND both geometries AND they are both fully loaded.
return true; return true;
} }
@ -419,7 +419,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
// should never fall in here when collision model not fully loaded // should never fall in here when collision model not fully loaded
// hence we assert collisionNetworkGeometry is not NULL // hence we assert collisionNetworkGeometry is not NULL
assert(!collisionNetworkGeometry); assert(collisionNetworkGeometry);
const FBXGeometry& collisionGeometry = collisionNetworkGeometry->getFBXGeometry(); const FBXGeometry& collisionGeometry = collisionNetworkGeometry->getFBXGeometry();
const QSharedPointer<NetworkGeometry> renderNetworkGeometry = _model->getGeometry(); const QSharedPointer<NetworkGeometry> renderNetworkGeometry = _model->getGeometry();

4
libraries/render-utils/src/AnimationHandle.cpp
View file

@ -111,7 +111,7 @@ void AnimationHandle::setAnimationDetails(const AnimationDetails& details) {
void AnimationHandle::simulate(float deltaTime) { void AnimationHandle::simulate(float deltaTime) {
if (!_animation->isLoaded()) { if (!_animation || !_animation->isLoaded()) {
return; return;
} }
@ -151,7 +151,7 @@ void AnimationHandle::simulate(float deltaTime) {
} }
void AnimationHandle::applyFrame(float frameIndex) { void AnimationHandle::applyFrame(float frameIndex) {
if (!_animation->isLoaded()) { if (!_animation || !_animation->isLoaded()) {
return; return;
} }

2
libraries/render-utils/src/GeometryCache.cpp
View file

@ -1942,7 +1942,7 @@ QSharedPointer<NetworkGeometry> NetworkGeometry::getLODOrFallback(float distance
} }
} }
} }
if (lod->isLoaded()) { if (lod && lod->isLoaded()) {
hysteresis = lodDistance; hysteresis = lodDistance;
return lod; return lod;
} }