mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 14:03:55 +02:00
formatting
This commit is contained in:
parent
a180eadc91
commit
3604fd639a
5 changed files with 5 additions and 10 deletions
|
@ -1817,7 +1817,6 @@ void Application::init() {
|
|||
|
||||
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
|
||||
|
||||
|
||||
connect(&_physicsEngine, &EntitySimulation::entityCollisionWithEntity,
|
||||
entityScriptingInterface.data(), &EntityScriptingInterface::entityCollisionWithEntity);
|
||||
|
||||
|
|
|
@ -91,7 +91,8 @@ MyAvatar::MyAvatar() :
|
|||
_physicsSimulation(),
|
||||
_feetTouchFloor(true),
|
||||
_isLookingAtLeftEye(true),
|
||||
_realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES)
|
||||
_realWorldFieldOfView("realWorldFieldOfView",
|
||||
DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES)
|
||||
{
|
||||
ShapeCollider::initDispatchTable();
|
||||
for (int i = 0; i < MAX_DRIVE_KEYS; i++) {
|
||||
|
@ -1400,7 +1401,6 @@ void MyAvatar::updatePosition(float deltaTime) {
|
|||
measureMotionDerivatives(deltaTime);
|
||||
}
|
||||
|
||||
|
||||
void MyAvatar::updatePositionWithPhysics(float deltaTime) {
|
||||
// rotate velocity into camera frame
|
||||
glm::quat rotation = getHead()->getCameraOrientation();
|
||||
|
@ -1420,8 +1420,6 @@ void MyAvatar::updatePositionWithPhysics(float deltaTime) {
|
|||
_velocity = rotation * newLocalVelocity;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void MyAvatar::updateCollisionWithEnvironment(float deltaTime, float radius) {
|
||||
glm::vec3 up = getBodyUpDirection();
|
||||
const float ENVIRONMENT_SURFACE_ELASTICITY = 0.0f;
|
||||
|
|
|
@ -19,8 +19,6 @@
|
|||
|
||||
class ModelItemID;
|
||||
|
||||
|
||||
|
||||
class MyAvatar : public Avatar {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(bool shouldRenderLocally READ getShouldRenderLocally WRITE setShouldRenderLocally)
|
||||
|
|
|
@ -411,7 +411,7 @@ private:
|
|||
AvatarData& operator= (const AvatarData&);
|
||||
|
||||
QReadWriteLock _lock;
|
||||
bool _enablePhysics = false; // XXX
|
||||
bool _enablePhysics = false;
|
||||
};
|
||||
Q_DECLARE_METATYPE(AvatarData*)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
//
|
||||
// EntityItemProperties.h
|
||||
// libraries/entities/src
|
||||
// OBJReader.cpp
|
||||
// libraries/fbx/src/
|
||||
//
|
||||
// Created by Seth Alves on 3/7/15.
|
||||
// Copyright 2013 High Fidelity, Inc.
|
||||
|
|
Loading…
Reference in a new issue