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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Philip Rosedale 2013-01-29 16:00:53 -08:00
commit 3b2c2d1b89
35 changed files with 254 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Resources/audio/grayson.raw
View file

Binary file not shown.

BIN
Resources/audio/jeska.raw Normal file
View file

Binary file not shown.

70
Source/UDPSocket.cpp Normal file
View file

@ -0,0 +1,70 @@
//
// UDPSocket.cpp
// interface
//
// Created by Stephen Birarda on 1/28/13.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#include "UDPSocket.h"
#include <sys/socket.h>
#include <arpa/inet.h>
#include <fcntl.h>
struct sockaddr_in UDPSocket::sockaddr_util(char* hostname, int port) {
sockaddr_in dest_address;
dest_address.sin_family = AF_INET;
dest_address.sin_addr.s_addr = inet_addr(hostname);
dest_address.sin_port = htons((uint16_t)port);
return dest_address;
}
struct sockaddr_in dest_sockaddr;
UDPSocket::UDPSocket(int listeningPort) {
// create the socket
handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (handle <= 0) {
printf("Failed to create socket.\n");
return;
}
// instantiate the re-usable dest_sockaddr with a dummy IP and port
dest_sockaddr = UDPSocket::sockaddr_util((char *) "1.0.0.0", 1);
// bind the socket to the passed listeningPort
sockaddr_in bind_address = UDPSocket::sockaddr_util(INADDR_ANY, listeningPort);
if (bind(handle, (const sockaddr*) &bind_address, sizeof(sockaddr_in)) < 0) {
printf("Failed to bind socket to port %d.\n", listeningPort);
return;
}
// set socket as non-blocking
int nonBlocking = 1;
if (fcntl(handle, F_SETFL, O_NONBLOCK, nonBlocking) == -1) {
printf("Failed to set non-blocking socket\n");
return;
}
}
int UDPSocket::send(char * dest_address, int dest_port, const void *data, int length_in_bytes) {
// change address and port on reusable global to passed variables
dest_sockaddr.sin_addr.s_addr = inet_addr(dest_address);
dest_sockaddr.sin_port = htons((uint16_t)dest_port);
// send data via UDP
int sent_bytes = sendto(handle, (const char*)data, length_in_bytes,
0, (sockaddr*)&dest_address, sizeof(sockaddr_in));
if (sent_bytes != length_in_bytes) {
printf("Failed to send packet: return value = %d\n", sent_bytes);
return false;
}
return sent_bytes;
}

33
Source/UDPSocket.h Normal file
View file

@ -0,0 +1,33 @@
//
// UDPSocket.h
// interface
//
// Created by Stephen Birarda on 1/28/13.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__UDPSocket__
#define __interface__UDPSocket__
#include <iostream>
#include <netinet/in.h>
class UDPSocket {
public:
static struct sockaddr_in sockaddr_util(char *address, int port);
UDPSocket(int listening_port);
int send(char * dest_address, int dest_port, const void *data, int length_in_bytes);
private:
UDPSocket(); // private default constructor
int handle;
struct AgentData {
char * address;
int listening_port;
};
AgentData *known_agents;
};
#endif /* defined(__interface__UDPSocket__) */

2
Source/agent.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 11/20/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include <iostream>

2
Source/agent.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 11/20/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_agent_h

146
Source/audio.cpp
View file

@ -3,12 +3,13 @@
// interface
//
// Created by Stephen Birarda on 1/22/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved.
//
#include <iostream>
#include <fstream>
#include "audio.h"
#include "util.h"
bool Audio::initialized;
PaError Audio::err;
@ -16,6 +17,27 @@ PaStream *Audio::stream;
Audio::AudioData *Audio::data;
Audio::AudioSource::~AudioSource()
{
delete[] audioData;
}
Audio::AudioData::AudioData() {
for(int s = 0; s < NUM_AUDIO_SOURCES; s++) {
sources[s] = AudioSource();
}
samplesToQueue = new int16_t[BUFFER_LENGTH_BYTES / sizeof(int16_t)];
}
Audio::AudioData::~AudioData() {
for (int s = 0; s < NUM_AUDIO_SOURCES; s++) {
sources[s].AudioSource::~AudioSource();
}
delete[] samplesToQueue;
}
/**
* Audio callback used by portaudio.
* Communicates with Audio via a shared pointer to Audio::data.
@ -48,60 +70,57 @@ int audioCallback (const void *inputBuffer,
int16_t *outputLeft = ((int16_t **) outputBuffer)[0];
int16_t *outputRight = ((int16_t **) outputBuffer)[1];
// float yawRatio = 0;
// int numSamplesDelay = abs(floor(yawRatio * PHASE_DELAY_AT_90));
//
// if (numSamplesDelay > PHASE_DELAY_AT_90) {
// numSamplesDelay = PHASE_DELAY_AT_90;
// }
//
// int16_t *leadingBuffer = yawRatio > 0 ? outputLeft : outputRight;
// int16_t *trailingBuffer = yawRatio > 0 ? outputRight : outputLeft;
//
int16_t *samplesToQueue = new int16_t[BUFFER_LENGTH_BYTES];
memset(outputLeft, 0, BUFFER_LENGTH_BYTES);
memset(outputRight, 0, BUFFER_LENGTH_BYTES);
for (int s = 0; s < AUDIO_SOURCES; s++) {
int wrapAroundSamples = (BUFFER_LENGTH_BYTES / sizeof(int16_t)) - (data->sources[s].lengthInSamples - data->sources[s].samplePointer);
if (wrapAroundSamples <= 0) {
memcpy(samplesToQueue, data->sources[s].audioData + data->sources[s].samplePointer, BUFFER_LENGTH_BYTES);
data->sources[s].samplePointer += (BUFFER_LENGTH_BYTES / sizeof(int16_t));
} else {
memcpy(samplesToQueue, data->sources[s].audioData + data->sources[s].samplePointer, (data->sources[s].lengthInSamples - data->sources[s].samplePointer) * sizeof(int16_t));
memcpy(samplesToQueue + (data->sources[s].lengthInSamples - data->sources[s].samplePointer), data->sources[s].audioData, wrapAroundSamples * sizeof(int16_t));
data->sources[s].samplePointer = wrapAroundSamples;
}
for (int s = 0; s < NUM_AUDIO_SOURCES; s++) {
glm::vec3 headPos = data->linkedHead->getPos();
glm::vec3 sourcePos = data->sources[s].position;
int startPointer = data->sources[s].samplePointer;
int wrapAroundSamples = (BUFFER_LENGTH_BYTES / sizeof(int16_t)) - (data->sources[s].lengthInSamples - data->sources[s].samplePointer);
if (wrapAroundSamples <= 0) {
memcpy(data->samplesToQueue, data->sources[s].audioData + data->sources[s].samplePointer, BUFFER_LENGTH_BYTES);
data->sources[s].samplePointer += (BUFFER_LENGTH_BYTES / sizeof(int16_t));
} else {
memcpy(data->samplesToQueue, data->sources[s].audioData + data->sources[s].samplePointer, (data->sources[s].lengthInSamples - data->sources[s].samplePointer) * sizeof(int16_t));
memcpy(data->samplesToQueue + (data->sources[s].lengthInSamples - data->sources[s].samplePointer), data->sources[s].audioData, wrapAroundSamples * sizeof(int16_t));
data->sources[s].samplePointer = wrapAroundSamples;
}
float distance = sqrtf(powf(-headPos[0] - sourcePos[0], 2) + powf(-headPos[2] - sourcePos[2], 2));
float amplitudeRatio = powf(0.5, cbrtf(distance * 10));
float distanceAmpRatio = powf(0.5, cbrtf(distance * 10));
float angleToSource = angle_to(headPos * -1.f, sourcePos, data->linkedHead->getRenderYaw(), data->linkedHead->getYaw()) * M_PI/180;
float sinRatio = sqrt(fabsf(sinf(angleToSource)));
int numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
float phaseAmpRatio = 1.f - (AMPLITUDE_RATIO_AT_90 * sinRatio);
std::cout << "S: " << numSamplesDelay << " A: " << angleToSource << " S: " << sinRatio << " AR: " << phaseAmpRatio << "\n";
int16_t *leadingOutput = angleToSource > 0 ? outputLeft : outputRight;
int16_t *trailingOutput = angleToSource > 0 ? outputRight : outputLeft;
for (int i = 0; i < BUFFER_LENGTH_BYTES / sizeof(int16_t); i++) {
samplesToQueue[i] *= amplitudeRatio;
outputLeft[i] = s == 0 ? samplesToQueue[i] : outputLeft[i] + samplesToQueue[i];
}
if (wrapAroundSamples > 0) {
delete[] samplesToQueue;
data->samplesToQueue[i] *= distanceAmpRatio / NUM_AUDIO_SOURCES;
leadingOutput[i] += data->samplesToQueue[i];
if (i >= numSamplesDelay) {
trailingOutput[i] += data->samplesToQueue[i - numSamplesDelay];
} else {
int sampleIndex = startPointer - numSamplesDelay + i;
if (sampleIndex < 0) {
sampleIndex += data->sources[s].lengthInSamples;
}
trailingOutput[i] += data->sources[s].audioData[sampleIndex] * (distanceAmpRatio * phaseAmpRatio / NUM_AUDIO_SOURCES);
}
}
}
for (int f = 0; f < BUFFER_LENGTH_BYTES; f++) {
outputLeft[f] = (int) floor(outputLeft[f] / AUDIO_SOURCES);
outputRight[f] = outputLeft[f];
}
// int offsetBytes = numSamplesDelay * sizeof(int16_t);
// memcpy(trailingBuffer, data->sources[1].delayBuffer + (PHASE_DELAY_AT_90 - numSamplesDelay), offsetBytes);
// memcpy(trailingBuffer + numSamplesDelay, samplesToQueue, BUFFER_LENGTH_BYTES - offsetBytes);
// // copy PHASE_DELAY_AT_90 samples to delayBuffer in case we need it next go around
// memcpy(data->sources[1].delayBuffer, data->sources[1].audioData + data->sources[1].samplePointer - PHASE_DELAY_AT_90, PHASE_DELAY_AT_90 * sizeof(int16_t));
return paContinue;
}
@ -127,6 +146,12 @@ bool Audio::init(Head* mainHead)
err = Pa_Initialize();
if (err != paNoError) goto error;
data->sources[0].position = glm::vec3(6, 0, -1);
readFile("jeska.raw", &data->sources[0]);
data->sources[1].position = glm::vec3(6, 0, 6);
readFile("grayson.raw", &data->sources[1]);
err = Pa_OpenDefaultStream(&stream,
NULL, // input channels
2, // output channels
@ -137,12 +162,6 @@ bool Audio::init(Head* mainHead)
(void *) data); // user data to be passed to callback
if (err != paNoError) goto error;
data->sources[0].position = glm::vec3(3, 0, -1);
readFile("love.raw", &data->sources[0]);
data->sources[1].position = glm::vec3(-1, 0, 3);
readFile("grayson.raw", &data->sources[1]);
initialized = true;
// start the stream now that sources are good to go
@ -161,22 +180,17 @@ error:
void Audio::sourceSetup()
{
if (initialized) {
// render gl objects on screen for our sources
glPushMatrix();
glTranslatef(data->sources[0].position[0], data->sources[0].position[1], data->sources[0].position[2]);
glColor3f(1, 0, 0);
glutSolidCube(0.5);
glPopMatrix();
glPushMatrix();
glTranslatef(data->sources[1].position[0], data->sources[1].position[1], data->sources[1].position[2]);
glColor3f(0, 0, 1);
glutSolidCube(0.5);
glPopMatrix();
for (int s = 0; s < NUM_AUDIO_SOURCES; s++) {
// render gl objects on screen for our sources
glPushMatrix();
glTranslatef(data->sources[s].position[0], data->sources[s].position[1], data->sources[s].position[2]);
glColor3f((s == 0 ? 1 : 0), (s == 1 ? 1 : 0), (s == 2 ? 1 : 0));
glutSolidCube(0.5);
glPopMatrix();
}
}
}

39
Source/audio.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Stephen Birarda on 1/22/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__audio__
@ -15,7 +15,8 @@
#define BUFFER_LENGTH_BYTES 1024
#define PHASE_DELAY_AT_90 20
#define AUDIO_SOURCES 2
#define AMPLITUDE_RATIO_AT_90 0.5
#define NUM_AUDIO_SOURCES 2
class Audio {
public:
@ -31,42 +32,24 @@ private:
struct AudioSource {
glm::vec3 position;
int16_t *audioData;
int16_t *delayBuffer;
int lengthInSamples;
int samplePointer;
AudioSource() {
samplePointer = 0;
// alloc memory for sample delay buffer
delayBuffer = new int16_t[PHASE_DELAY_AT_90];
memset(delayBuffer, 0, sizeof(int16_t) * PHASE_DELAY_AT_90);
};
~AudioSource() {
delete[] delayBuffer;
delete[] audioData;
}
AudioSource() { samplePointer = 0; }
~AudioSource();
};
static void readFile(const char *filename, struct AudioSource *source);
static bool initialized;
static struct AudioData {
static struct AudioData {
Head* linkedHead;
AudioSource sources[AUDIO_SOURCES];
AudioData() {
sources[0] = AudioSource();
sources[1] = AudioSource();
sources[2] = AudioSource();
}
AudioSource sources[NUM_AUDIO_SOURCES];
// ~AudioData() {
// delete sources[0];
// delete sources[1];
// delete sources[2];
// }
int16_t *samplesToQueue;
AudioData();
~AudioData();
} *data;
// protects constructor so that public init method is used

2
Source/cloud.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 11/17/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include <iostream>

2
Source/cloud.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 11/17/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_cloud_h

2
Source/cube.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 12/31/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "cube.h"

2
Source/cube.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 12/31/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_cube_h

2
Source/field.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/23/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "field.h"

2
Source/field.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/23/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_field_h

2
Source/finger.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 1/21/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#include "finger.h"

2
Source/finger.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 1/21/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__finger__

2
Source/hand.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 10/13/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "hand.h"

2
Source/hand.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 10/13/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_hand_h

1
Source/head.cpp
View file

@ -33,6 +33,7 @@ Head::Head()
interPupilDistance = 0.6;
interBrowDistance = 0.75;
NominalPupilSize = 0.10;
Yaw = 0.0;
EyebrowPitch[0] = EyebrowPitch[1] = BrowPitchAngle[0];
EyebrowRoll[0] = 30;
EyebrowRoll[1] = -30;

5
Source/head.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 9/11/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_head_h
@ -23,6 +23,7 @@ class Head {
float PitchRate;
float YawRate;
float RollRate;
float renderYaw;
float EyeballPitch[2];
float EyeballYaw[2];
float EyebrowPitch[2];
@ -59,6 +60,7 @@ public:
void setPitch(float p) {Pitch = p; }
void setYaw(float y) {Yaw = y; }
void setRoll(float r) {Roll = r; };
void setRenderYaw(float y) {renderYaw = y;}
void setLeanForward(float dist);
void setLeanSideways(float dist);
void addPitch(float p) {Pitch -= p; }
@ -68,6 +70,7 @@ public:
float getPitch() {return Pitch;}
float getRoll() {return Roll;}
float getYaw() {return Yaw;}
float getRenderYaw() {return renderYaw;}
void render();
void simulate(float);
// Send and receive network data

2
Source/lattice.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 1/19/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#include "lattice.h"

2
Source/lattice.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip on 1/19/13.
// Copyright (c) 2013 Rosedale Lab. All rights reserved.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__lattice__

36
Source/main.cpp
View file

@ -119,8 +119,7 @@ int steps_per_frame = 0;
float yaw =0.f; // The yaw, pitch for the avatar head
float pitch = 0.f; //
float start_yaw = 116;
float render_yaw = start_yaw;
float start_yaw = 122;
float render_pitch = 0.f;
float render_yaw_rate = 0.f;
float render_pitch_rate = 0.f;
@ -131,7 +130,7 @@ GLfloat fwd_vec[] = {0.0, 0.0, 1.0};
//GLfloat start_location[] = { WORLD_SIZE*1.5, -WORLD_SIZE/2.0, -WORLD_SIZE/3.0};
//GLfloat start_location[] = { 0.1, -0.15, 0.1};
GLfloat start_location[] = {6.1, -2.0, 1.4};
GLfloat start_location[] = {6.1, 0, 1.4};
GLfloat location[] = {start_location[0], start_location[1], start_location[2]};
float fwd_vel = 0.0f;
@ -259,9 +258,8 @@ void display_stats(void)
char adc[200];
sprintf(adc, "location = %3.1f,%3.1f,%3.1f, angle_to(origin) = %3.1f, head yaw = %3.1f, render_yaw = %3.1f",
-location[0], -location[1], -location[2],
angle_to(myHead.getPos()*-1.f, glm::vec3(0,0,0), render_yaw, myHead.getYaw()),
myHead.getYaw(), render_yaw
);
angle_to(myHead.getPos()*-1.f, glm::vec3(0,0,0), myHead.getRenderYaw(), myHead.getYaw()),
myHead.getYaw(), myHead.getRenderYaw());
drawtext(10, 50, 0.10, 0, 1.0, 0, adc);
@ -313,6 +311,8 @@ void init(void)
{
int i;
myHead.setRenderYaw(start_yaw);
if (audio_on) {
if (serial_on) {
Audio::init(&myHead);
@ -398,7 +398,7 @@ void reset_sensors()
//
// Reset serial I/O sensors
//
render_yaw = start_yaw;
myHead.setRenderYaw(start_yaw);
yaw = render_yaw_rate = 0;
pitch = render_pitch = render_pitch_rate = 0;
lateral_vel = 0;
@ -455,12 +455,13 @@ void update_pos(float frametime)
*/
// Update render direction (pitch/yaw) based on measured gyro rates
const int MIN_YAW_RATE = 300;
const int MIN_YAW_RATE = 3000;
const float YAW_SENSITIVITY = 0.03;
const int MIN_PITCH_RATE = 300;
const int MIN_PITCH_RATE = 3000;
const float PITCH_SENSITIVITY = 0.04;
if (fabs(measured_yaw_rate) > MIN_YAW_RATE)
if (fabs(measured_yaw_rate) > MIN_YAW_RATE)
{
if (measured_yaw_rate > 0)
render_yaw_rate -= (measured_yaw_rate - MIN_YAW_RATE) * YAW_SENSITIVITY * frametime;
@ -474,7 +475,8 @@ void update_pos(float frametime)
else
render_pitch_rate += (measured_pitch_rate + MIN_PITCH_RATE) * PITCH_SENSITIVITY * frametime;
}
render_yaw += render_yaw_rate;
myHead.setRenderYaw(myHead.getRenderYaw() + render_yaw_rate);
render_pitch += render_pitch_rate;
// Decay render_pitch toward zero because we never look constantly up/down
@ -485,6 +487,7 @@ void update_pos(float frametime)
render_yaw_rate *= (1.f - 7.0*frametime);
// Update slide left/right based on accelerometer reading
/*
const int MIN_LATERAL_ACCEL = 20;
const float LATERAL_SENSITIVITY = 0.001;
if (fabs(measured_lateral_accel) > MIN_LATERAL_ACCEL)
@ -493,12 +496,13 @@ void update_pos(float frametime)
lateral_vel += (measured_lateral_accel - MIN_LATERAL_ACCEL) * LATERAL_SENSITIVITY * frametime;
else
lateral_vel += (measured_lateral_accel + MIN_LATERAL_ACCEL) * LATERAL_SENSITIVITY * frametime;
}
}*/
//slide += lateral_vel;
lateral_vel *= (1.f - 4.0*frametime);
// Update fwd/back based on accelerometer reading
/*
const int MIN_FWD_ACCEL = 20;
const float FWD_SENSITIVITY = 0.001;
@ -509,15 +513,15 @@ void update_pos(float frametime)
else
fwd_vel += (measured_fwd_accel + MIN_FWD_ACCEL) * FWD_SENSITIVITY * frametime;
}
}*/
// Decrease forward velocity
fwd_vel *= (1.f - 4.0*frametime);
// Update forward vector based on pitch and yaw
fwd_vec[0] = -sinf(render_yaw*PI/180);
fwd_vec[0] = -sinf(myHead.getRenderYaw()*PI/180);
fwd_vec[1] = sinf(render_pitch*PI/180);
fwd_vec[2] = cosf(render_yaw*PI/180);
fwd_vec[2] = cosf(myHead.getRenderYaw()*PI/180);
// Advance location forward
location[0] += fwd_vec[0]*fwd_vel;
@ -570,7 +574,7 @@ void display(void)
// Rotate, translate to camera location
glRotatef(render_pitch, 1, 0, 0);
glRotatef(render_yaw, 0, 1, 0);
glRotatef(myHead.getRenderYaw(), 0, 1, 0);
glTranslatef(location[0], location[1], location[2]);
// Draw cloud of dots

2
Source/marker_acquisition_view.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Kenneth Keiter on 12/12/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "marker_acquisition_view.h"

2
Source/marker_acquisition_view.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Kenneth Keiter on 12/12/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__marker_acquisition_view__

2
Source/markers.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Kenneth Keiter <ken@kenkeiter.com> on 12/11/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "markers.h"

2
Source/markers.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Kenneth Keiter on 12/11/12.
// Copyright (c) 2012 Rosedale Lab. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef __interface__markers__

2
Source/network.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/27/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include <iostream>

2
Source/network.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/27/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_network_h

2
Source/particle.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Seiji Emery on 9/4/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#include "particle.h"

2
Source/particle.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Seiji Emery on 9/4/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_particle_h

2
Source/util.cpp
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/24/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifdef __APPLE__

2
Source/util.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/24/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifndef interface_util_h

2
Source/world.h
View file

@ -3,7 +3,7 @@
// interface
//
// Created by Philip Rosedale on 8/23/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
// Simulation happens in positive cube with edge of size WORLD_SIZE

11
interface.xcodeproj/project.pbxproj
View file

@ -52,7 +52,9 @@
532C803B16AF3B1900B1A969 /* libopencv_videostab.2.4.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 532C802616AF3B1900B1A969 /* libopencv_videostab.2.4.3.dylib */; };
532C803C16AF3B1900B1A969 /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 532C802816AF3B1900B1A969 /* libportaudio.a */; };
533B578716B2160C00FCABF1 /* grayson.raw in CopyFiles */ = {isa = PBXBuildFile; fileRef = 533B578516B2160600FCABF1 /* grayson.raw */; };
533BF9D516B31A4700AC31BB /* jeska.raw in CopyFiles */ = {isa = PBXBuildFile; fileRef = 533BF9D316B31A3B00AC31BB /* jeska.raw */; };
538BA8A316B1B71E000BF99C /* love.raw in CopyFiles */ = {isa = PBXBuildFile; fileRef = 538BA8A216B1B719000BF99C /* love.raw */; };
539853CE16B765EE00B2D585 /* UDPSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539853CC16B765EE00B2D585 /* UDPSocket.cpp */; };
B6BDADE115F44A9D002A07DF /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BDADDE15F444DB002A07DF /* CoreServices.framework */; };
B6BDADE215F44AA5002A07DF /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BDADD815F444C1002A07DF /* CoreAudio.framework */; };
B6BDADE315F44AB0002A07DF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BDADDA15F444C9002A07DF /* AudioToolbox.framework */; };
@ -74,6 +76,7 @@
533B578716B2160C00FCABF1 /* grayson.raw in CopyFiles */,
532C7CCE16AF301E00B1A969 /* int-texture256-v4.png in CopyFiles */,
538BA8A316B1B71E000BF99C /* love.raw in CopyFiles */,
533BF9D516B31A4700AC31BB /* jeska.raw in CopyFiles */,
532C7CCF16AF301E00B1A969 /* int-texture256-v5.png in CopyFiles */,
532C7CD016AF301E00B1A969 /* philip-image.png in CopyFiles */,
532C7CD116AF301E00B1A969 /* pngtest8rgba.png in CopyFiles */,
@ -506,7 +509,10 @@
532C802816AF3B1900B1A969 /* libportaudio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libportaudio.a; sourceTree = "<group>"; };
532C802916AF3B1900B1A969 /* portaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = portaudio.h; sourceTree = "<group>"; };
533B578516B2160600FCABF1 /* grayson.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = grayson.raw; sourceTree = "<group>"; };
533BF9D316B31A3B00AC31BB /* jeska.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = jeska.raw; sourceTree = "<group>"; };
538BA8A216B1B719000BF99C /* love.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = love.raw; sourceTree = "<group>"; };
539853CC16B765EE00B2D585 /* UDPSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UDPSocket.cpp; sourceTree = "<group>"; };
539853CD16B765EE00B2D585 /* UDPSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDPSocket.h; sourceTree = "<group>"; };
8DD76F6C0486A84900D96B5E /* interface */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = interface; sourceTree = BUILT_PRODUCTS_DIR; };
B6BDADD815F444C1002A07DF /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
B6BDADDA15F444C9002A07DF /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@ -630,6 +636,8 @@
D477AEAB16B7696200F3F8F6 /* oscilloscope.h */,
5325C24E16AF4DBE0051A40B /* util.h */,
5325C24F16AF4DBE0051A40B /* world.h */,
539853CC16B765EE00B2D585 /* UDPSocket.cpp */,
539853CD16B765EE00B2D585 /* UDPSocket.h */,
);
path = Source;
sourceTree = "<group>";
@ -1291,6 +1299,7 @@
536E784516B0A1C900A2F6F3 /* audio */ = {
isa = PBXGroup;
children = (
533BF9D316B31A3B00AC31BB /* jeska.raw */,
533B578516B2160600FCABF1 /* grayson.raw */,
538BA8A216B1B719000BF99C /* love.raw */,
);
@ -1325,7 +1334,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
ORGANIZATIONNAME = "Rosedale Lab";
ORGANIZATIONNAME = "HighFidelity, Inc.";
};
buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "interface" */;
compatibilityVersion = "Xcode 3.2";