Merge branch 'WorkingEnergy'

Babiuch, Ryan Nicholas committed 10 years ago

Commit 786400e2 parents d7951f4 3cb2f9c3 files · +21 −19Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+12−8

     auto density = propertiesWithSimID.getDensity();
     auto newVelocity = propertiesWithSimID.getVelocity().length();
     double cost = calculateCost(density*volume, 0, newVelocity);
-    cost *= ENTITY_MANIPULATION_MULTIPLIER; //try this as a constant for now
+    cost *= costMultiplier;
     if(cost > _currentAvatarEnergy) {
         return QUuid();
     auto density = properties.getDensity();
     auto newVelocity = properties.getVelocity().length();
     double cost = calculateCost(density*volume, 0, newVelocity);
-    cost *= ENTITY_MANIPULATION_MULTIPLIER;
+    cost *= costMultiplier;
     if(cost > _currentAvatarEnergy) {
         return QUuid();
                 auto density = entity->getDensity();
                 auto velocity = entity->getVelocity().length();
                 double cost = calculateCost(density*volume, velocity, 0);
-                cost *= ENTITY_MANIPULATION_MULTIPLIER;
+                cost *= costMultiplier;
                 if(cost > _currentAvatarEnergy) {
                     return;
     return result;
 }
-void EntityScriptingInterface::addCostFunction(QScriptValue costFunction) {
+float EntityScriptingInterface::calculateCost(float mass, float oldVelocity,float newVelocity) {
-    _costFunction = &costFunction;
-}
-double EntityScriptingInterface::calculateCost(float mass, float oldVelocity,float newVelocity) {
     return std::abs(mass * (newVelocity - oldVelocity));
 }
   //  qCDebug(entities) << "NEW AVATAR ENERGY IN ENTITY SCRIPTING INTERFACE: " << energy;
     _currentAvatarEnergy = energy;
 }
+float EntityScriptingInterface::getCostMultiplier() {
+    return costMultiplier;
+}
+void EntityScriptingInterface::setCostMultiplier(float value) {
+    costMultiplier = value;
+}