Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:24:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR

Browse source
This commit is contained in:
Atlante45 2015-10-09 13:18:05 -07:00
parent ae83dfe041
commit 3e71c4cc4e
6 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/AnimationPropertyGroup.h
View file

@ -31,8 +31,6 @@ class ReadBitstreamToTreeParams;
class AnimationPropertyGroup : public PropertyGroup { class AnimationPropertyGroup : public PropertyGroup {
public: public:
AnimationPropertyGroup() = default;
virtual ~AnimationPropertyGroup() = default;
void associateWithAnimationLoop(AnimationLoop* animationLoop) { _animationLoop = animationLoop; } void associateWithAnimationLoop(AnimationLoop* animationLoop) { _animationLoop = animationLoop; }
// EntityItemProperty related helpers // EntityItemProperty related helpers

3
libraries/entities/src/AtmospherePropertyGroup.h
View file

@ -49,9 +49,6 @@ class ReadBitstreamToTreeParams;
class AtmospherePropertyGroup : public PropertyGroup { class AtmospherePropertyGroup : public PropertyGroup {
public: public:
AtmospherePropertyGroup() = default;
virtual ~AtmospherePropertyGroup() = default;
// EntityItemProperty related helpers // EntityItemProperty related helpers
virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const; virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings); virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);

3
libraries/entities/src/PropertyGroup.h
View file

@ -51,8 +51,7 @@ class ReadBitstreamToTreeParams;
class PropertyGroup { class PropertyGroup {
public: public:
PropertyGroup() {} virtual ~PropertyGroup() = default;
virtual ~PropertyGroup() {}
// EntityItemProperty related helpers // EntityItemProperty related helpers
virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const = 0; virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const = 0;

3
libraries/entities/src/SkyboxPropertyGroup.h
View file

@ -29,9 +29,6 @@ class ReadBitstreamToTreeParams;
class SkyboxPropertyGroup : public PropertyGroup { class SkyboxPropertyGroup : public PropertyGroup {
public: public:
SkyboxPropertyGroup() = default;
virtual ~SkyboxPropertyGroup() = default;
// EntityItemProperty related helpers // EntityItemProperty related helpers
virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const; virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings); virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);

3
libraries/entities/src/StagePropertyGroup.h
View file

@ -29,9 +29,6 @@ class ReadBitstreamToTreeParams;
class StagePropertyGroup : public PropertyGroup { class StagePropertyGroup : public PropertyGroup {
public: public:
StagePropertyGroup() = default;
virtual ~StagePropertyGroup() = default;
// EntityItemProperty related helpers // EntityItemProperty related helpers
virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const; virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings); virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);

3
tests/entities/src/main.cpp
View file

@ -16,9 +16,10 @@
#include <QDir> #include <QDir>
#include <ByteCountCoding.h> #include <ByteCountCoding.h>
#include <PathUtils.h>
#include <BoxEntityItem.h> #include <BoxEntityItem.h>
#include <EntityItemProperties.h>
#include <Octree.h> #include <Octree.h>
#include <PathUtils.h>
const QString& getTestResourceDir() { const QString& getTestResourceDir() {
static QString dir; static QString dir;