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

Conform to coding standard.

Browse source
This commit is contained in:
Babiuch, Ryan Nicholas 2016-02-04 08:26:56 -06:00
parent 142ec76600
commit dca7ff967c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -1866,7 +1866,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(const MyAvatar& myAvatar, co
float MyAvatar::getAccelerationEnergy() { float MyAvatar::getAccelerationEnergy() {
glm::vec3 velocity = getVelocity(); glm::vec3 velocity = getVelocity();
int changeInVelocity = abs(velocity.length() - priorVelocity.length()); int changeInVelocity = abs(velocity.length() - priorVelocity.length());
float changeInEnergy = priorVelocity.length()*changeInVelocity*AVATAR_MOVEMENT_ENERGY_CONSTANT; float changeInEnergy = priorVelocity.length() * changeInVelocity * AVATAR_MOVEMENT_ENERGY_CONSTANT;
priorVelocity = velocity; priorVelocity = velocity;
return changeInEnergy; return changeInEnergy;
@ -1881,7 +1881,7 @@ void MyAvatar::setEnergy(float value) {
} }
float MyAvatar::getAudioEnergy() { float MyAvatar::getAudioEnergy() {
return getAudioLoudness()*AUDIO_ENERGY_CONSTANT; return getAudioLoudness() * AUDIO_ENERGY_CONSTANT;
} }
bool MyAvatar::didTeleport() { bool MyAvatar::didTeleport() {

14
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -123,10 +123,10 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged()); propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged());
auto dimensions = propertiesWithSimID.getDimensions(); auto dimensions = propertiesWithSimID.getDimensions();
float volume = dimensions.x*dimensions.y*dimensions.z; float volume = dimensions.x * dimensions.y * dimensions.z;
auto density = propertiesWithSimID.getDensity(); auto density = propertiesWithSimID.getDensity();
auto newVelocity = propertiesWithSimID.getVelocity().length(); auto newVelocity = propertiesWithSimID.getVelocity().length();
double cost = calculateCost(density*volume, 0, newVelocity); double cost = calculateCost(density * volume, 0, newVelocity);
cost *= costMultiplier; cost *= costMultiplier;
if(cost > _currentAvatarEnergy) { if(cost > _currentAvatarEnergy) {
@ -231,10 +231,10 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
EntityItemProperties properties = scriptSideProperties; EntityItemProperties properties = scriptSideProperties;
auto dimensions = properties.getDimensions(); auto dimensions = properties.getDimensions();
float volume = dimensions.x*dimensions.y*dimensions.z; float volume = dimensions.x * dimensions.y * dimensions.z;
auto density = properties.getDensity(); auto density = properties.getDensity();
auto newVelocity = properties.getVelocity().length(); auto newVelocity = properties.getVelocity().length();
double cost = calculateCost(density*volume, 0, newVelocity); double cost = calculateCost(density * volume, 0, newVelocity);
cost *= costMultiplier; cost *= costMultiplier;
if(cost > _currentAvatarEnergy) { if(cost > _currentAvatarEnergy) {
@ -351,10 +351,10 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
if (entity) { if (entity) {
auto dimensions = entity->getDimensions(); auto dimensions = entity->getDimensions();
float volume = dimensions.x*dimensions.y*dimensions.z; float volume = dimensions.x * dimensions.y * dimensions.z;
auto density = entity->getDensity(); auto density = entity->getDensity();
auto velocity = entity->getVelocity().length(); auto velocity = entity->getVelocity().length();
double cost = calculateCost(density*volume, velocity, 0); double cost = calculateCost(density * volume, velocity, 0);
cost *= costMultiplier; cost *= costMultiplier;
if(cost > _currentAvatarEnergy) { if(cost > _currentAvatarEnergy) {
@ -1041,7 +1041,7 @@ QStringList EntityScriptingInterface::getJointNames(const QUuid& entityID) {
return result; return result;
} }
float EntityScriptingInterface::calculateCost(float mass, float oldVelocity,float newVelocity) { float EntityScriptingInterface::calculateCost(float mass, float oldVelocity, float newVelocity) {
return std::abs(mass * (newVelocity - oldVelocity)); return std::abs(mass * (newVelocity - oldVelocity));
} }