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

Added thrust and velocity to avatar head, first part of movement improvements

Browse source
This commit is contained in:
Philip Rosedale 2013-03-26 11:53:57 -07:00
parent bb14a90f86
commit e0ee6c269a
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Head.cpp
View file

@ -42,7 +42,10 @@ GLUquadric *sphere = gluNewQuadric();
Head::Head() Head::Head()
{ {
position.x = position.y = position.z = 0; position = glm::vec3(0,0,0);
velocity = glm::vec3(0,0,0);
thrust = glm::vec3(0,0,0);
PupilSize = 0.10; PupilSize = 0.10;
interPupilDistance = 0.6; interPupilDistance = 0.6;
interBrowDistance = 0.75; interBrowDistance = 0.75;
@ -88,6 +91,8 @@ Head::Head()
Head::Head(const Head &otherHead) { Head::Head(const Head &otherHead) {
position = otherHead.position; position = otherHead.position;
velocity = otherHead.velocity;
thrust = otherHead.thrust;
PupilSize = otherHead.PupilSize; PupilSize = otherHead.PupilSize;
interPupilDistance = otherHead.interPupilDistance; interPupilDistance = otherHead.interPupilDistance;
interBrowDistance = otherHead.interBrowDistance; interBrowDistance = otherHead.interBrowDistance;
@ -207,6 +212,11 @@ void Head::setLeanSideways(float dist){
// Simulate the head over time // Simulate the head over time
void Head::simulate(float deltaTime) void Head::simulate(float deltaTime)
{ {
// Increment position as a function of velocity
position += velocity * deltaTime;
// Increment velocity as time
velocity += thrust * deltaTime;
if (!noise) if (!noise)
{ {
// Decay back toward center // Decay back toward center

11
interface/src/Head.h
View file

@ -65,6 +65,11 @@ class Head : public AgentData {
glm::vec3 getPos() { return position; }; glm::vec3 getPos() { return position; };
void setPos(glm::vec3 newpos) { position = newpos; }; void setPos(glm::vec3 newpos) { position = newpos; };
// Set/Get update the thrust that will move the avatar around
void setThrust(glm::vec3 newThrust) { thrust = newThrust; };
void addThrust(glm::vec3 newThrust) { thrust += newThrust; };
glm::vec3 getThrust() { return thrust; };
Hand * hand; Hand * hand;
private: private:
@ -103,8 +108,14 @@ class Head : public AgentData {
float browAudioLift; float browAudioLift;
glm::vec3 position; glm::vec3 position;
glm::vec3 velocity;
glm::vec3 thrust;
bool fwdKey, backKey, turnLeftKey, turnRightKey, slideLeftKey, slideRightKey, upKey, downKey;
int eyeContact; int eyeContact;
eyeContactTargets eyeContactTarget; eyeContactTargets eyeContactTarget;
void readSensors(); void readSensors();
float renderYaw, renderPitch; // Pitch from view frustum when this is own head. float renderYaw, renderPitch; // Pitch from view frustum when this is own head.

2
shared/src/AgentList.cpp
View file

@ -20,7 +20,7 @@
const char * SOLO_AGENT_TYPES_STRING = "MV"; const char * SOLO_AGENT_TYPES_STRING = "MV";
char DOMAIN_HOSTNAME[] = "highfidelity.below92.com"; char DOMAIN_HOSTNAME[] = "highfidelity.below92.com";
char DOMAIN_IP[100] = "192.168.1.47"; // IP Address will be re-set by lookup on startup char DOMAIN_IP[100] = ""; // IP Address will be re-set by lookup on startup
const int DOMAINSERVER_PORT = 40102; const int DOMAINSERVER_PORT = 40102;
bool silentAgentThreadStopFlag = false; bool silentAgentThreadStopFlag = false;