Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 23:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:worklist/hifi into assignee

Browse source
This commit is contained in:
Stephen Birarda 2013-08-05 17:22:00 -07:00
commit 7f8411b40d
8 changed files with 81 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Application.cpp
View file

@ -1389,21 +1389,22 @@ void Application::setRenderThirdPerson(bool thirdPerson) {
}
void Application::increaseAvatarSize() {
if (5.0f < _myAvatar.getScale() + 0.05f) {
return;
if ((1.f + SCALING_RATIO) * _myAvatar.getNewScale() < MAX_SCALE) {
_myAvatar.setNewScale((1.f + SCALING_RATIO) * _myAvatar.getNewScale());
qDebug("Changed scale to %f\n", _myAvatar.getNewScale());
}
_myAvatar.setScale(_myAvatar.getScale() + 0.05f);
_myCamera.setScale(_myAvatar.getScale() + 0.05f);
}
void Application::decreaseAvatarSize() {
if (_myAvatar.getScale() - 0.05f < 0.15f) {
return;
if (MIN_SCALE < (1.f - SCALING_RATIO) * _myAvatar.getNewScale()) {
_myAvatar.setNewScale((1.f - SCALING_RATIO) * _myAvatar.getNewScale());
qDebug("Changed scale to %f\n", _myAvatar.getNewScale());
}
}
_myAvatar.setScale(_myAvatar.getScale() - 0.05f);
_myCamera.setScale(_myAvatar.getScale() - 0.05f);
void Application::resetAvatarSize() {
_myAvatar.setNewScale(1.f);
qDebug("Reseted scale to %f\n", _myAvatar.getNewScale());
}
void Application::setFrustumOffset(bool frustumOffset) {
@ -1981,6 +1982,7 @@ void Application::initMenu() {
"Third Person", this, SLOT(setRenderThirdPerson(bool))))->setCheckable(true);
renderMenu->addAction("Increase Avatar Size", this, SLOT(increaseAvatarSize()), Qt::Key_Plus);
renderMenu->addAction("Decrease Avatar Size", this, SLOT(decreaseAvatarSize()), Qt::Key_Minus);
renderMenu->addAction("Reset Avatar Size", this, SLOT(resetAvatarSize()));
QMenu* toolsMenu = menuBar->addMenu("Tools");
@ -2967,6 +2969,7 @@ void Application::displaySide(Camera& whichCamera) {
if (_renderGroundPlaneOn->isChecked()) {
// draw grass plane with fog
glEnable(GL_FOG);
glEnable(GL_NORMALIZE);
const float FOG_COLOR[] = { 1.0f, 1.0f, 1.0f, 1.0f };
glFogfv(GL_FOG_COLOR, FOG_COLOR);
glFogi(GL_FOG_MODE, GL_EXP2);
@ -2981,6 +2984,7 @@ void Application::displaySide(Camera& whichCamera) {
_geometryCache.renderSquare(GRASS_DIVISIONS, GRASS_DIVISIONS);
glPopMatrix();
glDisable(GL_FOG);
glDisable(GL_NORMALIZE);
renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude());
}

1
interface/src/Application.h
View file

@ -134,6 +134,7 @@ private slots:
void setRenderThirdPerson(bool thirdPerson);
void increaseAvatarSize();
void decreaseAvatarSize();
void resetAvatarSize();
void renderThrustAtVoxel(const glm::vec3& thrust);
void renderLineToTouchedVoxel();

8
interface/src/Camera.cpp
View file

@ -105,6 +105,12 @@ void Camera::updateFollowMode(float deltaTime) {
}
}
float Camera::getFarClip() const {
return (_scale * _farClip < std::numeric_limits<int16_t>::max())
? _scale * _farClip
: std::numeric_limits<int16_t>::max() - 1;
}
void Camera::setModeShiftRate ( float rate ) {
_modeShiftRate = rate;
@ -188,7 +194,7 @@ void Camera::initialize() {
}
// call to find out if the view frustum needs to be reshaped
bool Camera::getFrustumNeedsReshape() {
bool Camera::getFrustumNeedsReshape() const {
return _frustumNeedsReshape;
}

26
interface/src/Camera.h
View file

@ -48,20 +48,20 @@ public:
void setEyeOffsetOrientation( const glm::quat& o );
void setScale ( const float s );
const glm::vec3& getTargetPosition () { return _targetPosition; }
const glm::vec3& getPosition () { return _position; }
const glm::quat& getTargetRotation () { return _targetRotation; }
const glm::quat& getRotation () { return _rotation; }
CameraMode getMode () { return _mode; }
float getFieldOfView () { return _fieldOfView; }
float getAspectRatio () { return _aspectRatio; }
float getNearClip () { return _scale * _nearClip; }
float getFarClip () { return _scale * _farClip; }
const glm::vec3& getEyeOffsetPosition () { return _eyeOffsetPosition; }
const glm::quat& getEyeOffsetOrientation () { return _eyeOffsetOrientation; }
float getScale () { return _scale; }
const glm::vec3& getTargetPosition () const { return _targetPosition; }
const glm::vec3& getPosition () const { return _position; }
const glm::quat& getTargetRotation () const { return _targetRotation; }
const glm::quat& getRotation () const { return _rotation; }
CameraMode getMode () const { return _mode; }
float getFieldOfView () const { return _fieldOfView; }
float getAspectRatio () const { return _aspectRatio; }
float getNearClip () const { return _scale * _nearClip; }
float getFarClip () const;
const glm::vec3& getEyeOffsetPosition () const { return _eyeOffsetPosition; }
const glm::quat& getEyeOffsetOrientation () const { return _eyeOffsetOrientation; }
float getScale () const { return _scale; }
bool getFrustumNeedsReshape(); // call to find out if the view frustum needs to be reshaped
bool getFrustumNeedsReshape() const; // call to find out if the view frustum needs to be reshaped
void setFrustumWasReshaped(); // call this after reshaping the view frustum.
private:

45
interface/src/avatar/Avatar.cpp
View file

@ -505,11 +505,6 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
glm::quat orientation = getOrientation();
glm::vec3 front = orientation * IDENTITY_FRONT;
glm::vec3 right = orientation * IDENTITY_RIGHT;
//
if (!isMyAvatar() && _scale != _newScale) {
setScale(_newScale);
}
// Update movement timers
if (isMyAvatar()) {
@ -523,18 +518,30 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
_elapsedTimeMoving += deltaTime;
}
}
if (_leadingAvatar && !_leadingAvatar->getOwningNode()->isAlive()) {
follow(NULL);
}
// Ajust, scale, thrust and lookAt position when following an other avatar
if (isMyAvatar() && _leadingAvatar && _newScale != _leadingAvatar->getScale()) {
_newScale = _leadingAvatar->getScale();
}
if (isMyAvatar() && _scale != _newScale) {
float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _newScale;
setScale(scale);
Application::getInstance()->getCamera()->setScale(scale);
}
if (!isMyAvatar() && _scale != _newScale) {
setScale(_newScale);
}
// Collect thrust forces from keyboard and devices
if (isMyAvatar()) {
updateThrust(deltaTime, transmitter);
}
// Ajust, scale, thrust and lookAt position when following an other avatar
if (isMyAvatar() && _leadingAvatar && _scale != _leadingAvatar->getScale()) {
float scale = 0.95f * _scale + 0.05f * _leadingAvatar->getScale();
setScale(scale);
Application::getInstance()->getCamera()->setScale(scale);
}
// copy velocity so we can use it later for acceleration
glm::vec3 oldVelocity = getVelocity();
@ -1446,7 +1453,7 @@ void Avatar::loadData(QSettings* settings) {
_leanScale = loadSetting(settings, "leanScale", 0.5f);
_scale = loadSetting(settings, "scale", 1.0f);
_newScale = loadSetting(settings, "scale", 1.0f);
setScale(_scale);
Application::getInstance()->getCamera()->setScale(_scale);
@ -1472,7 +1479,7 @@ void Avatar::saveData(QSettings* set) {
set->setValue("voxelURL", _voxels.getVoxelURL());
set->setValue("leanScale", _leanScale);
set->setValue("scale", _scale);
set->setValue("scale", _newScale);
set->endGroup();
}
@ -1525,9 +1532,17 @@ void Avatar::renderJointConnectingCone(glm::vec3 position1, glm::vec3 position2,
glEnd();
}
void Avatar::setNewScale(const float scale) {
_newScale = scale;
}
void Avatar::setScale(const float scale) {
_scale = scale;
_newScale = _scale;
if (_newScale * (1.f - RESCALING_TOLERANCE) < _scale &&
_scale < _newScale * (1.f + RESCALING_TOLERANCE)) {
_scale = _newScale;
}
_skeleton.setScale(_scale);

11
interface/src/avatar/Avatar.h
View file

@ -26,6 +26,13 @@
#include "Transmitter.h"
#include "world.h"
static const float MAX_SCALE = 5.f;
static const float MIN_SCALE = .5f;
static const float SCALING_RATIO = .05f;
static const float SMOOTHING_RATIO = .05f; // 0 < ratio < 1
static const float RESCALING_TOLERANCE = .02f;
const float BODY_BALL_RADIUS_PELVIS = 0.07;
const float BODY_BALL_RADIUS_TORSO = 0.065;
const float BODY_BALL_RADIUS_CHEST = 0.08;
@ -134,7 +141,7 @@ public:
void setGravity (glm::vec3 gravity);
void setMouseRay (const glm::vec3 &origin, const glm::vec3 &direction);
void setOrientation (const glm::quat& orientation);
void setScale (const float scale);
void setNewScale (const float scale);
//getters
bool isInitialized () const { return _initialized;}
@ -149,6 +156,7 @@ public:
glm::vec3 getBodyUpDirection () const { return getOrientation() * IDENTITY_UP; }
glm::vec3 getBodyFrontDirection () const { return getOrientation() * IDENTITY_FRONT; }
float getScale () const { return _scale;}
float getNewScale () const { return _newScale;}
const glm::vec3& getVelocity () const { return _velocity;}
float getSpeed () const { return _speed;}
float getHeight () const { return _height;}
@ -281,6 +289,7 @@ private:
void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
void applyCollisionWithOtherAvatar( Avatar * other, float deltaTime );
void checkForMouseRayTouching();
void setScale (const float scale);
};
#endif

8
libraries/avatars/src/HandData.cpp
View file

@ -105,6 +105,9 @@ int HandData::encodeRemoteData(unsigned char* destinationBuffer) {
size_t checkLength = destinationBuffer - startPosition;
*destinationBuffer++ = (unsigned char)checkLength;
// just a double-check, while tracing a crash.
// decodeRemoteData(destinationBuffer - (destinationBuffer - startPosition));
return destinationBuffer - startPosition;
}
@ -157,8 +160,9 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
}
setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0);
setRaveGloveMode(effectsMode);
// This is disabled for crash tracing.
// setRaveGloveMode(effectsMode);
// One byte for error checking safety.
unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition);
unsigned char checkLength = *sourceBuffer++;

1
libraries/avatars/src/HandData.h
View file

@ -44,6 +44,7 @@ enum RaveGloveEffectsMode
class HandData {
public:
HandData(AvatarData* owningAvatar);
virtual ~HandData() {}
// These methods return the positions in Leap-relative space.
// To convert to world coordinates, use Hand::leapPositionToWorldPosition.