modifications to hook shared classes to iOS

hifi.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   # s.exclude_files = 'Classes/Exclude'
   
   s.subspec "shared" do |sp|
-    sp.source_files = "libraries/shared/src"
+    sp.source_files = 'libraries/shared/src', 'libraries/shared/moc_*'
     sp.exclude_files = "libraries/shared/src/UrlReader.*"
     sp.dependency 'glm'
     sp.xcconfig = { 'CLANG_CXX_LIBRARY' => "libc++" }
@@ -47,9 +47,12 @@ Pod::Spec.new do |s|
   end
   
   s.subspec "avatars" do |sp|
-    sp.source_files = "libraries/avatar/src"
+    sp.source_files = 'libraries/avatars/src', 'libraries/avatars/moc_*'
     sp.dependency 'glm'
   end
+  
+  s.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/../../qt5-device/qtbase/include' }
+  s.libraries = 'libQtCoreCombined', 'libQt5Network', 'libQt5Script'
 
   # A list of file patterns which select the header files that should be
   # made available to the application. If the pattern is a directory then the

libraries/avatars/src/Agent.cpp

@@ -31,7 +31,7 @@ void Agent::run(QUrl scriptURL) {
     
     AvatarData *someObject = new AvatarData;
     
-    QScriptValue objectValue = engine.newObject();
+    QScriptValue objectValue = engine.newQObject(someObject);
     engine.globalObject().setProperty("AvatarData", objectValue);
     
     qDebug() << "Execution of script:" << engine.evaluate(scriptString).toString();

libraries/avatars/src/AvatarData.cpp

@@ -14,7 +14,7 @@
 #include <PacketHeaders.h>
 
 #include "AvatarData.h"
-#include <VoxelConstants.h>
+//#include <VoxelConstants.h>
 
 using namespace std;
 
@@ -277,7 +277,8 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
 }
 
 glm::vec3 AvatarData::calculateCameraDirection() const {
-    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
+//    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
+    glm::vec3 direction;
     return direction;
 }
 

libraries/avatars/src/AvatarData.h

@@ -106,6 +106,9 @@ public:
     void setHeadData(HeadData* headData) { _headData = headData; }
     void setHandData(HandData* handData) { _handData = handData; }
     
+public slots:
+    void setPosition(float x, float y, float z) { _position = glm::vec3(x, y, z); }
+    
 protected:
     glm::vec3 _position;
     glm::vec3 _handPosition;

libraries/avatars/src/HandData.h

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include <glm/glm.hpp>
-#include <glm/gtx/quaternion.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 class AvatarData;
 class FingerData;

libraries/shared/src/Node.cpp

@@ -21,7 +21,7 @@
 #include "SharedUtil.h"
 #include "UDPSocket.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 int unpackNodeId(unsigned char* packedData, uint16_t* nodeId) {
     memcpy(nodeId, packedData, sizeof(uint16_t));

libraries/shared/src/Node.h

@@ -18,7 +18,7 @@
 #include <sys/socket.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "NodeData.h"
 #include "SimpleMovingAverage.h"

libraries/shared/src/NodeList.cpp

@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <cstdio>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "NodeList.h"
 #include "NodeTypes.h"

libraries/shared/src/NodeList.h

@@ -14,7 +14,7 @@
 #include <iterator>
 #include <unistd.h>
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 #include "Node.h"
 #include "NodeTypes.h"

libraries/shared/src/OctalCode.cpp

@@ -11,7 +11,7 @@
 #include <cmath>
 #include <cstring>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "SharedUtil.h"
 #include "OctalCode.h"

libraries/shared/src/PacketHeaders.cpp

@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "PacketHeaders.h"
 

libraries/shared/src/PerfStat.cpp

@@ -14,7 +14,7 @@
 #include <map>
 #include <string>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "PerfStat.h"
 

libraries/shared/src/SharedUtil.cpp

@@ -20,7 +20,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "OctalCode.h"
 #include "PacketHeaders.h"

libraries/shared/src/SharedUtil.h

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #ifdef _WIN32
 #include "Systime.h"

libraries/shared/src/UDPSocket.cpp

@@ -20,7 +20,7 @@
 #include <unistd.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "UDPSocket.h"