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

adapting to entitypointer merge

Browse source
This commit is contained in:
Seth Alves 2015-05-27 08:59:44 -07:00
parent b02e452b19
commit f310da9cd3
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@
#include "EntityTreeRenderer.h" #include "EntityTreeRenderer.h"
#include "RenderablePolyVoxEntityItem.h" #include "RenderablePolyVoxEntityItem.h"
EntityItem* RenderablePolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { EntityItemPointer RenderablePolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
return new RenderablePolyVoxEntityItem(entityID, properties); return new RenderablePolyVoxEntityItem(entityID, properties);
} }

2
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
View file

@ -19,7 +19,7 @@
class RenderablePolyVoxEntityItem : public PolyVoxEntityItem { class RenderablePolyVoxEntityItem : public PolyVoxEntityItem {
public: public:
static EntityItem* factory(const EntityItemID& entityID, const EntityItemProperties& properties); static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
RenderablePolyVoxEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : RenderablePolyVoxEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
PolyVoxEntityItem(entityItemID, properties) { } PolyVoxEntityItem(entityItemID, properties) { }

3
libraries/entities/src/PolyVoxEntityItem.cpp
View file

@ -26,8 +26,7 @@ const QByteArray PolyVoxEntityItem::DEFAULT_VOXEL_DATA(qCompress(QByteArray(0),
const int PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE = 0; const int PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE = 0;
EntityItemPointer PolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { EntityItemPointer PolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
EntityItem* result = new PolyVoxEntityItem(entityID, properties); return EntityItemPointer(new PolyVoxEntityItem(entityID, properties));
return result;
} }
PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :