From 77832dbcb4862aef45381eb99250309bfc061e2a Mon Sep 17 00:00:00 2001 From: tosh Date: Wed, 17 Apr 2013 20:53:24 +0200 Subject: [PATCH 1/9] makes FieldOfView store the view matrix instead of its inverse --- interface/src/FieldOfView.cpp | 21 ++++++++++++++----- interface/src/FieldOfView.h | 39 ++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/interface/src/FieldOfView.cpp b/interface/src/FieldOfView.cpp index c255d7232f..0aef91b0ab 100644 --- a/interface/src/FieldOfView.cpp +++ b/interface/src/FieldOfView.cpp @@ -1,6 +1,6 @@ // // FieldOfView.cpp -// interface +// hifi // // Created by Tobias Schwinger on 3/21/13. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. @@ -16,7 +16,7 @@ using namespace glm; FieldOfView::FieldOfView() : - _matOrientation(mat4(1.0f)), + _matView(mat4(1.0f)), _vecBoundsLow(vec3(-1.0f,-1.0f,-1.0f)), _vecBoundsHigh(vec3(1.0f,1.0f,1.0f)), _valWidth(256.0f), @@ -26,6 +26,17 @@ FieldOfView::FieldOfView() : _enmAspectBalancing(expose_less) { } +FieldOfView& FieldOfView::setOrientation(mat4 const& matrix) { + + _matView = affineInverse(matrix); + return *this; +} + +mat4 FieldOfView::getOrientation() const { + + return affineInverse(_matView); +} + mat4 FieldOfView::getViewerScreenXform() const { mat4 projection; @@ -48,14 +59,14 @@ mat4 FieldOfView::getViewerScreenXform() const { mat4 FieldOfView::getWorldViewerXform() const { - return translate(affineInverse(_matOrientation), + return translate(_matView, vec3(0.0f, 0.0f, -_vecBoundsHigh.z) ); } mat4 FieldOfView::getWorldScreenXform() const { return translate( - getViewerScreenXform() * affineInverse(_matOrientation), + getViewerScreenXform() * _matView, vec3(0.0f, 0.0f, -_vecBoundsHigh.z) ); } @@ -65,7 +76,7 @@ mat4 FieldOfView::getViewerWorldXform() const { return translate( translate(mat4(1.0f), n_translate) - * _matOrientation, -n_translate ); + * affineInverse(_matView), -n_translate ); } float FieldOfView::getPixelSize() const { diff --git a/interface/src/FieldOfView.h b/interface/src/FieldOfView.h index f4caf582c2..82d5c79b6b 100644 --- a/interface/src/FieldOfView.h +++ b/interface/src/FieldOfView.h @@ -1,22 +1,30 @@ // // FieldOfView.h -// interface +// hifi // // Created by Tobias Schwinger on 3/21/13. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // -#ifndef __interface__FieldOfView__ -#define __interface__FieldOfView__ +#ifndef __hifi__FieldOfView__ +#define __hifi__FieldOfView__ #include // // Viewing parameter encapsulation. -// +// +// Once configured provides transformation matrices between different coordinate spaces, such as +// +// o world space, +// o viewer space (orientation of local viewer, no projective transforms), and +// o screen space (as Viewer space + projection). +// +// Also provides information about the mapping of the screen space coordinates onto the screen. +// class FieldOfView { - glm::mat4 _matOrientation; + glm::mat4 _matView; glm::vec3 _vecBoundsLow; glm::vec3 _vecBoundsHigh; float _valWidth; @@ -33,7 +41,9 @@ class FieldOfView { FieldOfView& setBounds(glm::vec3 const& low, glm::vec3 const& high) { _vecBoundsLow = low; _vecBoundsHigh = high; return *this; } - FieldOfView& setOrientation(glm::mat4 const& matrix) { _matOrientation = matrix; return *this; } + FieldOfView& setView(glm::mat4 const& matrix) { _matView = matrix; return *this; } + + FieldOfView& setOrientation(glm::mat4 const& matrix); FieldOfView& setPerspective(float angle) { _valAngle = angle; return *this; } @@ -52,13 +62,20 @@ class FieldOfView { // dumb accessors - glm::mat4 const& getOrientation() const { return _matOrientation; } + glm::mat4 const& getView() const { return _matView; } float getWidthInPixels() const { return _valWidth; } float getHeightInPixels() const { return _valHeight; } float getPerspective() const { return _valAngle; } // matrices + // + // Returns a matrix representing the camera position and rotation in + // space. Similar to getViewerWorldXform but without translation offset + // applied. + // + glm::mat4 getOrientation() const; + // // Returns a full transformation matrix to project world coordinates // onto the screen. @@ -100,7 +117,8 @@ class FieldOfView { float getPixelSize() const; // - // Returns the frustum as used for the projection matrices. + // Returns the frustum as used for the projection matrices. That + // is the one that applies when the current orientation is at identity. // The result depdends on the bounds, eventually aspect correction // for the current resolution, the perspective angle (specified in // respect to diagonal) and zoom. @@ -109,7 +127,8 @@ class FieldOfView { // // Returns the z-offset from the origin to where orientation ia - // applied. + // applied (in negated form equivalent to the 'near' parameter of + // gluPerspective). // float getTransformOffset() const { return _vecBoundsHigh.z; } @@ -119,5 +138,5 @@ class FieldOfView { float getAspectRatio() const { return _valHeight / _valWidth; } }; -#endif +#endif /* defined(__hifi__FieldOfView__) */ From 38d229ab67e7ed682d6cb5f102c24493ba85e63d Mon Sep 17 00:00:00 2001 From: tosh Date: Thu, 18 Apr 2013 00:13:41 +0200 Subject: [PATCH 2/9] reiterates starfield: o allows UrlReader to cache the downloaded content in a local (updating it automatically when the server indicates a newer time stamp) o retires the FieldOfView class o makes the stars move again o fixes bad deletion in UrlReader (delete instead of delete[]) o allows UrlReader to advertise supported compression algorithms to the server --- interface/src/FieldOfView.cpp | 137 -------- interface/src/FieldOfView.h | 142 --------- interface/src/Stars.cpp | 10 +- interface/src/Stars.h | 6 +- interface/src/main.cpp | 42 +-- interface/src/starfield/Config.h | 7 +- interface/src/starfield/Controller.h | 4 +- interface/src/starfield/Loader.h | 4 +- interface/src/starfield/renderer/Renderer.h | 10 +- libraries/shared/src/UrlReader.cpp | 45 ++- libraries/shared/src/UrlReader.h | 331 +++++++++++--------- 11 files changed, 255 insertions(+), 483 deletions(-) delete mode 100644 interface/src/FieldOfView.cpp delete mode 100644 interface/src/FieldOfView.h diff --git a/interface/src/FieldOfView.cpp b/interface/src/FieldOfView.cpp deleted file mode 100644 index 0aef91b0ab..0000000000 --- a/interface/src/FieldOfView.cpp +++ /dev/null @@ -1,137 +0,0 @@ -// -// FieldOfView.cpp -// hifi -// -// Created by Tobias Schwinger on 3/21/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// - -#include "FieldOfView.h" - -#include -#include -#include -#include - -using namespace glm; - -FieldOfView::FieldOfView() : - _matView(mat4(1.0f)), - _vecBoundsLow(vec3(-1.0f,-1.0f,-1.0f)), - _vecBoundsHigh(vec3(1.0f,1.0f,1.0f)), - _valWidth(256.0f), - _valHeight(256.0f), - _valAngle(0.61), - _valZoom(1.0f), - _enmAspectBalancing(expose_less) { -} - -FieldOfView& FieldOfView::setOrientation(mat4 const& matrix) { - - _matView = affineInverse(matrix); - return *this; -} - -mat4 FieldOfView::getOrientation() const { - - return affineInverse(_matView); -} - -mat4 FieldOfView::getViewerScreenXform() const { - - mat4 projection; - vec3 low, high; - getFrustum(low, high); - - // perspective projection? determine correct near distance - if (_valAngle != 0.0f) { - - projection = translate( - frustum(low.x, high.x, low.y, high.y, low.z, high.z), - vec3(0.f, 0.f, -low.z) ); - } else { - - projection = ortho(low.x, high.x, low.y, high.y, low.z, high.z); - } - - return projection; -} - -mat4 FieldOfView::getWorldViewerXform() const { - - return translate(_matView, - vec3(0.0f, 0.0f, -_vecBoundsHigh.z) ); -} - -mat4 FieldOfView::getWorldScreenXform() const { - - return translate( - getViewerScreenXform() * _matView, - vec3(0.0f, 0.0f, -_vecBoundsHigh.z) ); -} - -mat4 FieldOfView::getViewerWorldXform() const { - - vec3 n_translate = vec3(0.0f, 0.0f, _vecBoundsHigh.z); - - return translate( - translate(mat4(1.0f), n_translate) - * affineInverse(_matView), -n_translate ); -} - -float FieldOfView::getPixelSize() const { - - vec3 low, high; - getFrustum(low, high); - - return std::min( - abs(high.x - low.x) / _valWidth, - abs(high.y - low.y) / _valHeight); -} - -void FieldOfView::getFrustum(vec3& low, vec3& high) const { - - low = _vecBoundsLow; - high = _vecBoundsHigh; - - // start with uniform zoom - float inv_zoom = 1.0f / _valZoom; - float adj_x = inv_zoom, adj_y = inv_zoom; - - // balance aspect - if (_enmAspectBalancing != stretch) { - - float f_aspect = (high.x - low.x) / (high.y - low.y); - float vp_aspect = _valWidth / _valHeight; - - if ((_enmAspectBalancing == expose_more) - != (f_aspect > vp_aspect)) { - - // expose_more -> f_aspect <= vp_aspect <=> adj >= 1 - // expose_less -> f_aspect > vp_aspect <=> adj < 1 - adj_x = vp_aspect / f_aspect; - - } else { - - // expose_more -> f_aspect > vp_aspect <=> adj > 1 - // expose_less -> f_aspect <= vp_aspect <=> adj <= 1 - adj_y = f_aspect / vp_aspect; - } - } - - // scale according to zoom / aspect correction - float ax = (low.x + high.x) / 2.0f, ay = (low.y + high.y) / 2.0f; - low.x = (low.x - ax) * adj_x + ax; - high.x = (high.x - ax) * adj_x + ax; - low.y = (low.y - ay) * adj_y + ay; - high.y = (high.y - ay) * adj_y + ay; - low.z = (low.z - high.z) * inv_zoom + high.z; - - // calc and apply near distance based on near diagonal and perspective - float w = high.x - low.x, h = high.y - low.y; - high.z -= low.z; - low.z = _valAngle == 0.0f ? 0.0f : - sqrt(w*w+h*h) * 0.5f / tan(_valAngle * 0.5f); - high.z += low.z; -} - diff --git a/interface/src/FieldOfView.h b/interface/src/FieldOfView.h deleted file mode 100644 index 82d5c79b6b..0000000000 --- a/interface/src/FieldOfView.h +++ /dev/null @@ -1,142 +0,0 @@ -// -// FieldOfView.h -// hifi -// -// Created by Tobias Schwinger on 3/21/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// - -#ifndef __hifi__FieldOfView__ -#define __hifi__FieldOfView__ - -#include - -// -// Viewing parameter encapsulation. -// -// Once configured provides transformation matrices between different coordinate spaces, such as -// -// o world space, -// o viewer space (orientation of local viewer, no projective transforms), and -// o screen space (as Viewer space + projection). -// -// Also provides information about the mapping of the screen space coordinates onto the screen. -// -class FieldOfView { - - glm::mat4 _matView; - glm::vec3 _vecBoundsLow; - glm::vec3 _vecBoundsHigh; - float _valWidth; - float _valHeight; - float _valAngle; - float _valZoom; - int _enmAspectBalancing; - public: - - FieldOfView(); - - // mutators - - FieldOfView& setBounds(glm::vec3 const& low, glm::vec3 const& high) { - _vecBoundsLow = low; _vecBoundsHigh = high; return *this; } - - FieldOfView& setView(glm::mat4 const& matrix) { _matView = matrix; return *this; } - - FieldOfView& setOrientation(glm::mat4 const& matrix); - - FieldOfView& setPerspective(float angle) { _valAngle = angle; return *this; } - - FieldOfView& setResolution(unsigned width, unsigned height) { _valWidth = width; _valHeight = height; return *this; } - - FieldOfView& setZoom(float factor) { _valZoom = factor; return *this; } - - enum aspect_balancing - { - expose_more, - expose_less, - stretch - }; - - FieldOfView& setAspectBalancing(aspect_balancing v) { _enmAspectBalancing = v; return *this; } - - // dumb accessors - - glm::mat4 const& getView() const { return _matView; } - float getWidthInPixels() const { return _valWidth; } - float getHeightInPixels() const { return _valHeight; } - float getPerspective() const { return _valAngle; } - - // matrices - - // - // Returns a matrix representing the camera position and rotation in - // space. Similar to getViewerWorldXform but without translation offset - // applied. - // - glm::mat4 getOrientation() const; - - // - // Returns a full transformation matrix to project world coordinates - // onto the screen. - // - glm::mat4 getWorldScreenXform() const; - - // - // Transforms world coordinates to viewer-relative coordinates. - // - // This matrix can be used as the modelview matrix in legacy GL code - // where the projection matrix is kept separately. - // - glm::mat4 getWorldViewerXform() const; - - // - // Returns the transformation to of viewer-relative coordinates back - // to world space. - // - // This matrix can be used to set up a coordinate system for avatar - // rendering. - // - glm::mat4 getViewerWorldXform() const; - - // - // Returns the transformation of viewer-relative coordinates to the - // screen. - // - // This matrix can be used as the projection matrix in legacy GL code. - // - glm::mat4 getViewerScreenXform() const; - - - // other useful information - - // - // Returns the size of a pixel in world space, that is the minimum - // in respect to x/y screen directions. - // - float getPixelSize() const; - - // - // Returns the frustum as used for the projection matrices. That - // is the one that applies when the current orientation is at identity. - // The result depdends on the bounds, eventually aspect correction - // for the current resolution, the perspective angle (specified in - // respect to diagonal) and zoom. - // - void getFrustum(glm::vec3& low, glm::vec3& high) const; - - // - // Returns the z-offset from the origin to where orientation ia - // applied (in negated form equivalent to the 'near' parameter of - // gluPerspective). - // - float getTransformOffset() const { return _vecBoundsHigh.z; } - - // - // Returns the aspect ratio. - // - float getAspectRatio() const { return _valHeight / _valWidth; } -}; - -#endif /* defined(__hifi__FieldOfView__) */ - diff --git a/interface/src/Stars.cpp b/interface/src/Stars.cpp index 95a0af3654..97d68bc61d 100644 --- a/interface/src/Stars.cpp +++ b/interface/src/Stars.cpp @@ -7,7 +7,6 @@ // #include "InterfaceConfig.h" -#include "FieldOfView.h" #include "Stars.h" #define __interface__Starfield_impl__ @@ -23,8 +22,8 @@ Stars::~Stars() { delete _ptrController; } -bool Stars::readInput(const char* url, unsigned limit) { - return _ptrController->readInput(url, limit); +bool Stars::readInput(const char* url, const char* cacheFile, unsigned limit) { + return _ptrController->readInput(url, cacheFile, limit); } bool Stars::setResolution(unsigned k) { @@ -35,8 +34,9 @@ float Stars::changeLOD(float fraction, float overalloc, float realloc) { return float(_ptrController->changeLOD(fraction, overalloc, realloc)); } -void Stars::render(FieldOfView const& fov) { - _ptrController->render(fov.getPerspective(), fov.getAspectRatio(), fov.getOrientation()); +void Stars::render(float fovDiagonal, float aspect, glm::mat4 const& view) { + + _ptrController->render(fovDiagonal, aspect, glm::affineInverse(view)); } diff --git a/interface/src/Stars.h b/interface/src/Stars.h index 90c52e64ef..92c7b0f806 100644 --- a/interface/src/Stars.h +++ b/interface/src/Stars.h @@ -9,7 +9,7 @@ #ifndef __interface__Stars__ #define __interface__Stars__ -#include "FieldOfView.h" +#include namespace starfield { class Controller; } @@ -31,13 +31,13 @@ class Stars { * The limit parameter allows to reduce the number of stars * that are loaded, keeping the brightest ones. */ - bool readInput(const char* url, unsigned limit = 200000); + bool readInput(const char* url, const char* cacheFile = 0l, unsigned limit = 200000); /** * Renders the starfield from a local viewer's perspective. * The parameter specifies the field of view. */ - void render(FieldOfView const& fov); + void render(float fovDiagonal, float aspect, glm::mat4 const& view); /** * Sets the resolution for FOV culling. diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 851408b55e..2a6a6476f7 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -54,7 +54,7 @@ #include "Audio.h" #endif -#include "FieldOfView.h" +#include "AngleUtil.h" #include "Stars.h" #include "MenuRow.h" @@ -95,6 +95,7 @@ int headMirror = 1; // Whether to mirror own head when viewing int WIDTH = 1200; // Window size int HEIGHT = 800; int fullscreen = 0; +float aspectRatio = 1.0f; bool wantColorRandomizer = true; // for addSphere and load file @@ -108,12 +109,8 @@ Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the v // Starfield information char starFile[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; -FieldOfView fov; +char starCacheFile[] = "cachedStars.txt"; Stars stars; -#ifdef STARFIELD_KEYS -int starsTiles = 20; -double starsLod = 1.0; -#endif bool showingVoxels = true; @@ -306,7 +303,7 @@ void init(void) headMouseX = WIDTH/2; headMouseY = HEIGHT/2; - stars.readInput(starFile, 0); + stars.readInput(starFile, starCacheFile, 0); // Initialize Field values field = Field(); @@ -767,18 +764,12 @@ void display(void) glRotatef ( whichCamera.getYaw(), 0, 1, 0 ); glTranslatef( -whichCamera.getPosition().x, -whichCamera.getPosition().y, -whichCamera.getPosition().z ); - - - - //quick test for camera ortho-normal sanity check... - - - - - if (::starsOn) { // should be the first rendering pass - w/o depth buffer / lighting - stars.render(fov); + + glm::mat4 view; + glGetFloatv(GL_MODELVIEW_MATRIX, glm::value_ptr(view)); + stars.render(angleConvert(whichCamera.getFieldOfView()), aspectRatio, view); } glEnable(GL_LIGHTING); @@ -1280,13 +1271,6 @@ void key(unsigned char k, int x, int y) if (k == ' ') reset_sensors(); if (k == 't') renderPitchRate -= KEYBOARD_PITCH_RATE; if (k == 'g') renderPitchRate += KEYBOARD_PITCH_RATE; -#ifdef STARFIELD_KEYS - if (k == 'u') stars.setResolution(starsTiles += 1); - if (k == 'j') stars.setResolution(starsTiles = max(starsTiles-1,1)); - if (k == 'i') if (starsLod < 1.0) starsLod = stars.changeLOD(1.01); - if (k == 'k') if (starsLod > 0.01) starsLod = stars.changeLOD(0.99); - if (k == 'r') stars.readInput(starFile, 0); -#endif if (k == 'a') myAvatar.setDriveKeys(ROT_LEFT, 1); if (k == 'd') myAvatar.setDriveKeys(ROT_RIGHT, 1); } @@ -1406,7 +1390,7 @@ void reshape(int width, int height) { WIDTH = width; HEIGHT = height; - float aspectRatio = ((float)width/(float)height); // based on screen resize + aspectRatio = ((float)width/(float)height); // based on screen resize float fov; float nearClip; @@ -1434,14 +1418,6 @@ void reshape(int width, int height) glMatrixMode(GL_PROJECTION); //hello - // XXXBHG - Note: this is Tobias's code for loading the perspective matrix. At Philip's suggestion, I'm removing - // it and putting back our old code that simply loaded the fov, ratio, and near/far clips. But I'm keeping this here - // for reference for now. - //fov.setResolution(width, height) - // .setBounds(glm::vec3(-0.5f,-0.5f,-500.0f), glm::vec3(0.5f, 0.5f, 0.1f) ) - // .setPerspective(0.7854f); - //glLoadMatrixf(glm::value_ptr(fov.getViewerScreenXform())); - glLoadIdentity(); // XXXBHG - If we're in view frustum mode, then we need to do this little bit of hackery so that diff --git a/interface/src/starfield/Config.h b/interface/src/starfield/Config.h index 001af23a5f..5717fa22ee 100644 --- a/interface/src/starfield/Config.h +++ b/interface/src/starfield/Config.h @@ -25,8 +25,8 @@ #define STARFIELD_LOW_MEMORY 0 // set to 1 not to use 16-bit types #endif -#ifndef STARFIELD_DEBUG_LOD -#define STARFIELD_DEBUG_LOD 0 // set to 1 to peek behind the scenes +#ifndef STARFIELD_DEBUG_CULLING +#define STARFIELD_DEBUG_CULLING 0 // set to 1 to peek behind the scenes #endif #ifndef STARFIELD_MULTITHREADING @@ -64,7 +64,6 @@ #include #include #include -#include #include "UrlReader.h" #include "AngleUtil.h" @@ -80,13 +79,11 @@ namespace starfield { using glm::vec4; using glm::dot; using glm::normalize; - using glm::swizzle; using glm::X; using glm::Y; using glm::Z; using glm::W; using glm::mat4; - using glm::column; using glm::row; using namespace std; diff --git a/interface/src/starfield/Controller.h b/interface/src/starfield/Controller.h index 329119bbc4..f5680f881a 100644 --- a/interface/src/starfield/Controller.h +++ b/interface/src/starfield/Controller.h @@ -109,11 +109,11 @@ namespace starfield { _ptrRenderer(0l) { } - bool readInput(const char* url, unsigned limit) + bool readInput(const char* url, const char* cacheFile, unsigned limit) { InputVertices vertices; - if (! Loader().loadVertices(vertices, url, limit)) + if (! Loader().loadVertices(vertices, url, cacheFile, limit)) return false; BrightnessLevels brightness; diff --git a/interface/src/starfield/Loader.h b/interface/src/starfield/Loader.h index 03dfd18a53..00210e5e8a 100644 --- a/interface/src/starfield/Loader.h +++ b/interface/src/starfield/Loader.h @@ -33,7 +33,7 @@ namespace starfield { public: bool loadVertices( - InputVertices& destination, char const* url, unsigned limit) + InputVertices& destination, char const* url, char const* cacheFile, unsigned limit) { _ptrVertices = & destination; _valLimit = limit; @@ -43,7 +43,7 @@ namespace starfield { #endif _strUrl = url; // in case we fail early - if (! UrlReader::readUrl(url, *this)) + if (! UrlReader::readUrl(url, *this, cacheFile)) { fprintf(stderr, "%s:%d: %s\n", _strUrl, _valLineNo, getError()); diff --git a/interface/src/starfield/renderer/Renderer.h b/interface/src/starfield/renderer/Renderer.h index 03bc0b5763..a09226ed85 100644 --- a/interface/src/starfield/renderer/Renderer.h +++ b/interface/src/starfield/renderer/Renderer.h @@ -149,7 +149,7 @@ namespace starfield { matrix[3][2] = 0.0f; // extract local z vector - vec3 ahead = swizzle( column(matrix, 2) ); + vec3 ahead = vec3(matrix[2]); float azimuth = atan2(ahead.x,-ahead.z) + Radians::pi(); float altitude = atan2(-ahead.y, hypotf(ahead.x, ahead.z)); @@ -163,7 +163,7 @@ namespace starfield { // fprintf(stderr, "Stars.cpp: starting on tile #%d\n", tileIndex); -#if STARFIELD_DEBUG_LOD +#if STARFIELD_DEBUG_CULLING mat4 matrix_debug = glm::translate( glm::frustum(-hw, hw, -hh, hh, nearClip, 10.0f), vec3(0.0f, 0.0f, -4.0f)) * glm::affineInverse(matrix); @@ -173,7 +173,7 @@ namespace starfield { * glm::affineInverse(matrix); this->_itrOutIndex = (unsigned*) _arrBatchOffs; - this->_vecWxform = swizzle(row(matrix, 3)); + this->_vecWxform = vec3(row(matrix, 3)); this->_valHalfPersp = halfPersp; this->_valMinBright = minBright; @@ -181,13 +181,13 @@ namespace starfield { _arrTile, _arrTile + _objTiling.getTileCount(), (Tile**) _arrBatchCount)); -#if STARFIELD_DEBUG_LOD +#if STARFIELD_DEBUG_CULLING # define matrix matrix_debug #endif this->glBatch(glm::value_ptr(matrix), prepareBatch( (unsigned*) _arrBatchOffs, _itrOutIndex) ); -#if STARFIELD_DEBUG_LOD +#if STARFIELD_DEBUG_CULLING # undef matrix #endif } diff --git a/libraries/shared/src/UrlReader.cpp b/libraries/shared/src/UrlReader.cpp index f8fb707375..750ff1a821 100644 --- a/libraries/shared/src/UrlReader.cpp +++ b/libraries/shared/src/UrlReader.cpp @@ -6,13 +6,17 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // - #include "UrlReader.h" #include + #ifdef _WIN32 #define NOCURL_IN_WINDOWS #endif + +#include +#include + #ifndef NOCURL_IN_WINDOWS #include size_t const UrlReader::max_read_ahead = CURL_MAX_WRITE_SIZE; @@ -21,6 +25,7 @@ size_t const UrlReader::max_read_ahead = 0; #endif char const* const UrlReader::success = "UrlReader: Success!"; +char const* const UrlReader::success_cached = "UrlReader:: Using local file."; char const* const UrlReader::error_init_failed = "UrlReader: Initialization failed."; char const* const UrlReader::error_aborted = "UrlReader: Processing error."; char const* const UrlReader::error_buffer_overflow = "UrlReader: Buffer overflow."; @@ -29,7 +34,7 @@ char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete pro #define hnd_curl static_cast(_ptrImpl) UrlReader::UrlReader() - : _ptrImpl(0l), _arrXtra(0l), _strError(0l) { + : _ptrImpl(0l), _arrXtra(0l), _strError(0l), _arrCacheRdBuf(0l) { _arrXtra = new(std::nothrow) char[max_read_ahead]; if (! _arrXtra) { _strError = error_init_failed; return; } @@ -39,12 +44,14 @@ UrlReader::UrlReader() curl_easy_setopt(hnd_curl, CURLOPT_NOSIGNAL, 1l); curl_easy_setopt(hnd_curl, CURLOPT_FAILONERROR, 1l); curl_easy_setopt(hnd_curl, CURLOPT_FILETIME, 1l); + curl_easy_setopt(hnd_curl, CURLOPT_ENCODING, ""); #endif } UrlReader::~UrlReader() { - delete _arrXtra; + delete[] _arrXtra; + delete[] _arrCacheRdBuf; #ifndef NOCURL_IN_WINDOWS if (! hnd_curl) return; curl_easy_cleanup(hnd_curl); @@ -78,14 +85,42 @@ void UrlReader::getinfo(char const*& url, char const*& type, int64_t& length, int64_t& stardate) { #ifndef NOCURL_IN_WINDOWS + double clen; + long time; + curl_easy_getinfo(hnd_curl, CURLINFO_FILETIME, & time); + + // check caching file time whether we actually want to download anything + if (_strCacheFile != 0l) { + struct stat s; + stat(_strCacheFile, & s); + if (time > s.st_mtime) { + // file on server is newer -> update cache file + _ptrCacheFile = fopen(_strCacheFile, "wb"); + if (_ptrCacheFile != 0l) { + _valCacheMode = cache_write; + } + } else { + // file on server is older -> use cache file + if (! _arrCacheRdBuf) { + _arrCacheRdBuf = new (std::nothrow) char[max_read_ahead]; + if (! _arrCacheRdBuf) { + _valCacheMode = no_cache; + } + } + _ptrCacheFile = fopen(_strCacheFile, "rb"); + if (_ptrCacheFile != 0l) { + _valCacheMode = cache_read; + } + _strError = success_cached; + } + } + curl_easy_getinfo(hnd_curl, CURLINFO_EFFECTIVE_URL, & url); curl_easy_getinfo(hnd_curl, CURLINFO_CONTENT_TYPE, & type); - double clen; curl_easy_getinfo(hnd_curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, & clen); length = static_cast(clen); - long time; curl_easy_getinfo(hnd_curl, CURLINFO_FILETIME, & time); stardate = time; #endif diff --git a/libraries/shared/src/UrlReader.h b/libraries/shared/src/UrlReader.h index c50fe88d5b..9ad77d27ff 100644 --- a/libraries/shared/src/UrlReader.h +++ b/libraries/shared/src/UrlReader.h @@ -12,119 +12,132 @@ #include #include #include - -/** - * UrlReader class that encapsulates a context for sequential data retrieval - * via URLs. Use one per thread. - */ +#include + +// +// UrlReader class that encapsulates a context for sequential data retrieval +// via URLs. Use one per thread. +// class UrlReader { + enum CacheMode { no_cache, cache_write, cache_read }; + void* _ptrImpl; char* _arrXtra; char const* _strError; void* _ptrStream; + char const* _strCacheFile; + FILE* _ptrCacheFile; + char* _arrCacheRdBuf; + CacheMode _valCacheMode; size_t _valXtraSize; - public: - /** - * Constructor - performs initialization, never throws. - */ + // + // Constructor - performs initialization, never throws. + // UrlReader(); - /** - * Destructor - frees resources, never throws. - */ + // + // Destructor - frees resources, never throws. + // ~UrlReader(); - /** - * Reads data from an URL and forwards it to the instance of a class - * fulfilling the ContentStream concept. - * - * The call protocol on the ContentStream is detailed as follows: - * - * 1. begin(char const* url, - * char const* content_type, uint64_t bytes, uint64_t stardate) - * - * All information except 'url' is optional; 'content_type' can - * be a null pointer - 'bytes' and 'stardate' can be equal to - * to 'unavailable'. - * - * 2. transfer(char* buffer, size_t bytes) - * - * Called until all data has been received. The number of bytes - * actually processed should be returned. - * Unprocessed data is stored in an extra buffer whose size is - * given by the constant UrlReader::max_read_ahead - it can be - * assumed to be reasonably large for on-the-fly parsing. - * - * 3. end(bool ok) - * - * Called at the end of the transfer. - * - * Returns the same success code - */ + // + // Reads data from an URL and forwards it to the instance of a class + // fulfilling the ContentStream concept. + // + // The call protocol on the ContentStream is detailed as follows: + // + // 1. begin(char const* url, + // char const* content_type, uint64_t bytes, uint64_t stardate) + // + // All information except 'url' is optional; 'content_type' can + // be a null pointer - 'bytes' and 'stardate' can be equal to + // to 'unavailable'. + // + // 2. transfer(char* buffer, size_t bytes) + // + // Called until all data has been received. The number of bytes + // actually processed should be returned. + // Unprocessed data is stored in an extra buffer whose size is + // given by the constant UrlReader::max_read_ahead - it can be + // assumed to be reasonably large for on-the-fly parsing. + // + // 3. end(bool ok) + // + // Called at the end of the transfer. + // + // Returns the same success code + // template< class ContentStream > - bool readUrl(char const* url, ContentStream& s); + bool readUrl(char const* url, ContentStream& s, char const* cacheFile = 0l); - /** - * Returns a pointer to a static C-string that describes the error - * condition. - */ + // + // Returns a pointer to a static C-string that describes the error + // condition. + // inline char const* getError() const; - /** - * Can be called by the stream to set a user-defined error string. - */ + // + // Can be called by the stream to set a user-defined error string. + // inline void setError(char const* static_c_string); - /** - * Pointer to the C-string returned by a call to 'readUrl' when no - * error occurred. - */ + // + // Pointer to the C-string returned by a call to 'readUrl' when no + // error occurred. + // static char const* const success; - /** - * Pointer to the C-string returned by a call to 'readUrl' when the - * initialization has failed. - */ + // + // Pointer to the C-string returned by a call to 'readUrl' when no + // error occurred and a local file has been read instead of the + // network stream. + // + static char const* const success_cached; + + // + // Pointer to the C-string returned by a call to 'readUrl' when the + // initialization has failed. + // static char const* const error_init_failed; - /** - * Pointer to the C-string returned by a call to 'readUrl' when the - * transfer has been aborted by the client. - */ + // + // Pointer to the C-string returned by a call to 'readUrl' when the + // transfer has been aborted by the client. + // static char const* const error_aborted; - /** - * Pointer to the C-string returned by a call to 'readUrl' when - * leftover input from incomplete processing caused a buffer - * overflow. - */ + // + // Pointer to the C-string returned by a call to 'readUrl' when + // leftover input from incomplete processing caused a buffer + // overflow. + // static char const* const error_buffer_overflow; - /** - * Pointer to the C-string return by a call to 'readUrl' when the - * input provided was not completely consumed. - */ + // + // Pointer to the C-string return by a call to 'readUrl' when the + // input provided was not completely consumed. + // static char const* const error_leftover_input; - /** - * Constant of the maximum number of bytes that are buffered - * between invocations of 'transfer'. - */ + // + // Constant of the maximum number of bytes that are buffered + // between invocations of 'transfer'. + // static size_t const max_read_ahead; - /** - * Constant representing absent information in the call to the - * 'begin' member function of the target stream. - */ + // + // Constant representing absent information in the call to the + // 'begin' member function of the target stream. + // static int const unavailable = -1; - /** - * Constant for requesting to abort the current transfer when - * returned by the 'transfer' member function of the target stream. - */ + // + // Constant for requesting to abort the current transfer when + // returned by the 'transfer' member function of the target stream. + // static size_t const abort = ~0u; private: @@ -143,38 +156,105 @@ class UrlReader { // synthesized callback - template< class Stream > - static size_t callback_template( - char *input, size_t size, size_t nmemb, void* thiz); + template< class Stream > static size_t callback_template(char *input, size_t size, + size_t nmemb, void* thiz); + + template< class Stream > size_t feedBuffered(Stream* stream, + char* input, size_t size); }; template< class ContentStream > -bool UrlReader::readUrl(char const* url, ContentStream& s) { +bool UrlReader::readUrl(char const* url, ContentStream& s, char const* cacheFile) { if (! _ptrImpl) return false; + _strCacheFile = cacheFile; + _ptrCacheFile = 0l; + _valCacheMode = no_cache; // eventually set later _strError = success; _ptrStream = & s; _valXtraSize = ~size_t(0); this->perform(url, & callback_template); s.end(_strError == success); - return _strError == success; + if (_ptrCacheFile != 0l) { + fclose(_ptrCacheFile); + } + return _strError == success || _strError == success_cached; } inline char const* UrlReader::getError() const { return this->_strError; } -inline void UrlReader::setError(char const* static_c_string) { +inline void UrlReader::setError(char const* staticCstring) { - if (this->_strError == success) - this->_strError = static_c_string; + if (this->_strError == success || this->_strError == success_cached) + this->_strError = staticCstring; } template< class Stream > -size_t UrlReader::callback_template( - char *input, size_t size, size_t nmemb, void* thiz) { +size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) { + size_t inputOffset = 0u; - size *= nmemb; + while (true) { + char* buffer = input + inputOffset; + size_t bytes = size - inputOffset; + + // data in extra buffer? + if (_valXtraSize > 0) { + + // fill extra buffer with beginning of input + size_t fill = max_read_ahead - _valXtraSize; + if (bytes < fill) fill = bytes; + memcpy(_arrXtra + _valXtraSize, buffer, fill); + // use extra buffer for next transfer + buffer = _arrXtra; + bytes = _valXtraSize + fill; + inputOffset += fill; + } + + // call 'transfer' + size_t processed = stream->transfer(buffer, bytes); + if (processed == abort) { + + setError(error_aborted); + return 0u; + + } else if (! processed && ! input) { + + setError(error_leftover_input); + return 0u; + } + size_t unprocessed = bytes - processed; + + // can switch to input buffer, now? + if (buffer == _arrXtra && unprocessed <= inputOffset) { + + _valXtraSize = 0u; + inputOffset -= unprocessed; + + } else { // no? unprocessed data -> extra buffer + + if (unprocessed > max_read_ahead) { + + setError(error_buffer_overflow); + return 0; + } + _valXtraSize = unprocessed; + memmove(_arrXtra, buffer + processed, unprocessed); + + if (inputOffset == size || buffer != _arrXtra) { + + return size; + } + } + } // while +} + +template< class Stream > +size_t UrlReader::callback_template(char *input, size_t size, size_t nmemb, void* thiz) { + + size_t result = 0u; UrlReader* me = static_cast(thiz); Stream* stream = static_cast(me->_ptrStream); + size *= nmemb; // first call? if (me->_valXtraSize == ~size_t(0)) { @@ -184,65 +264,28 @@ size_t UrlReader::callback_template( char const* url, * type; int64_t length, stardate; me->getinfo(url, type, length, stardate); - stream->begin(url, type, length, stardate); + if (me->_valCacheMode != cache_read) { + stream->begin(url, type, length, stardate); + } } + do { + // will have to repeat from here when reading a local file - size_t input_offset = 0u; - - while (true) { - - char* buffer = input + input_offset; - size_t bytes = size - input_offset; - - // data in extra buffer? - if (me->_valXtraSize > 0) { - - // fill extra buffer with beginning of input - size_t fill = max_read_ahead - me->_valXtraSize; - if (bytes < fill) fill = bytes; - memcpy(me->_arrXtra + me->_valXtraSize, buffer, fill); - // use extra buffer for next transfer - buffer = me->_arrXtra; - bytes = me->_valXtraSize + fill; - input_offset += fill; + // read from cache file? + if (me->_valCacheMode == cache_read) { + // change input buffer and start + input = me->_arrCacheRdBuf; + size = fread(input, 1, max_read_ahead, me->_ptrCacheFile); + nmemb = 1; + } else if (me->_valCacheMode == cache_write) { + fwrite(input, 1, size, me->_ptrCacheFile); } - // call 'transfer' - size_t processed = stream->transfer(buffer, bytes); - if (processed == abort) { + result = me->feedBuffered(stream, input, size); - me->setError(error_aborted); - return 0u; + } while (me->_valCacheMode == cache_read && result != 0 && ! feof(me->_ptrCacheFile)); - } else if (! processed && ! input) { - - me->setError(error_leftover_input); - return 0u; - } - size_t unprocessed = bytes - processed; - - // can switch to input buffer, now? - if (buffer == me->_arrXtra && unprocessed <= input_offset) { - - me->_valXtraSize = 0u; - input_offset -= unprocessed; - - } else { // no? unprocessed data -> extra buffer - - if (unprocessed > max_read_ahead) { - - me->setError(error_buffer_overflow); - return 0; - } - me->_valXtraSize = unprocessed; - memmove(me->_arrXtra, buffer + processed, unprocessed); - - if (input_offset == size || buffer != me->_arrXtra) { - - return size; - } - } - } // for + return me->_valCacheMode != cache_read ? result : 0; } #endif /* defined(__hifi__UrlReader__) */ From 0306b63af4a19dfa57080e38d686844c26fc6f28 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 15:32:16 -0700 Subject: [PATCH 3/9] added more cleanup and preparation for switching over to quaternions --- interface/src/Head.cpp | 56 ++++++++++++++++------------ interface/src/Head.h | 5 +-- libraries/avatars/src/AvatarData.cpp | 2 + 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index ace31629ca..b4d075e592 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -18,6 +18,9 @@ #include #include #include +//#include +//#include +//#include //looks like we might not need this using namespace std; @@ -529,8 +532,6 @@ void Head::simulate(float deltaTime) { - - void Head::render(int faceToFace, int isMine) { //--------------------------------------------------- @@ -822,17 +823,17 @@ void Head::initializeSkeleton() { for (int b=0; b #include -#include - +#include //looks like we might not need this enum eyeContactTargets {LEFT_EYE, RIGHT_EYE, MOUTH}; @@ -85,7 +84,7 @@ struct AvatarBone glm::vec3 springyPosition; // used for special effects (a 'flexible' variant of position) glm::dvec3 springyVelocity; // used for special effects ( the velocity of the springy position) float springBodyTightness; // how tightly the springy position tries to stay on the position - glm::quat rotation; // this will eventually replace yaw, pitch and roll (and maybe orienttion) + glm::quat rotation; // this will eventually replace yaw, pitch and roll (and maybe orientation) float yaw; // the yaw Euler angle of the bone rotation off the parent float pitch; // the pitch Euler angle of the bone rotation off the parent float roll; // the roll Euler angle of the bone rotation off the parent diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 0bf9ddff74..5e113e3454 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -58,6 +58,8 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyPitch); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll); + //printf( "_bodyYaw = %f\n", _bodyYaw ); + return destinationBuffer - bufferStart; } From 5aeb307be26b4fc885b5ef6ed4472199ffe13bae Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 15:36:40 -0700 Subject: [PATCH 4/9] including Philips hand position transmission code --- interface/src/Head.cpp | 5 +++-- libraries/avatars/src/AvatarData.cpp | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 127f4afe66..3bb78aa5bb 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -132,7 +132,6 @@ Head::Head(bool isMine) { DEBUG_otherAvatarListPosition[ 4 ] = glm::vec3( -2.0, 0.3, -2.0 ); } - Head::Head(const Head &otherHead) { initializeAvatar(); @@ -531,7 +530,9 @@ void Head::simulate(float deltaTime) { -void Head::render(int faceToFace, int isMine) { + + +void Head::render(int faceToFace) { //--------------------------------------------------- // show avatar position diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 0f080fceeb..02c97e3446 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -57,7 +57,10 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyPitch); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll); - //printf( "_bodyYaw = %f\n", _bodyYaw ); + memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3); + destinationBuffer += sizeof(float) * 3; + + //std::cout << _handPosition.x << ", " << _handPosition.y << ", " << _handPosition.z << "\n"; return destinationBuffer - bufferStart; } From ecb5047e7cbeacc3c805a15d42d33901f841db45 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 16:58:04 -0700 Subject: [PATCH 5/9] removed initializeAvatar() method in Head class (deprecated). and also un-negated the pos in the rendering of other avatars (same fix as Philip just made) --- interface/src/Head.cpp | 118 +++++++++++---------------- interface/src/Head.h | 1 - interface/src/main.cpp | 5 +- libraries/avatars/src/AvatarData.cpp | 4 + 4 files changed, 55 insertions(+), 73 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 3bb78aa5bb..d691bc2e1b 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -49,7 +49,6 @@ unsigned int iris_texture_width = 512; unsigned int iris_texture_height = 256; Head::Head(bool isMine) { - initializeAvatar(); _avatar.orientation.setToIdentity(); _avatar.velocity = glm::vec3( 0.0, 0.0, 0.0 ); @@ -133,7 +132,6 @@ Head::Head(bool isMine) { } Head::Head(const Head &otherHead) { - initializeAvatar(); _avatar.orientation.set( otherHead._avatar.orientation ); _avatar.velocity = otherHead._avatar.velocity; @@ -352,42 +350,44 @@ void Head::simulate(float deltaTime) { _previousHandBeingMoved = _handBeingMoved; _handBeingMoved = false; - //------------------------------------------------- - // this handles the avatar being driven around... - //------------------------------------------------- - _avatar.thrust = glm::vec3( 0.0, 0.0, 0.0 ); - - if (driveKeys[FWD]) { - glm::vec3 front( _avatar.orientation.getFront().x, _avatar.orientation.getFront().y, _avatar.orientation.getFront().z ); - _avatar.thrust += front * THRUST_MAG; - } - if (driveKeys[BACK]) { - glm::vec3 front( _avatar.orientation.getFront().x, _avatar.orientation.getFront().y, _avatar.orientation.getFront().z ); - _avatar.thrust -= front * THRUST_MAG; - } - if (driveKeys[RIGHT]) { - glm::vec3 right( _avatar.orientation.getRight().x, _avatar.orientation.getRight().y, _avatar.orientation.getRight().z ); - _avatar.thrust -= right * THRUST_MAG; - } - if (driveKeys[LEFT]) { - glm::vec3 right( _avatar.orientation.getRight().x, _avatar.orientation.getRight().y, _avatar.orientation.getRight().z ); - _avatar.thrust += right * THRUST_MAG; - } - if (driveKeys[UP]) { - glm::vec3 up( _avatar.orientation.getUp().x, _avatar.orientation.getUp().y, _avatar.orientation.getUp().z ); - _avatar.thrust += up * THRUST_MAG; - } - if (driveKeys[DOWN]) { - glm::vec3 up( _avatar.orientation.getUp().x, _avatar.orientation.getUp().y, _avatar.orientation.getUp().z ); - _avatar.thrust -= up * THRUST_MAG; - } - if (driveKeys[ROT_RIGHT]) { - _bodyYawDelta -= YAW_MAG * deltaTime; - } - if (driveKeys[ROT_LEFT]) { - _bodyYawDelta += YAW_MAG * deltaTime; - } - + if ( _isMine ) { // driving the avatar around should only apply is this is my avatar (as opposed to an avatar being driven remotely) + //------------------------------------------------- + // this handles the avatar being driven around... + //------------------------------------------------- + _avatar.thrust = glm::vec3( 0.0, 0.0, 0.0 ); + + if (driveKeys[FWD]) { + glm::vec3 front( _avatar.orientation.getFront().x, _avatar.orientation.getFront().y, _avatar.orientation.getFront().z ); + _avatar.thrust += front * THRUST_MAG; + } + if (driveKeys[BACK]) { + glm::vec3 front( _avatar.orientation.getFront().x, _avatar.orientation.getFront().y, _avatar.orientation.getFront().z ); + _avatar.thrust -= front * THRUST_MAG; + } + if (driveKeys[RIGHT]) { + glm::vec3 right( _avatar.orientation.getRight().x, _avatar.orientation.getRight().y, _avatar.orientation.getRight().z ); + _avatar.thrust -= right * THRUST_MAG; + } + if (driveKeys[LEFT]) { + glm::vec3 right( _avatar.orientation.getRight().x, _avatar.orientation.getRight().y, _avatar.orientation.getRight().z ); + _avatar.thrust += right * THRUST_MAG; + } + if (driveKeys[UP]) { + glm::vec3 up( _avatar.orientation.getUp().x, _avatar.orientation.getUp().y, _avatar.orientation.getUp().z ); + _avatar.thrust += up * THRUST_MAG; + } + if (driveKeys[DOWN]) { + glm::vec3 up( _avatar.orientation.getUp().x, _avatar.orientation.getUp().y, _avatar.orientation.getUp().z ); + _avatar.thrust -= up * THRUST_MAG; + } + if (driveKeys[ROT_RIGHT]) { + _bodyYawDelta -= YAW_MAG * deltaTime; + } + if (driveKeys[ROT_LEFT]) { + _bodyYawDelta += YAW_MAG * deltaTime; + } + } + //---------------------------------------------------------- float translationalSpeed = glm::length( _avatar.velocity ); float rotationalSpeed = fabs( _bodyYawDelta ); @@ -403,7 +403,7 @@ void Head::simulate(float deltaTime) { //---------------------------------------------------------- // update body yaw by body yaw delta //---------------------------------------------------------- - _bodyYaw += _bodyYawDelta * deltaTime; + _bodyYaw += _bodyYawDelta * deltaTime; //---------------------------------------------------------- // (for now) set head yaw to body yaw @@ -650,7 +650,7 @@ void Head::renderHead( int faceToFace) { // Don't render a head if it is really close to your location, because that is your own head! //if (!isMine || faceToFace) - { + //{ glRotatef(Pitch, 1, 0, 0); glRotatef(Roll, 0, 0, 1); @@ -780,7 +780,7 @@ void Head::renderHead( int faceToFace) { glPopMatrix(); - } + //} glPopMatrix(); } @@ -797,29 +797,6 @@ AvatarMode Head::getMode() { } -void Head::initializeAvatar() { -/* - avatar.velocity = glm::vec3( 0.0, 0.0, 0.0 ); - avatar.thrust = glm::vec3( 0.0, 0.0, 0.0 ); - avatar.orientation.setToIdentity(); - - closestOtherAvatar = 0; - - _bodyYaw = -90.0; - _bodyPitch = 0.0; - _bodyRoll = 0.0; - - bodyYawDelta = 0.0; - - triggeringAction = false; - - mode = AVATAR_MODE_STANDING; - - initializeSkeleton(); - */ -} - - void Head::initializeSkeleton() { for (int b=0; bgetLinkedData(); glPushMatrix(); glm::vec3 pos = agentHead->getBodyPosition(); - glTranslatef(-pos.x, -pos.y, -pos.z); + glTranslatef(pos.x, pos.y, pos.z); agentHead->render(0); glPopMatrix(); } @@ -839,7 +839,6 @@ void display(void) // brad's frustum for debugging if (::frustumOn) render_view_frustum(); - //Render my own avatar myAvatar.render(true); } @@ -1361,7 +1360,7 @@ void idle(void) { } // - // Sample hardware, update view frustum if needed, send avatar data to mixer/agents + // Sample hardware, update view frustum if needed, Lsend avatar data to mixer/agents // updateAvatar( 1.f/FPS ); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 02c97e3446..fe36b44817 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -57,6 +57,8 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyPitch); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll); + //printf( "_bodyYaw = %f\n", _bodyYaw ); + memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3); destinationBuffer += sizeof(float) * 3; @@ -78,6 +80,8 @@ void AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t *)sourceBuffer, &_bodyPitch); sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t *)sourceBuffer, &_bodyRoll); + printf( "_bodyYaw = %f\n", _bodyYaw ); + memcpy(&_handPosition, sourceBuffer, sizeof(float) * 3); sourceBuffer += sizeof(float) * 3; From aba20c6afd3ec191f3ec812edc14ae2cad9e631a Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 17:48:08 -0700 Subject: [PATCH 6/9] a few debugging changes --- interface/src/Head.cpp | 6 +++--- libraries/avatars/src/AvatarData.cpp | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index d691bc2e1b..0ee70d11cf 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -922,7 +922,7 @@ void Head::updateSkeleton() { _avatar.orientation.yaw( _bodyYaw ); //test! - make sure this does what expected: st rotation to be identity PLUS _bodyYaw - _rotation = glm::angleAxis( _bodyYaw, _avatar.orientation.up ); + //_rotation = glm::angleAxis( _bodyYaw, _avatar.orientation.up ); //glm::quat yaw_rotation = glm::angleAxis( _bodyYaw, _avatar.orientation.up ); @@ -940,7 +940,7 @@ void Head::updateSkeleton() { _bone[b].position = _bone[ _bone[b].parent ].position; } - ///TEST! - get this working and then add a comment JJV + ///TEST! - get this working and then add a comment; JJV if ( ! _isMine ) { _bone[ AVATAR_BONE_RIGHT_HAND ].position = _handPosition; } @@ -1051,7 +1051,7 @@ void Head::updateHandMovement() { + _avatar.orientation.getFront() * -_movedHandOffset.y; _bone[ AVATAR_BONE_RIGHT_HAND ].position += transformedHandMovement; - + //if holding hands, add a pull to the hand... if ( _usingSprings ) { if ( _closestOtherAvatar != -1 ) { diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 5e1fbf7828..0f3d5db777 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -63,7 +63,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3); destinationBuffer += sizeof(float) * 3; - //std::cout << _handPosition.x << ", " << _handPosition.y << ", " << _handPosition.z << "\n"; + std::cout << _handPosition.x << ", " << _handPosition.y << ", " << _handPosition.z << "\n"; return destinationBuffer - bufferStart; } @@ -80,8 +80,6 @@ void AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t *)sourceBuffer, &_bodyPitch); sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t *)sourceBuffer, &_bodyRoll); - printf( "_bodyYaw = %f\n", _bodyYaw ); - memcpy(&_handPosition, sourceBuffer, sizeof(float) * 3); sourceBuffer += sizeof(float) * 3; From 4e12f26467648e2b0e9a24db061629d790c5a6a9 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 18:10:32 -0700 Subject: [PATCH 7/9] added _isMine check for my _bodyYaw update --- interface/src/Head.cpp | 13 ++++++------- interface/src/main.cpp | 9 ++++----- libraries/avatars/src/AvatarData.cpp | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 0ee70d11cf..084d7a618d 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -388,6 +388,7 @@ void Head::simulate(float deltaTime) { } } + //---------------------------------------------------------- float translationalSpeed = glm::length( _avatar.velocity ); float rotationalSpeed = fabs( _bodyYawDelta ); @@ -403,8 +404,10 @@ void Head::simulate(float deltaTime) { //---------------------------------------------------------- // update body yaw by body yaw delta //---------------------------------------------------------- + if (_isMine) { _bodyYaw += _bodyYawDelta * deltaTime; - + } + //---------------------------------------------------------- // (for now) set head yaw to body yaw //---------------------------------------------------------- @@ -414,12 +417,12 @@ void Head::simulate(float deltaTime) { // decay body yaw delta //---------------------------------------------------------- const float TEST_YAW_DECAY = 5.0; - _bodyYawDelta *= ( 1.0 - TEST_YAW_DECAY * deltaTime ); + _bodyYawDelta *= (1.0 - TEST_YAW_DECAY * deltaTime); //---------------------------------------------------------- // add thrust to velocity //---------------------------------------------------------- - _avatar.velocity += glm::dvec3( _avatar.thrust * deltaTime ); + _avatar.velocity += glm::dvec3(_avatar.thrust * deltaTime); //---------------------------------------------------------- // update position by velocity @@ -432,8 +435,6 @@ void Head::simulate(float deltaTime) { const float LIN_VEL_DECAY = 5.0; _avatar.velocity *= ( 1.0 - LIN_VEL_DECAY * deltaTime ); - - if (!noise) { // Decay back toward center Pitch *= (1.f - DECAY*2*deltaTime); @@ -450,8 +451,6 @@ void Head::simulate(float deltaTime) { leanForward *= (1.f - DECAY*30.f*deltaTime); leanSideways *= (1.f - DECAY*30.f*deltaTime); - - // Update where the avatar's eyes are // // First, decide if we are making eye contact or not diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 62fa6c77a3..a0e4903bcd 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -1365,10 +1365,9 @@ void idle(void) { // updateAvatar( 1.f/FPS ); - - //test - /* - for(std::vector::iterator agent = agentList.getAgents().begin(); agent != agentList.getAgents().end(); agent++) + //loop through all the other avatars and simulate them. + AgentList * agentList = AgentList::getInstance(); + for(std::vector::iterator agent = agentList->getAgents().begin(); agent != agentList->getAgents().end(); agent++) { if (agent->getLinkedData() != NULL) { @@ -1376,7 +1375,7 @@ void idle(void) { agentHead->simulate(1.f/FPS); } } - */ + updateAvatarHand(1.f/FPS); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index f3a29179d0..4c9164de0b 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -58,7 +58,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) { destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyPitch); destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll); - //printf( "_bodyYaw = %f\n", _bodyYaw ); + //printf( "_bodyYaw = %f", _bodyYaw ); memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3); destinationBuffer += sizeof(float) * 3; From 46c95ea4af904eb091e578b921a8fe2bd970f555 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 18:28:26 -0700 Subject: [PATCH 8/9] did some code cleanup in Head class and added some _isMine checks to differentiate between my av and others --- interface/src/Head.cpp | 382 ++++++++++++++++++++--------------------- 1 file changed, 189 insertions(+), 193 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 084d7a618d..333fb356fb 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -275,50 +275,49 @@ void Head::setTriggeringAction( bool d ) { void Head::simulate(float deltaTime) { - - //------------------------------------- - // DEBUG - other avatars... - //------------------------------------- - //closeEnoughToInteract = 0.3f; - _closestOtherAvatar = -1; - float closestDistance = 10000.0f; - - - /* - AgentList * agentList = AgentList::getInstance(); + + //------------------------------------------------------------- + // if the avatar being simulated is mone, then loop through + // all the other avatars to get information about them... + //------------------------------------------------------------- + if ( _isMine ) + { + //------------------------------------- + // DEBUG - other avatars... + //------------------------------------- + _closestOtherAvatar = -1; + float closestDistance = 10000.0f; + + AgentList * agentList = AgentList::getInstance(); for(std::vector::iterator agent = agentList->getAgents().begin(); agent != agentList->getAgents().end(); agent++) { if (( agent->getLinkedData() != NULL && ( agent->getType() == AGENT_TYPE_INTERFACE ) )) { - Head *agentHead = (Head *)agent->getLinkedData(); + Head *otherAvatar = (Head *)agent->getLinkedData(); - // when this is working, I will grab the position here... - //glm::vec3 pos = agentHead->getPos(); - + // when this is working, I will grab the position here... + glm::vec3 otherAvatarPosition = otherAvatar->getBodyPosition(); } } - */ - - for (int o=0; osimulate(deltaTime); } @@ -557,31 +553,37 @@ void Head::render(int faceToFace) { //--------------------------------------------------- renderHead(faceToFace); - //--------------------------------------------------- - // render other avatars (DEBUG TEST) - //--------------------------------------------------- - for (int o=0; o BROW_LIFT_THRESHOLD) - browAudioLift += sqrt(audioAttack)/1000.0; - - browAudioLift *= .90; - - glPushMatrix(); - glTranslatef(-interBrowDistance/2.0,0.4,0.45); - for(side = 0; side < 2; side++) { - glColor3fv(browColor); - glPushMatrix(); - glTranslatef(0, 0.35 + browAudioLift, 0); - glRotatef(EyebrowPitch[side]/2.0, 1, 0, 0); - glRotatef(EyebrowRoll[side]/2.0, 0, 0, 1); - glScalef(browWidth, browThickness, 1); - glutSolidCube(0.5); - glPopMatrix(); - glTranslatef(interBrowDistance, 0, 0); - } - glPopMatrix(); - - - // Mouth - - glPushMatrix(); - glTranslatef(0,-0.35,0.75); - glColor3f(0,0,0); - glRotatef(MouthPitch, 1, 0, 0); - glRotatef(MouthYaw, 0, 0, 1); - glScalef(MouthWidth*(.7 + sqrt(averageLoudness)/60.0), MouthHeight*(1.0 + sqrt(averageLoudness)/30.0), 1); - glutSolidCube(0.5); - glPopMatrix(); - - glTranslatef(0, 1.0, 0); - - glTranslatef(-interPupilDistance/2.0,-0.68,0.7); - // Right Eye - glRotatef(-10, 1, 0, 0); - glColor3fv(eyeColor); - glPushMatrix(); - { - glTranslatef(interPupilDistance/10.0, 0, 0.05); - glRotatef(20, 0, 0, 1); - glScalef(EyeballScaleX, EyeballScaleY, EyeballScaleZ); - glutSolidSphere(0.25, 30, 30); - } - glPopMatrix(); - - // Right Pupil - if (sphere == NULL) { - sphere = gluNewQuadric(); - gluQuadricTexture(sphere, GL_TRUE); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - gluQuadricOrientation(sphere, GLU_OUTSIDE); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, iris_texture_width, iris_texture_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &iris_texture[0]); - } - - glPushMatrix(); - { - glRotatef(EyeballPitch[1], 1, 0, 0); - glRotatef(EyeballYaw[1] + PupilConverge, 0, 1, 0); - glTranslatef(0,0,.35); - glRotatef(-75,1,0,0); - glScalef(1.0, 0.4, 1.0); + glRotatef(_bodyYaw, 0, 1, 0);// should this use Yaw? - glEnable(GL_TEXTURE_2D); - gluSphere(sphere, PupilSize, 15, 15); - glDisable(GL_TEXTURE_2D); - } + glRotatef(Pitch, 1, 0, 0); + glRotatef(Roll, 0, 0, 1); + + // Overall scale of head + if (faceToFace) glScalef(2.0, 2.0, 2.0); + else glScalef(0.75, 1.0, 1.0); + + glColor3fv(skinColor); - glPopMatrix(); - // Left Eye - glColor3fv(eyeColor); - glTranslatef(interPupilDistance, 0, 0); - glPushMatrix(); - { - glTranslatef(-interPupilDistance/10.0, 0, .05); - glRotatef(-20, 0, 0, 1); - glScalef(EyeballScaleX, EyeballScaleY, EyeballScaleZ); - glutSolidSphere(0.25, 30, 30); + // Head + if (!_isMine) glColor3f(0,0,1); // Temp: Other people are BLUE + glutSolidSphere(1, 30, 30); + + // Ears + glPushMatrix(); + glTranslatef(1.0, 0, 0); + for(side = 0; side < 2; side++) { + glPushMatrix(); + glScalef(0.3, 0.65, .65); + glutSolidSphere(0.5, 30, 30); + glPopMatrix(); + glTranslatef(-2.0, 0, 0); } - glPopMatrix(); - // Left Pupil - glPushMatrix(); - { - glRotatef(EyeballPitch[0], 1, 0, 0); - glRotatef(EyeballYaw[0] - PupilConverge, 0, 1, 0); - glTranslatef(0, 0, .35); - glRotatef(-75, 1, 0, 0); - glScalef(1.0, 0.4, 1.0); + glPopMatrix(); - glEnable(GL_TEXTURE_2D); - gluSphere(sphere, PupilSize, 15, 15); - glDisable(GL_TEXTURE_2D); + // Eyebrows + audioAttack = 0.9*audioAttack + 0.1*fabs(loudness - lastLoudness); + lastLoudness = loudness; + + const float BROW_LIFT_THRESHOLD = 100; + if (audioAttack > BROW_LIFT_THRESHOLD) + browAudioLift += sqrt(audioAttack)/1000.0; + + browAudioLift *= .90; + + glPushMatrix(); + glTranslatef(-interBrowDistance/2.0,0.4,0.45); + for(side = 0; side < 2; side++) { + glColor3fv(browColor); + glPushMatrix(); + glTranslatef(0, 0.35 + browAudioLift, 0); + glRotatef(EyebrowPitch[side]/2.0, 1, 0, 0); + glRotatef(EyebrowRoll[side]/2.0, 0, 0, 1); + glScalef(browWidth, browThickness, 1); + glutSolidCube(0.5); + glPopMatrix(); + glTranslatef(interBrowDistance, 0, 0); } + glPopMatrix(); + + + // Mouth + + glPushMatrix(); + glTranslatef(0,-0.35,0.75); + glColor3f(0,0,0); + glRotatef(MouthPitch, 1, 0, 0); + glRotatef(MouthYaw, 0, 0, 1); + glScalef(MouthWidth*(.7 + sqrt(averageLoudness)/60.0), MouthHeight*(1.0 + sqrt(averageLoudness)/30.0), 1); + glutSolidCube(0.5); + glPopMatrix(); + + glTranslatef(0, 1.0, 0); + + glTranslatef(-interPupilDistance/2.0,-0.68,0.7); + // Right Eye + glRotatef(-10, 1, 0, 0); + glColor3fv(eyeColor); + glPushMatrix(); + { + glTranslatef(interPupilDistance/10.0, 0, 0.05); + glRotatef(20, 0, 0, 1); + glScalef(EyeballScaleX, EyeballScaleY, EyeballScaleZ); + glutSolidSphere(0.25, 30, 30); + } + glPopMatrix(); + + // Right Pupil + if (sphere == NULL) { + sphere = gluNewQuadric(); + gluQuadricTexture(sphere, GL_TRUE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + gluQuadricOrientation(sphere, GLU_OUTSIDE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, iris_texture_width, iris_texture_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &iris_texture[0]); + } + + glPushMatrix(); + { + glRotatef(EyeballPitch[1], 1, 0, 0); + glRotatef(EyeballYaw[1] + PupilConverge, 0, 1, 0); + glTranslatef(0,0,.35); + glRotatef(-75,1,0,0); + glScalef(1.0, 0.4, 1.0); - glPopMatrix(); + glEnable(GL_TEXTURE_2D); + gluSphere(sphere, PupilSize, 15, 15); + glDisable(GL_TEXTURE_2D); + } + + glPopMatrix(); + // Left Eye + glColor3fv(eyeColor); + glTranslatef(interPupilDistance, 0, 0); + glPushMatrix(); + { + glTranslatef(-interPupilDistance/10.0, 0, .05); + glRotatef(-20, 0, 0, 1); + glScalef(EyeballScaleX, EyeballScaleY, EyeballScaleZ); + glutSolidSphere(0.25, 30, 30); + } + glPopMatrix(); + // Left Pupil + glPushMatrix(); + { + glRotatef(EyeballPitch[0], 1, 0, 0); + glRotatef(EyeballYaw[0] - PupilConverge, 0, 1, 0); + glTranslatef(0, 0, .35); + glRotatef(-75, 1, 0, 0); + glScalef(1.0, 0.4, 1.0); + + glEnable(GL_TEXTURE_2D); + gluSphere(sphere, PupilSize, 15, 15); + glDisable(GL_TEXTURE_2D); + } + + glPopMatrix(); + - //} glPopMatrix(); } From bd0eb9f69c9d6267d9e1b064d53901e6acf26a46 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 17 Apr 2013 23:18:36 -0700 Subject: [PATCH 9/9] renamed Yaw Pitch Roll to _headYaw, _headPitch, _headRoll, in Head class. And also added a "bigSphere avatar collision test", also added a bone radius (for collision detection) --- interface/src/Head.cpp | 177 +++++++++++++++++++++++--------- interface/src/Head.h | 38 ++++--- interface/src/SerialInterface.h | 6 +- interface/src/main.cpp | 15 ++- 4 files changed, 162 insertions(+), 74 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 333fb356fb..059851ee0a 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -38,6 +38,8 @@ float MouthWidthChoices[3] = {0.5, 0.77, 0.3}; float browWidth = 0.8; float browThickness = 0.16; +bool usingBigSphereCollisionTest = false; + const float DECAY = 0.1; const float THRUST_MAG = 10.0; const float YAW_MAG = 300.0; @@ -65,13 +67,16 @@ Head::Head(bool isMine) { initializeSkeleton(); + _TEST_bigSphereRadius = 0.3f; + _TEST_bigSpherePosition = glm::vec3( 0.0f, _TEST_bigSphereRadius, 2.0f ); + for (int i = 0; i < MAX_DRIVE_KEYS; i++) driveKeys[i] = false; PupilSize = 0.10; interPupilDistance = 0.6; interBrowDistance = 0.75; NominalPupilSize = 0.10; - Yaw = 0.0; + _headYaw = 0.0; EyebrowPitch[0] = EyebrowPitch[1] = -30; EyebrowRoll[0] = 20; EyebrowRoll[1] = -20; @@ -153,7 +158,7 @@ Head::Head(const Head &otherHead) { interPupilDistance = otherHead.interPupilDistance; interBrowDistance = otherHead.interBrowDistance; NominalPupilSize = otherHead.NominalPupilSize; - Yaw = otherHead.Yaw; + _headYaw = otherHead._headYaw; EyebrowPitch[0] = otherHead.EyebrowPitch[0]; EyebrowPitch[1] = otherHead.EyebrowPitch[1]; EyebrowRoll[0] = otherHead.EyebrowRoll[0]; @@ -202,7 +207,7 @@ Head* Head::clone() const { } void Head::reset() { - Pitch = Yaw = Roll = 0; + _headPitch = _headYaw = _headRoll = 0; leanForward = leanSideways = 0; } @@ -214,13 +219,13 @@ void Head::UpdateGyros(float frametime, SerialInterface * serialInterface, int h { const float PITCH_ACCEL_COUPLING = 0.5; const float ROLL_ACCEL_COUPLING = -1.0; - float measured_pitch_rate = serialInterface->getRelativeValue(PITCH_RATE); - YawRate = serialInterface->getRelativeValue(YAW_RATE); + float measured_pitch_rate = serialInterface->getRelativeValue(HEAD_PITCH_RATE); + _headYawRate = serialInterface->getRelativeValue(HEAD_YAW_RATE); float measured_lateral_accel = serialInterface->getRelativeValue(ACCEL_X) - - ROLL_ACCEL_COUPLING*serialInterface->getRelativeValue(ROLL_RATE); + ROLL_ACCEL_COUPLING*serialInterface->getRelativeValue(HEAD_ROLL_RATE); float measured_fwd_accel = serialInterface->getRelativeValue(ACCEL_Z) - - PITCH_ACCEL_COUPLING*serialInterface->getRelativeValue(PITCH_RATE); - float measured_roll_rate = serialInterface->getRelativeValue(ROLL_RATE); + PITCH_ACCEL_COUPLING*serialInterface->getRelativeValue(HEAD_PITCH_RATE); + float measured_roll_rate = serialInterface->getRelativeValue(HEAD_ROLL_RATE); //std::cout << "Pitch Rate: " << serialInterface->getRelativeValue(PITCH_RATE) << // " fwd_accel: " << serialInterface->getRelativeValue(ACCEL_Z) << "\n"; @@ -237,18 +242,18 @@ void Head::UpdateGyros(float frametime, SerialInterface * serialInterface, int h const float MAX_YAW = 85; const float MIN_YAW = -85; - if ((Pitch < MAX_PITCH) && (Pitch > MIN_PITCH)) + if ((_headPitch < MAX_PITCH) && (_headPitch > MIN_PITCH)) addPitch(measured_pitch_rate * -HEAD_ROTATION_SCALE * frametime); addRoll(-measured_roll_rate * HEAD_ROLL_SCALE * frametime); if (head_mirror) { - if ((Yaw < MAX_YAW) && (Yaw > MIN_YAW)) - addYaw(-YawRate * HEAD_ROTATION_SCALE * frametime); + if ((_headYaw < MAX_YAW) && (_headYaw > MIN_YAW)) + addYaw(-_headYawRate * HEAD_ROTATION_SCALE * frametime); addLean(-measured_lateral_accel * frametime * HEAD_LEAN_SCALE, -measured_fwd_accel*frametime * HEAD_LEAN_SCALE); } else { - if ((Yaw < MAX_YAW) && (Yaw > MIN_YAW)) - addYaw(YawRate * -HEAD_ROTATION_SCALE * frametime); + if ((_headYaw < MAX_YAW) && (_headYaw > MIN_YAW)) + addYaw(_headYawRate * -HEAD_ROTATION_SCALE * frametime); addLean(measured_lateral_accel * frametime * -HEAD_LEAN_SCALE, measured_fwd_accel*frametime * HEAD_LEAN_SCALE); } } @@ -256,7 +261,7 @@ void Head::UpdateGyros(float frametime, SerialInterface * serialInterface, int h void Head::addLean(float x, float z) { // Add Body lean as impulse leanSideways += x; - leanForward += z; + leanForward += z; } @@ -277,7 +282,7 @@ void Head::setTriggeringAction( bool d ) { void Head::simulate(float deltaTime) { //------------------------------------------------------------- - // if the avatar being simulated is mone, then loop through + // if the avatar being simulated is mine, then loop through // all the other avatars to get information about them... //------------------------------------------------------------- if ( _isMine ) @@ -288,6 +293,7 @@ void Head::simulate(float deltaTime) { _closestOtherAvatar = -1; float closestDistance = 10000.0f; + /* AgentList * agentList = AgentList::getInstance(); for(std::vector::iterator agent = agentList->getAgents().begin(); @@ -297,10 +303,12 @@ void Head::simulate(float deltaTime) { Head *otherAvatar = (Head *)agent->getLinkedData(); // when this is working, I will grab the position here... - glm::vec3 otherAvatarPosition = otherAvatar->getBodyPosition(); + //glm::vec3 otherAvatarPosition = otherAvatar->getBodyPosition(); } } + */ + ///for testing only (prior to having real avs working) for (int o=0; o 0.0) + { + float amp = 1.0 - (distanceToBigSphereCenter / combinedRadius); + glm::vec3 collisionForce = vectorFromJointToBigSphere * amp; + _bone[b].springyVelocity += collisionForce * 8.0f * deltaTime; + _avatar.velocity += collisionForce * 18.0f * deltaTime; + } + } + } + + if ( jointCollision ) { + //---------------------------------------------------------- + // add gravity to velocity + //---------------------------------------------------------- + _avatar.velocity += glm::dvec3( 0.0, -1.0, 0.0 ) * 0.05; + + //---------------------------------------------------------- + // ground collisions + //---------------------------------------------------------- + if ( _bodyPosition.y < 0.0 ) { + _bodyPosition.y = 0.0; + if ( _avatar.velocity.y < 0.0 ) { + _avatar.velocity.y *= -0.7; + } + } + } + } +} + + + void Head::render(int faceToFace) { //--------------------------------------------------- // show avatar position //--------------------------------------------------- + glColor4f( 0.5f, 0.5f, 0.5f, 0.6 ); glPushMatrix(); glTranslatef(_bodyPosition.x, _bodyPosition.y, _bodyPosition.z); glScalef( 0.03, 0.03, 0.03 ); glutSolidSphere( 1, 10, 10 ); glPopMatrix(); + + if ( usingBigSphereCollisionTest ) { + //--------------------------------------------------- + // show TEST big sphere + //--------------------------------------------------- + glColor4f( 0.5f, 0.6f, 0.8f, 0.7 ); + glPushMatrix(); + glTranslatef(_TEST_bigSpherePosition.x, _TEST_bigSpherePosition.y, _TEST_bigSpherePosition.z); + glScalef( _TEST_bigSphereRadius, _TEST_bigSphereRadius, _TEST_bigSphereRadius ); + glutSolidSphere( 1, 20, 20 ); + glPopMatrix(); + } + //--------------------------------------------------- // show avatar orientation //--------------------------------------------------- @@ -645,19 +726,22 @@ void Head::renderHead(int faceToFace) { glScalef( 0.03, 0.03, 0.03 ); - glRotatef(_bodyYaw, 0, 1, 0);// should this use Yaw? - - glRotatef(Pitch, 1, 0, 0); - glRotatef(Roll, 0, 0, 1); + glRotatef(_headYaw, 0, 1, 0); + glRotatef(_headPitch, 1, 0, 0); + glRotatef(_headRoll, 0, 0, 1); // Overall scale of head if (faceToFace) glScalef(2.0, 2.0, 2.0); else glScalef(0.75, 1.0, 1.0); - glColor3fv(skinColor); // Head - if (!_isMine) glColor3f(0,0,1); // Temp: Other people are BLUE + if (_isMine) { + glColor3fv(skinColor); + } + else { + glColor3f(0,0,1); // Temp: Other people are BLUE + } glutSolidSphere(1, 30, 30); // Ears @@ -805,6 +889,7 @@ void Head::initializeSkeleton() { _bone[b].pitch = 0.0; _bone[b].roll = 0.0; _bone[b].length = 0.0; + _bone[b].radius = 0.02; //default _bone[b].springBodyTightness = 4.0; _bone[b].orientation.setToIdentity(); } @@ -1144,14 +1229,14 @@ void Head::renderBody() { glColor3fv( lightBlue ); glPushMatrix(); glTranslatef( _bone[b].springyPosition.x, _bone[b].springyPosition.y, _bone[b].springyPosition.z ); - glutSolidSphere( 0.02f, 10.0f, 5.0f ); + glutSolidSphere( _bone[b].radius, 10.0f, 5.0f ); glPopMatrix(); } else { glColor3fv( skinColor ); glPushMatrix(); glTranslatef( _bone[b].position.x, _bone[b].position.y, _bone[b].position.z ); - glutSolidSphere( 0.02f, 10.0f, 5.0f ); + glutSolidSphere( _bone[b].radius, 10.0f, 5.0f ); glPopMatrix(); } } diff --git a/interface/src/Head.h b/interface/src/Head.h index 55bb370524..a5c34ab272 100644 --- a/interface/src/Head.h +++ b/interface/src/Head.h @@ -90,6 +90,7 @@ struct AvatarBone float roll; // the roll Euler angle of the bone rotation off the parent Orientation orientation; // three orthogonal normals determined by yaw, pitch, roll float length; // the length of the bone + float radius; // used for detecting collisions for certain physical effects }; struct Avatar @@ -110,9 +111,9 @@ class Head : public AvatarData { void reset(); void UpdateGyros(float frametime, SerialInterface * serialInterface, int head_mirror, glm::vec3 * gravity); void setNoise (float mag) { noise = mag; } - void setPitch(float p) {Pitch = p; } - void setYaw(float y) {Yaw = y; } - void setRoll(float r) {Roll = r; }; + void setPitch(float p) {_headPitch = p; } + void setYaw(float y) {_headYaw = y; } + void setRoll(float r) {_headRoll = r; }; void setScale(float s) {scale = s; }; void setRenderYaw(float y) {renderYaw = y;} void setRenderPitch(float p) {renderPitch = p;} @@ -120,14 +121,14 @@ class Head : public AvatarData { float getRenderPitch() {return renderPitch;} void setLeanForward(float dist); void setLeanSideways(float dist); - void addPitch(float p) {Pitch -= p; } - void addYaw(float y){Yaw -= y; } - void addRoll(float r){Roll += r; } + void addPitch(float p) {_headPitch -= p; } + void addYaw(float y){_headYaw -= y; } + void addRoll(float r){_headRoll += r; } void addLean(float x, float z); - float getPitch() {return Pitch;} - float getRoll() {return Roll;} - float getYaw() {return Yaw;} - float getLastMeasuredYaw() {return YawRate;} + float getPitch() {return _headPitch;} + float getRoll() {return _headRoll;} + float getYaw() {return _headYaw;} + float getLastMeasuredYaw() {return _headYawRate;} float getBodyYaw() {return _bodyYaw;}; void addBodyYaw(float y) {_bodyYaw += y;}; @@ -179,12 +180,12 @@ class Head : public AvatarData { private: bool _isMine; float noise; - float Pitch; - float Yaw; - float Roll; - float PitchRate; - float YawRate; - float RollRate; + float _headPitch; + float _headYaw; + float _headRoll; + float _headPitchRate; + float _headYawRate; + float _headRollRate; float EyeballPitch[2]; float EyeballYaw[2]; float EyebrowPitch[2]; @@ -211,7 +212,9 @@ class Head : public AvatarData { float averageLoudness; float audioAttack; float browAudioLift; - + + glm::vec3 _TEST_bigSpherePosition; + float _TEST_bigSphereRadius; //temporary - placeholder for real other avs glm::vec3 DEBUG_otherAvatarListPosition [ NUM_OTHER_AVATARS ]; @@ -257,6 +260,7 @@ class Head : public AvatarData { void initializeBodySprings(); void updateBodySprings( float deltaTime ); void calculateBoneLengths(); + void updateBigSphereCollisionTest( float deltaTime ); void readSensors(); }; diff --git a/interface/src/SerialInterface.h b/interface/src/SerialInterface.h index 50fde4a13d..457c4b5efa 100644 --- a/interface/src/SerialInterface.h +++ b/interface/src/SerialInterface.h @@ -28,9 +28,9 @@ #define ACCEL_Z 5 // Gyro sensors, in coodinate system of head/airplane -#define PITCH_RATE 1 -#define YAW_RATE 0 -#define ROLL_RATE 2 +#define HEAD_PITCH_RATE 1 +#define HEAD_YAW_RATE 0 +#define HEAD_ROLL_RATE 2 class SerialInterface { public: diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 09bb296b45..2f75f03297 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -170,8 +170,8 @@ int headMouseX, headMouseY; int mouseX, mouseY; // Where is the mouse // Mouse location at start of last down click -int mouseStartX;// = WIDTH / 2; -int mouseStartY;// = HEIGHT / 2; +int mouseStartX = WIDTH / 2; +int mouseStartY = HEIGHT / 2; int mousePressed = 0; // true if mouse has been pressed (clear when finished) Menu menu; // main menu @@ -382,8 +382,8 @@ void updateAvatarHand(float deltaTime) { // void updateAvatar(float frametime) { - float gyroPitchRate = serialPort.getRelativeValue(PITCH_RATE); - float gyroYawRate = serialPort.getRelativeValue(YAW_RATE); + float gyroPitchRate = serialPort.getRelativeValue(HEAD_PITCH_RATE); + float gyroYawRate = serialPort.getRelativeValue(HEAD_YAW_RATE ); myAvatar.UpdateGyros(frametime, &serialPort, headMirror, &gravity); @@ -1334,22 +1334,21 @@ void idle(void) { // Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time if (diffclock(&lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) { - // If mouse is being dragged, update hand movement in the avatar - //if ( mousePressed == 1 ) - if ( myAvatar.getMode() == AVATAR_MODE_COMMUNICATING ) { + //if ( myAvatar.getMode() == AVATAR_MODE_COMMUNICATING ) { float leftRight = ( mouseX - mouseStartX ) / (float)WIDTH; float downUp = ( mouseY - mouseStartY ) / (float)HEIGHT; float backFront = 0.0; glm::vec3 handMovement( leftRight, downUp, backFront ); myAvatar.setHandMovement( handMovement ); - } + /*} else { mouseStartX = mouseX; mouseStartY = mouseY; //mouseStartX = (float)WIDTH / 2.0f; //mouseStartY = (float)HEIGHT / 2.0f; } + */ //-------------------------------------------------------- // when the mouse is being pressed, an 'action' is being