Merge branch 'baseball' of github.com:birarda/hifi into baseball

examples/baseball/createBatButton.js

@@ -0,0 +1,61 @@
+//
+//  createBatButton.js
+//  examples/baseball/moreBatsButton.js
+//
+//  Created by Stephen Birarda on 10/28/2015.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function(){
+    this.clickReleaseOnEntity = function(entityID, mouseEvent) {
+        if (!mouseEvent.isLeftButton) {
+            return;
+        }
+        this.dropBats();
+    };
+    this.startNearGrabNonColliding = function() {
+        this.dropBats();
+    };
+    this.dropBats = function() {
+      // if the bat box is near us, grab it's position
+      var nearby = Entities.findEntities(this.position, 20);
+
+      nearby.forEach(function(id) {
+          var properties = Entities.getEntityProperties(id, ["name", "position"]);
+          if (properties.name && properties.name == "Bat Box") {
+              boxPosition = properties.position;
+          }
+      });
+
+      var BAT_DROP_HEIGHT = 2.0;
+
+      var dropPosition;
+
+      if (!boxPosition) {
+          // we got no bat box position, drop in front of the avatar instead
+      } else {
+          // drop the bat above the bat box
+          dropPosition = Vec3.sum(boxPosition, { x: 0.0, y: BAT_DROP_HEIGHT, z: 0.0});
+      }
+
+      var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx";
+      var BAT_COLLISION_HULL = "atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj";
+
+      // add the fresh bat at the drop position
+      var bat = Entities.addEntity({
+          name: 'Bat',
+          type: "Model",
+          modelURL: BAT_MODEL,
+          position: dropPosition,
+          compoundShapeURL: BAT_COLLISION_HULL,
+          collisionsWillMove: true,
+          velocity: { x: 0, y: 0.05, z: 0}, // workaround for gravity not taking effect on add
+          gravity: { x: 0, y: -9.81, z: 0},
+          rotation: Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0),
+          userData: '{"grabbableKey":{"spatialKey":{"relativePosition":{"x":0.9,"y":0,"z":0},"relativeRotation":{"x":0,"y":0,"z":0.4617486000061035,"w":0.8870108127593994}},"kinematicGrab":true}}'
+      });
+    }
+})

interface/src/avatar/MyAvatar.cpp

@@ -545,7 +545,7 @@ void MyAvatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
     if (!_shouldRender) {
         return; // exit early
     }
-
+    
     Avatar::render(renderArgs, cameraPosition);
 
     // don't display IK constraints in shadow mode
@@ -1431,7 +1431,7 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl
     if (!_skeletonModel.isRenderable()) {
         return; // wait until all models are loaded
     }
-
+    
     fixupModelsInScene();
 
     //  Render head so long as the camera isn't inside it

interface/src/avatar/MyAvatar.h

@@ -273,6 +273,7 @@ public slots:
     void setEnableAnimGraph(bool isEnabled);
     void setEnableDebugDrawBindPose(bool isEnabled);
     void setEnableDebugDrawAnimPose(bool isEnabled);
+    bool getEnableMeshVisible() const { return _skeletonModel.isVisible(); }
     void setEnableMeshVisible(bool isEnabled);
     void setAnimGraphUrl(const QString& url) { _animGraphUrl = url; }
 
@@ -295,7 +296,7 @@ private:
     virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPositio) override;
     virtual void renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, float glowLevel = 0.0f) override;
     virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
-    void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; }
+    void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }
     bool getShouldRenderLocally() const { return _shouldRender; }
     bool getDriveKeys(int key) { return _driveKeys[key] != 0.0f; };
     bool isMyAvatar() const override { return true; }

libraries/script-engine/src/ScriptEngine.h

@@ -55,62 +55,62 @@ public:
     ScriptEngine(const QString& scriptContents = NO_SCRIPT,
                  const QString& fileNameString = QString(""),
                  bool wantSignals = true);
-
+    
     ~ScriptEngine();
-
+    
     /// run the script in a dedicated thread. This will have the side effect of evalulating
     /// the current script contents and calling run(). Callers will likely want to register the script with external
     /// services before calling this.
     void runInThread();
-
+    
     /// run the script in the callers thread, exit when stop() is called.
     void run();
     
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - these are NOT intended to be public interfaces available to scripts, the are only Q_INVOKABLE so we can
     //        properly ensure they are only called on the correct thread
-
+    
     /// registers a global object by name
     Q_INVOKABLE void registerGlobalObject(const QString& name, QObject* object);
-
+    
     /// registers a global getter/setter
     Q_INVOKABLE void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,
-                            QScriptEngine::FunctionSignature setter, const QString& parent = QString(""));
+                                          QScriptEngine::FunctionSignature setter, const QString& parent = QString(""));
     
     /// register a global function
     Q_INVOKABLE void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1);
-
+    
     /// register a function as a method on a previously registered global object
     Q_INVOKABLE void registerFunction(const QString& parent, const QString& name, QScriptEngine::FunctionSignature fun,
-                          int numArguments = -1);
-
+                                      int numArguments = -1);
+    
     /// registers a global object by name
     Q_INVOKABLE void registerValue(const QString& valueName, QScriptValue value);
-
+    
     /// evaluate some code in the context of the ScriptEngine and return the result
     Q_INVOKABLE QScriptValue evaluate(const QString& program, const QString& fileName, int lineNumber = 1); // this is also used by the script tool widget
-
+    
     /// if the script engine is not already running, this will download the URL and start the process of seting it up
-    /// to run... NOTE - this is used by Application currently to load the url. We don't really want it to be exposed 
+    /// to run... NOTE - this is used by Application currently to load the url. We don't really want it to be exposed
     /// to scripts. we may not need this to be invokable
     void loadURL(const QUrl& scriptURL, bool reload);
-
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // NOTE - these are intended to be public interfaces available to scripts 
+    // NOTE - these are intended to be public interfaces available to scripts
     Q_INVOKABLE void addEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler);
     Q_INVOKABLE void removeEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler);
-
+    
     Q_INVOKABLE void load(const QString& loadfile);
     Q_INVOKABLE void include(const QStringList& includeFiles, QScriptValue callback = QScriptValue());
     Q_INVOKABLE void include(const QString& includeFile, QScriptValue callback = QScriptValue());
-
+    
     Q_INVOKABLE QObject* setInterval(const QScriptValue& function, int intervalMS);
     Q_INVOKABLE QObject* setTimeout(const QScriptValue& function, int timeoutMS);
     Q_INVOKABLE void clearInterval(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
     Q_INVOKABLE void clearTimeout(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
     Q_INVOKABLE void print(const QString& message);
     Q_INVOKABLE QUrl resolvePath(const QString& path) const;
-
+    
     // Entity Script Related methods
     Q_INVOKABLE void loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload = false); // will call the preload method once loaded
     Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method
@@ -118,33 +118,33 @@ public:
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName);
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const MouseEvent& event);
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision);
-
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - this is intended to be a public interface for Agent scripts, and local scripts, but not for EntityScripts
     Q_INVOKABLE void stop();
-
+    
     bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget
     bool isRunning() const { return _isRunning; } // used by ScriptWidget
-
+    
     static void stopAllScripts(QObject* application); // used by Application on shutdown
-
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - These are the callback implementations for ScriptUser the get called by ScriptCache when the contents
     // of a script are available.
     virtual void scriptContentsAvailable(const QUrl& url, const QString& scriptContents);
     virtual void errorInLoadingScript(const QUrl& url);
-
+    
     // These are currently used by Application to track if a script is user loaded or not. Consider finding a solution
     // inside of Application so that the ScriptEngine class is not polluted by this notion
     void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded; }
     bool isUserLoaded() const { return _isUserLoaded; }
-
+    
     // NOTE - this is used by the TypedArray implemetation. we need to review this for thread safety
     ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; }
-
+    
 public slots:
     void callAnimationStateHandler(QScriptValue callback, AnimVariantMap parameters, QStringList names, bool useNames, AnimVariantResultHandler resultHandler);
-
+    
 signals:
     void scriptLoaded(const QString& scriptFilename);
     void errorLoadingScript(const QString& scriptFilename);
@@ -159,7 +159,7 @@ signals:
     void loadScript(const QString& scriptName, bool isUserLoaded);
     void reloadScript(const QString& scriptName, bool isUserLoaded);
     void doneRunning();
-
+    
 protected:
     QString _scriptContents;
     QString _parentURL;
@@ -179,30 +179,30 @@ private:
     void timerFired();
     void stopAllTimers();
     void refreshFileScript(const EntityItemID& entityID);
-
+    
     void setParentURL(const QString& parentURL) { _parentURL = parentURL; }
-
+    
     QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
     void stopTimer(QTimer* timer);
-
+    
     QString _fileNameString;
     Quat _quatLibrary;
     Vec3 _vec3Library;
     ScriptUUID _uuidLibrary;
     bool _isUserLoaded;
     bool _isReloading;
-
+    
     ArrayBufferClass* _arrayBufferClass;
-
+    
     QHash<EntityItemID, RegisteredEventHandlers> _registeredHandlers;
     void forwardHandlerCall(const EntityItemID& entityID, const QString& eventName, QScriptValueList eventHanderArgs);
     Q_INVOKABLE void entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success);
-
+    
     static QSet<ScriptEngine*> _allKnownScriptEngines;
     static QMutex _allScriptsMutex;
     static bool _stoppingAllScripts;
     static bool _doneRunningThisScript;
-
+    
 };
 
-#endif // hifi_ScriptEngine_h
+#endif // hifi_ScriptEngine_h