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

reverted protocol change for images

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-01-22 11:36:58 -08:00
parent 576d683d3b
commit ceb621a521
8 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/entities/src/EntityItemProperties.cpp
View file

@ -350,7 +350,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
CHECK_PROPERTY_CHANGE(PROP_AMBIENT_LIGHT_MODE, ambientLightMode); CHECK_PROPERTY_CHANGE(PROP_AMBIENT_LIGHT_MODE, ambientLightMode);
CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode); CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode);
CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL); //CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL);
CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl); CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize); CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
@ -593,9 +593,9 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
} }
// Image only // Image only
if (_type == EntityTypes::Image) { /*if (_type == EntityTypes::Image) {
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL); COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL);
} }*/
// Web only // Web only
if (_type == EntityTypes::Web) { if (_type == EntityTypes::Web) {
@ -1144,7 +1144,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t); ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
ADD_PROPERTY_TO_MAP(PROP_NAME, Name, name, QString); ADD_PROPERTY_TO_MAP(PROP_NAME, Name, name, QString);
ADD_PROPERTY_TO_MAP(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString); ADD_PROPERTY_TO_MAP(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString);
ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString); //ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString);
ADD_PROPERTY_TO_MAP(PROP_LINE_WIDTH, LineWidth, lineWidth, float); ADD_PROPERTY_TO_MAP(PROP_LINE_WIDTH, LineWidth, lineWidth, float);
ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>); ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>);
ADD_PROPERTY_TO_MAP(PROP_HREF, Href, href, QString); ADD_PROPERTY_TO_MAP(PROP_HREF, Href, href, QString);
@ -1381,9 +1381,9 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
APPEND_ENTITY_PROPERTY(PROP_DPI, properties.getDPI()); APPEND_ENTITY_PROPERTY(PROP_DPI, properties.getDPI());
} }
if (properties.getType() == EntityTypes::Image) { /*if (properties.getType() == EntityTypes::Image) {
APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, properties.getImageURL()); APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, properties.getImageURL());
} }*/
if (properties.getType() == EntityTypes::Text) { if (properties.getType() == EntityTypes::Text) {
APPEND_ENTITY_PROPERTY(PROP_TEXT, properties.getText()); APPEND_ENTITY_PROPERTY(PROP_TEXT, properties.getText());
@ -1746,9 +1746,9 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DPI, uint16_t, setDPI); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DPI, uint16_t, setDPI);
} }
if (properties.getType() == EntityTypes::Image) { /*if (properties.getType() == EntityTypes::Image) {
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IMAGE_URL, QString, setImageURL); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IMAGE_URL, QString, setImageURL);
} }*/
if (properties.getType() == EntityTypes::Text) { if (properties.getType() == EntityTypes::Text) {
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT, QString, setText); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT, QString, setText);

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

@ -67,7 +67,7 @@ class EntityItemProperties {
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 WebEntityItem; // TODO: consider removing this friend relationship and use public methods friend class WebEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class ImageEntityItem; //friend class ImageEntityItem;
friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods
friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods

4
libraries/entities/src/EntityPropertyFlags.h
View file

@ -42,8 +42,8 @@ enum EntityPropertyList {
PROP_ANIMATION_ALLOW_TRANSLATION, PROP_ANIMATION_ALLOW_TRANSLATION,
PROP_RELAY_PARENT_JOINTS, PROP_RELAY_PARENT_JOINTS,
// for image /*// for image
PROP_IMAGE_URL, PROP_IMAGE_URL,*/
// these properties are supported by the EntityItem base class // these properties are supported by the EntityItem base class
PROP_REGISTRATION_POINT, PROP_REGISTRATION_POINT,

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

@ -28,7 +28,7 @@
#include "LineEntityItem.h" #include "LineEntityItem.h"
#include "PolyVoxEntityItem.h" #include "PolyVoxEntityItem.h"
#include "PolyLineEntityItem.h" #include "PolyLineEntityItem.h"
#include "ImageEntityItem.h" //#include "ImageEntityItem.h"
#include "ShapeEntityItem.h" #include "ShapeEntityItem.h"
QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap; QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
@ -48,7 +48,7 @@ REGISTER_ENTITY_TYPE(Zone)
REGISTER_ENTITY_TYPE(Line) REGISTER_ENTITY_TYPE(Line)
REGISTER_ENTITY_TYPE(PolyVox) REGISTER_ENTITY_TYPE(PolyVox)
REGISTER_ENTITY_TYPE(PolyLine) REGISTER_ENTITY_TYPE(PolyLine)
REGISTER_ENTITY_TYPE(Image) //REGISTER_ENTITY_TYPE(Image)
REGISTER_ENTITY_TYPE(Shape) REGISTER_ENTITY_TYPE(Shape)
REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory)
REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory)
@ -91,9 +91,6 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
EntityItemPointer newEntityItem = NULL; EntityItemPointer newEntityItem = NULL;
EntityTypeFactory factory = NULL; EntityTypeFactory factory = NULL;
if (entityType >= 0 && entityType <= LAST) { if (entityType >= 0 && entityType <= LAST) {
if (getEntityTypeName(entityType) == "Image") {
entityType = getEntityTypeFromName("Web");
}
factory = _factories[entityType]; factory = _factories[entityType];
} }
if (factory) { if (factory) {

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

@ -48,7 +48,7 @@ public:
Line, Line,
PolyVox, PolyVox,
PolyLine, PolyLine,
Image, //Image,
Shape, Shape,
LAST = Shape LAST = Shape
} EntityType; } EntityType;

8
libraries/entities/src/ImageEntityItem.cpp
View file

@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
/* NOT IN USE
#include <QtCore/QJsonDocument> #include <QtCore/QJsonDocument>
#include <ByteCountCoding.h> #include <ByteCountCoding.h>
@ -127,14 +129,16 @@ QString ImageEntityItem::getImageURL() const {
}); });
} }
/*void ImageEntityItem::computeShapeInfo(ShapeInfo& info) { void ImageEntityItem::computeShapeInfo(ShapeInfo& info) {
// This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc) // This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc)
// is set. // is set.
EntityItem::computeShapeInfo(info); EntityItem::computeShapeInfo(info);
}*/ }
// This value specifies how the shape should be treated by physics calculations. // This value specifies how the shape should be treated by physics calculations.
ShapeType ImageEntityItem::getShapeType() const { ShapeType ImageEntityItem::getShapeType() const {
return _collisionShapeType; return _collisionShapeType;
} }
*/

4
libraries/entities/src/ImageEntityItem.h
View file

@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
/* NOT IN USE
#ifndef hifi_ImageEntityItem_h #ifndef hifi_ImageEntityItem_h
#define hifi_ImageEntityItem_h #define hifi_ImageEntityItem_h
@ -60,3 +62,5 @@ protected:
}; };
#endif // hifi_ImageEntityItem_h #endif // hifi_ImageEntityItem_h
*/

10
scripts/system/edit.js
View file

@ -540,7 +540,7 @@ var toolBar = (function () {
}); });
}); });
// for image button /*// for image button
addButton("newImageButton", "web-01.svg", function () { addButton("newImageButton", "web-01.svg", function () {
print("new image message is received"); print("new image message is received");
createNewEntity({ createNewEntity({
@ -548,6 +548,14 @@ var toolBar = (function () {
dimensions: DEFAULT_DIMENSIONS, dimensions: DEFAULT_DIMENSIONS,
imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg"
}); });
});*/
addButton("newImageButton", "web-01.svg", function () {
createNewEntity({
type: "Model",
dimensions: DEFAULT_DIMENSIONS,
modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx",
textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
});
}); });
addButton("newWebButton", "web-01.svg", function () { addButton("newWebButton", "web-01.svg", function () {