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

formatting

Browse source
This commit is contained in:
Seth Alves 2015-03-08 20:03:10 -07:00
parent a180eadc91
commit 3604fd639a
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -1817,7 +1817,6 @@ void Application::init() {
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
connect(&_physicsEngine, &EntitySimulation::entityCollisionWithEntity, connect(&_physicsEngine, &EntitySimulation::entityCollisionWithEntity,
entityScriptingInterface.data(), &EntityScriptingInterface::entityCollisionWithEntity); entityScriptingInterface.data(), &EntityScriptingInterface::entityCollisionWithEntity);

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

@ -91,7 +91,8 @@ MyAvatar::MyAvatar() :
_physicsSimulation(), _physicsSimulation(),
_feetTouchFloor(true), _feetTouchFloor(true),
_isLookingAtLeftEye(true), _isLookingAtLeftEye(true),
_realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES) _realWorldFieldOfView("realWorldFieldOfView",
DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES)
{ {
ShapeCollider::initDispatchTable(); ShapeCollider::initDispatchTable();
for (int i = 0; i < MAX_DRIVE_KEYS; i++) { for (int i = 0; i < MAX_DRIVE_KEYS; i++) {
@ -1400,7 +1401,6 @@ void MyAvatar::updatePosition(float deltaTime) {
measureMotionDerivatives(deltaTime); measureMotionDerivatives(deltaTime);
} }
void MyAvatar::updatePositionWithPhysics(float deltaTime) { void MyAvatar::updatePositionWithPhysics(float deltaTime) {
// rotate velocity into camera frame // rotate velocity into camera frame
glm::quat rotation = getHead()->getCameraOrientation(); glm::quat rotation = getHead()->getCameraOrientation();
@ -1420,8 +1420,6 @@ void MyAvatar::updatePositionWithPhysics(float deltaTime) {
_velocity = rotation * newLocalVelocity; _velocity = rotation * newLocalVelocity;
} }
void MyAvatar::updateCollisionWithEnvironment(float deltaTime, float radius) { void MyAvatar::updateCollisionWithEnvironment(float deltaTime, float radius) {
glm::vec3 up = getBodyUpDirection(); glm::vec3 up = getBodyUpDirection();
const float ENVIRONMENT_SURFACE_ELASTICITY = 0.0f; const float ENVIRONMENT_SURFACE_ELASTICITY = 0.0f;

2
interface/src/avatar/MyAvatar.h
View file

@ -19,8 +19,6 @@
class ModelItemID; class ModelItemID;
class MyAvatar : public Avatar { class MyAvatar : public Avatar {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool shouldRenderLocally READ getShouldRenderLocally WRITE setShouldRenderLocally) Q_PROPERTY(bool shouldRenderLocally READ getShouldRenderLocally WRITE setShouldRenderLocally)

2
libraries/avatars/src/AvatarData.h
View file

@ -411,7 +411,7 @@ private:
AvatarData& operator= (const AvatarData&); AvatarData& operator= (const AvatarData&);
QReadWriteLock _lock; QReadWriteLock _lock;
bool _enablePhysics = false; // XXX bool _enablePhysics = false;
}; };
Q_DECLARE_METATYPE(AvatarData*) Q_DECLARE_METATYPE(AvatarData*)

4
libraries/fbx/src/OBJReader.cpp
View file

@ -1,6 +1,6 @@
// //
// EntityItemProperties.h // OBJReader.cpp
// libraries/entities/src // libraries/fbx/src/
// //
// Created by Seth Alves on 3/7/15. // Created by Seth Alves on 3/7/15.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.