Merge pull request #9961 from Atlante45/feat/delete_dead_code

Delete old sitting points code

libraries/entities/src/EntityItemProperties.cpp

@@ -49,13 +49,6 @@ EntityItemProperties::EntityItemProperties(EntityPropertyFlags desiredProperties
 
 }
 
-void EntityItemProperties::setSittingPoints(const QVector<SittingPoint>& sittingPoints) {
-    _sittingPoints.clear();
-    foreach (SittingPoint sitPoint, sittingPoints) {
-        _sittingPoints.append(sitPoint);
-    }
-}
-
 void EntityItemProperties::calculateNaturalPosition(const glm::vec3& min, const glm::vec3& max) {
     glm::vec3 halfDimension = (max - min) / 2.0f;
     _naturalPosition = max - halfDimension;
@@ -546,20 +539,6 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_TEXTURES, textures);
     }
 
-    // Sitting properties support
-    if (!skipDefaults && !strictSemantics) {
-        QScriptValue sittingPoints = engine->newObject();
-        for (int i = 0; i < _sittingPoints.size(); ++i) {
-            QScriptValue sittingPoint = engine->newObject();
-            sittingPoint.setProperty("name", _sittingPoints.at(i).name);
-            sittingPoint.setProperty("position", vec3toScriptValue(engine, _sittingPoints.at(i).position));
-            sittingPoint.setProperty("rotation", quatToScriptValue(engine, _sittingPoints.at(i).rotation));
-            sittingPoints.setProperty(i, sittingPoint);
-        }
-        sittingPoints.setProperty("length", _sittingPoints.size());
-        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_ALWAYS(sittingPoints, sittingPoints); // gettable, but not settable
-    }
-
     if (!skipDefaults && !strictSemantics) {
         AABox aaBox = getAABox();
         QScriptValue boundingBox = engine->newObject();

libraries/entities/src/EntityItemProperties.h

@@ -22,7 +22,6 @@
 #include <QString>
 
 #include <AACube.h>
-#include <FBXReader.h> // for SittingPoint
 #include <NumericalConstants.h>
 #include <PropertyFlags.h>
 #include <OctreeConstants.h>
@@ -255,8 +254,6 @@ public:
     void clearID() { _id = UNKNOWN_ENTITY_ID; _idSet = false; }
     void markAllChanged();
 
-    void setSittingPoints(const QVector<SittingPoint>& sittingPoints);
-
     const glm::vec3& getNaturalDimensions() const { return _naturalDimensions; }
     void setNaturalDimensions(const glm::vec3& value) { _naturalDimensions = value; }
     
@@ -325,7 +322,6 @@ private:
 
     // NOTE: The following are pseudo client only properties. They are only used in clients which can access
     // properties of model geometry. But these properties are not serialized like other properties.
-    QVector<SittingPoint> _sittingPoints;
     QVariantMap _textureNames;
     glm::vec3 _naturalDimensions;
     glm::vec3 _naturalPosition;

libraries/entities/src/EntityScriptingInterface.cpp

@@ -292,13 +292,11 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
 
                 results = entity->getProperties(desiredProperties);
 
-                // TODO: improve sitting points and naturalDimensions in the future,
-                //       for now we've included the old sitting points model behavior for entity types that are models
-                //        we've also added this hack for setting natural dimensions of models
+                // TODO: improve naturalDimensions in the future,
+                //       for now we've added this hack for setting natural dimensions of models
                 if (entity->getType() == EntityTypes::Model) {
                     const FBXGeometry* geometry = _entityTree->getGeometryForEntity(entity);
                     if (geometry) {
-                        results.setSittingPoints(geometry->sittingPoints);
                         Extents meshExtents = geometry->getUnscaledMeshExtents();
                         results.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
                         results.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);

libraries/entities/src/PropertyGroup.h

@@ -14,9 +14,11 @@
 
 #include <QtScript/QScriptEngine>
 
-//#include "EntityItemProperties.h"
+#include <OctreeElement.h>
+
 #include "EntityPropertyFlags.h"
 
+
 class EntityItemProperties;
 class EncodeBitstreamParams;
 class OctreePacketData;
@@ -24,31 +26,6 @@ class EntityTreeElementExtraEncodeData;
 class ReadBitstreamToTreeParams;
 using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElementExtraEncodeData>;
 
-#include <OctreeElement.h>
-
-/*
-#include <stdint.h>
-
-#include <glm/glm.hpp>
-#include <glm/gtx/extented_min_max.hpp>
-
-#include <QtCore/QObject>
-#include <QVector>
-#include <QString>
-
-#include <AACube.h>
-#include <FBXReader.h> // for SittingPoint
-#include <PropertyFlags.h>
-#include <OctreeConstants.h>
-#include <ShapeInfo.h>
-
-#include "EntityItemID.h"
-#include "PropertyGroupMacros.h"
-#include "EntityTypes.h"
-*/
-
-//typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;
-
 
 class PropertyGroup {
 public:

libraries/fbx/src/FBXReader.cpp

@@ -1795,19 +1795,6 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     }
     geometry.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
 
-    // Add sitting points
-    QVariantHash sittingPoints = mapping.value("sit").toHash();
-    for (QVariantHash::const_iterator it = sittingPoints.constBegin(); it != sittingPoints.constEnd(); it++) {
-        SittingPoint sittingPoint;
-        sittingPoint.name = it.key();
-
-        QVariantList properties = it->toList();
-        sittingPoint.position = parseVec3(properties.at(0).toString());
-        sittingPoint.rotation = glm::quat(glm::radians(parseVec3(properties.at(1).toString())));
-
-        geometry.sittingPoints.append(sittingPoint);
-    }
-
     // attempt to map any meshes to a named model
     for (QHash<QString, int>::const_iterator m = meshIDsToMeshIndices.constBegin();
             m != meshIDsToMeshIndices.constEnd(); m++) {

libraries/fbx/src/FBXReader.h

@@ -265,24 +265,6 @@ public:
 Q_DECLARE_METATYPE(FBXAnimationFrame)
 Q_DECLARE_METATYPE(QVector<FBXAnimationFrame>)
 
-/// A point where an avatar can sit
-class SittingPoint {
-public:
-    QString name;
-    glm::vec3 position; // relative postion
-    glm::quat rotation; // relative orientation
-};
-
-inline bool operator==(const SittingPoint& lhs, const SittingPoint& rhs)
-{
-    return (lhs.name == rhs.name) && (lhs.position == rhs.position) && (lhs.rotation == rhs.rotation);
-}
-
-inline bool operator!=(const SittingPoint& lhs, const SittingPoint& rhs)
-{
-    return (lhs.name != rhs.name) || (lhs.position != rhs.position) || (lhs.rotation != rhs.rotation);
-}
-
 /// A set of meshes extracted from an FBX document.
 class FBXGeometry {
 public:
@@ -320,8 +302,6 @@ public:
     
     glm::vec3 palmDirection;
     
-    QVector<SittingPoint> sittingPoints;
-    
     glm::vec3 neckPivot;
     
     Extents bindExtents;