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

copy box to make a new type of line entity item

Browse source
This commit is contained in:
Seth Alves 2015-05-11 19:25:14 -07:00
parent 866a6fba9b
commit 4881b0c53c
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include "RenderableSphereEntityItem.h" #include "RenderableSphereEntityItem.h"
#include "RenderableTextEntityItem.h" #include "RenderableTextEntityItem.h"
#include "RenderableZoneEntityItem.h" #include "RenderableZoneEntityItem.h"
#include "RenderableLineEntityItem.h"
#include "EntitiesRendererLogging.h" #include "EntitiesRendererLogging.h"
EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState, EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
@ -59,6 +60,7 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
REGISTER_ENTITY_TYPE_WITH_FACTORY(Text, RenderableTextEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Text, RenderableTextEntityItem::factory)
REGISTER_ENTITY_TYPE_WITH_FACTORY(ParticleEffect, RenderableParticleEffectEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(ParticleEffect, RenderableParticleEffectEntityItem::factory)
REGISTER_ENTITY_TYPE_WITH_FACTORY(Zone, RenderableZoneEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Zone, RenderableZoneEntityItem::factory)
REGISTER_ENTITY_TYPE_WITH_FACTORY(Line, RenderableLineEntityItem::factory)
_currentHoverOverEntityID = EntityItemID::createInvalidEntityID(); // makes it the unknown ID _currentHoverOverEntityID = EntityItemID::createInvalidEntityID(); // makes it the unknown ID
_currentClickingOnEntityID = EntityItemID::createInvalidEntityID(); // makes it the unknown ID _currentClickingOnEntityID = EntityItemID::createInvalidEntityID(); // makes it the unknown ID

1
libraries/entities/src/EntityItemProperties.h
View file

@ -52,6 +52,7 @@ class EntityItemProperties {
friend class TextEntityItem; // TODO: consider removing this friend relationship and use public methods friend class TextEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
public: public:
EntityItemProperties(); EntityItemProperties();
virtual ~EntityItemProperties(); virtual ~EntityItemProperties();

2
libraries/entities/src/EntityTypes.cpp
View file

@ -25,6 +25,7 @@
#include "SphereEntityItem.h" #include "SphereEntityItem.h"
#include "TextEntityItem.h" #include "TextEntityItem.h"
#include "ZoneEntityItem.h" #include "ZoneEntityItem.h"
#include "LineEntityItem.h"
QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap; QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
QMap<QString, EntityTypes::EntityType> EntityTypes::_nameToTypeMap; QMap<QString, EntityTypes::EntityType> EntityTypes::_nameToTypeMap;
@ -41,6 +42,7 @@ REGISTER_ENTITY_TYPE(Light)
REGISTER_ENTITY_TYPE(Text) REGISTER_ENTITY_TYPE(Text)
REGISTER_ENTITY_TYPE(ParticleEffect) REGISTER_ENTITY_TYPE(ParticleEffect)
REGISTER_ENTITY_TYPE(Zone) REGISTER_ENTITY_TYPE(Zone)
REGISTER_ENTITY_TYPE(Line)
const QString& EntityTypes::getEntityTypeName(EntityType entityType) { const QString& EntityTypes::getEntityTypeName(EntityType entityType) {
QMap<EntityType, QString>::iterator matchedTypeName = _typeToNameMap.find(entityType); QMap<EntityType, QString>::iterator matchedTypeName = _typeToNameMap.find(entityType);

7
libraries/entities/src/EntityTypes.h
View file

@ -35,9 +35,10 @@ public:
Sphere, Sphere,
Light, Light,
Text, Text,
ParticleEffect, ParticleEffect,
Zone, Zone,
LAST = Zone Line,
LAST = Line
} EntityType; } EntityType;
static const QString& getEntityTypeName(EntityType entityType); static const QString& getEntityTypeName(EntityType entityType);

3
libraries/shared/src/ShapeInfo.h
View file

@ -31,7 +31,8 @@ enum ShapeType {
SHAPE_TYPE_CAPSULE_Z, SHAPE_TYPE_CAPSULE_Z,
SHAPE_TYPE_CYLINDER_X, SHAPE_TYPE_CYLINDER_X,
SHAPE_TYPE_CYLINDER_Y, SHAPE_TYPE_CYLINDER_Y,
SHAPE_TYPE_CYLINDER_Z SHAPE_TYPE_CYLINDER_Z,
SHAPE_TYPE_LINE
}; };
class ShapeInfo { class ShapeInfo {