Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:56:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Hifi Test Account 2013-08-07 13:55:47 -07:00
commit 3e136e36f4
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -1389,6 +1389,8 @@ void Application::setRenderFirstPerson(bool firstPerson) {
if (firstPerson) { if (firstPerson) {
_lookingInMirror->setChecked(false); _lookingInMirror->setChecked(false);
_manualThirdPerson->setChecked(false); _manualThirdPerson->setChecked(false);
} else {
_manualThirdPerson->trigger();
} }
} }
@ -3363,6 +3365,11 @@ void Application::displayStats() {
voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE); voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE);
voxelStats << "Encode Time on Server: " << voxelDetails; voxelStats << "Encode Time on Server: " << voxelDetails;
drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
voxelStats.str("");
voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_MODE);
voxelStats << "Sending Mode: " << voxelDetails;
drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER); Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
char avatarMixerStats[200]; char avatarMixerStats[200];
@ -3801,7 +3808,7 @@ bool Application::maybeEditVoxelUnderCursor() {
} }
} else if (_deleteVoxelMode->isChecked()) { } else if (_deleteVoxelMode->isChecked()) {
deleteVoxelUnderCursor(); deleteVoxelUnderCursor();
VoxelFade fade(VoxelFade::FADE_OUT, NODE_KILLED_RED, NODE_KILLED_GREEN, NODE_KILLED_BLUE); VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f);
const float VOXEL_BOUNDS_ADJUST = 0.01f; const float VOXEL_BOUNDS_ADJUST = 0.01f;
float slightlyBigger = _mouseVoxel.s * VOXEL_BOUNDS_ADJUST; float slightlyBigger = _mouseVoxel.s * VOXEL_BOUNDS_ADJUST;
fade.voxelDetails.x = _mouseVoxel.x - slightlyBigger; fade.voxelDetails.x = _mouseVoxel.x - slightlyBigger;

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

@ -131,6 +131,8 @@ Avatar::Avatar(Node* owningNode) :
} else { } else {
_balls = NULL; _balls = NULL;
} }
_collisionRadius = _height * 0.125f;
} }
@ -634,6 +636,10 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter, float gyroCamer
} }
if (_isCollisionsOn) { if (_isCollisionsOn) {
Camera* myCamera = Application::getInstance()->getCamera();
_collisionRadius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.f));
_collisionRadius *= COLLISION_RADIUS_SCALAR;
updateCollisionWithEnvironment(deltaTime); updateCollisionWithEnvironment(deltaTime);
updateCollisionWithVoxels(deltaTime); updateCollisionWithVoxels(deltaTime);
updateAvatarCollisions(deltaTime); updateAvatarCollisions(deltaTime);
@ -978,7 +984,7 @@ void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float d
void Avatar::updateCollisionWithEnvironment(float deltaTime) { void Avatar::updateCollisionWithEnvironment(float deltaTime) {
glm::vec3 up = getBodyUpDirection(); glm::vec3 up = getBodyUpDirection();
float radius = _height * 0.125f; float radius = _collisionRadius;
const float ENVIRONMENT_SURFACE_ELASTICITY = 1.0f; const float ENVIRONMENT_SURFACE_ELASTICITY = 1.0f;
const float ENVIRONMENT_SURFACE_DAMPING = 0.01; const float ENVIRONMENT_SURFACE_DAMPING = 0.01;
const float ENVIRONMENT_COLLISION_FREQUENCY = 0.05f; const float ENVIRONMENT_COLLISION_FREQUENCY = 0.05f;
@ -994,7 +1000,7 @@ void Avatar::updateCollisionWithEnvironment(float deltaTime) {
void Avatar::updateCollisionWithVoxels(float deltaTime) { void Avatar::updateCollisionWithVoxels(float deltaTime) {
float radius = _height * 0.125f; float radius = _collisionRadius;
const float VOXEL_ELASTICITY = 1.4f; const float VOXEL_ELASTICITY = 1.4f;
const float VOXEL_DAMPING = 0.0; const float VOXEL_DAMPING = 0.0;
const float VOXEL_COLLISION_FREQUENCY = 0.5f; const float VOXEL_COLLISION_FREQUENCY = 0.5f;

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

@ -273,6 +273,7 @@ private:
bool _speedBrakes; bool _speedBrakes;
bool _isThrustOn; bool _isThrustOn;
bool _isCollisionsOn; bool _isCollisionsOn;
float _collisionRadius;
Avatar* _leadingAvatar; Avatar* _leadingAvatar;
float _stringLength; float _stringLength;

2
jenkins/jobs.groovy
View file

@ -42,7 +42,7 @@ def hifiJob(String targetName, Boolean deploy) {
if (deploy) { if (deploy) {
publishers { publishers {
publishScp("${ARTIFACT_DESTINATION}") { publishScp("${ARTIFACT_DESTINATION}") {
entry("**/build/${targetName}", "deploy/${targetName}") entry("**/build/${targetName}/${targetName}", "deploy/${targetName}")
} }
} }
} }