Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sam just left

Browse source
This commit is contained in:
James B. Pollack 2015-12-09 17:28:45 -08:00
parent a99542e298
commit b4c272aaa1
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
View file

@ -60,8 +60,7 @@ public:
void setTexture(gpu::TexturePointer texture) { _texture = texture; }
const gpu::TexturePointer& getTexture() const { return _texture; }
bool getVisibleFlag() const { return _visibleFlag; }
void setVisibleFlag(bool visibleFlag) { _visibleFlag = visibleFlag; }
bool getVisibleFlag() const { return _entity->isVisible(); }
void render(RenderArgs* args) const {
assert(_pipeline);
@ -91,7 +90,7 @@ protected:
gpu::BufferPointer _vertexBuffer;
gpu::BufferPointer _indexBuffer;
gpu::TexturePointer _texture;
bool _visibleFlag = true;
};
namespace render {
@ -111,7 +110,11 @@ namespace render {
template <>
void payloadRender(const ParticlePayload::Pointer& payload, RenderArgs* args) {
payload->render(args);
if (args) {
if (payload && payload->getVisibleFlag()) {
payload->render(args);
}
}
}
}

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -82,7 +82,7 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) {
}
Q_DECLARE_METATYPE(controller::InputController*)
static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
//static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
return engine->newQObject(in);