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

Thingy!

Browse source 
Merge branch 'master' of https://github.com/worklist/hifi
This commit is contained in:
Jeffrey Ventrella 2013-04-10 12:54:57 -07:00
commit 228f76c789
7 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Cloud.cpp
View file

@ -46,7 +46,7 @@ Cloud::Cloud(int num,
void Cloud::render() { void Cloud::render() {
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; float particleAttenuationQuadratic[] = { 0.0f, 0.0f, 2.0f };
glEnable( GL_TEXTURE_2D ); glEnable( GL_TEXTURE_2D );
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@ -57,7 +57,7 @@ void Cloud::render() {
glPointSize( maxSize ); glPointSize( maxSize );
glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic ); glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particleAttenuationQuadratic );
glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize ); glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f ); glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );

0
interface/src/Head.cpp Executable file → Normal file
View file

4
interface/src/Util.cpp
View file

@ -46,9 +46,9 @@ void render_vector(glm::vec3 * vec)
glVertex3f(vec->x, vec->y, vec->z); glVertex3f(vec->x, vec->y, vec->z);
// Draw marker dots for magnitude // Draw marker dots for magnitude
glEnd(); glEnd();
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles float particleAttenuationQuadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic ); glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particleAttenuationQuadratic );
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
glPointSize(10.0); glPointSize(10.0);

26
interface/src/main.cpp
View file

@ -108,7 +108,7 @@ int starsTiles = 20;
double starsLod = 1.0; double starsLod = 1.0;
#endif #endif
bool showingVoxels = false; bool showingVoxels = true;
glm::vec3 box(WORLD_SIZE,WORLD_SIZE,WORLD_SIZE); glm::vec3 box(WORLD_SIZE,WORLD_SIZE,WORLD_SIZE);
@ -120,7 +120,7 @@ ParticleSystem balls(0,
0.0 // Gravity 0.0 // Gravity
); );
Cloud cloud(0, // Particles Cloud cloud(0, // Particles
box, // Bounding Box box, // Bounding Box
false // Wrap false // Wrap
); );
@ -177,10 +177,8 @@ SerialInterface serialPort;
int latency_display = 1; int latency_display = 1;
glm::vec3 gravity; glm::vec3 gravity;
int first_measurement = 1;
//int samplecount = 0;
// Frame rate Measurement // Frame Rate Measurement
int frameCount = 0; int frameCount = 0;
float FPS = 120.f; float FPS = 120.f;
@ -188,12 +186,6 @@ timeval timerStart, timerEnd;
timeval lastTimeIdle; timeval lastTimeIdle;
double elapsedTime; double elapsedTime;
// Particles
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
float pointer_attenuation_quadratic[] = { 1.0f, 0.0f, 0.0f }; // for 2D view
#ifdef MARKER_CAPTURE #ifdef MARKER_CAPTURE
/*** Marker Capture ***/ /*** Marker Capture ***/
@ -253,14 +245,6 @@ void displayStats(void)
drawtext(300, 30, 0.10f, 0, 1.0, 0, stats); drawtext(300, 30, 0.10f, 0, 1.0, 0, stats);
} }
// Output the ping times to the various agents
// std::stringstream pingTimes;
// pingTimes << "Agent Pings, msecs:";
// for (int i = 0; i < getAgentCount(); i++) {
// pingTimes << " " << getAgentAddress(i) << ": " << getAgentPing(i);
// }
// drawtext(10,50,0.10, 0, 1.0, 0, (char *)pingTimes.str().c_str());
std::stringstream voxelStats; std::stringstream voxelStats;
voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered(); voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered();
drawtext(10,70,0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); drawtext(10,70,0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
@ -860,10 +844,6 @@ void display(void)
if (audioScope.getState()) audioScope.render(); if (audioScope.getState()) audioScope.render();
#endif #endif
//drawvec3(100, 100, 0.15, 0, 1.0, 0, myAvatar.getPos(), 0, 1, 0);
glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic );
if (displayHeadMouse && !displayHead && statsOn) if (displayHeadMouse && !displayHead && statsOn)
{ {
// Display small target box at center or head mouse target that can also be used to measure LOD // Display small target box at center or head mouse target that can also be used to measure LOD

2
interface/src/starfield/Controller.h
View file

@ -99,8 +99,8 @@ namespace starfield {
_valLodOveralloc(1.2), _valLodOveralloc(1.2),
_valLodNalloc(0), _valLodNalloc(0),
_valLodNrender(0), _valLodNrender(0),
_valLodBrightness(0),
_valLodAllocBrightness(0), _valLodAllocBrightness(0),
_valLodBrightness(0),
_ptrRenderer(0l) { _ptrRenderer(0l) {
} }

2
interface/src/starfield/Loader.h
View file

@ -50,7 +50,7 @@ namespace starfield {
return false; return false;
} }
fprintf(stderr, "Stars.cpp: read %d stars, rendering %d\n", fprintf(stderr, "Stars.cpp: read %d stars, rendering %ld\n",
_valRecordsRead, _ptrVertices->size()); _valRecordsRead, _ptrVertices->size());
return true; return true;

4
interface/src/starfield/data/InputVertex.h
View file

@ -26,8 +26,8 @@ namespace starfield {
InputVertex(float azimuth, float altitude, unsigned color) { InputVertex(float azimuth, float altitude, unsigned color) {
_valColor = color >> 16 & 0xffu | color & 0xff00u | _valColor = (color >> 16 & 0xffu) | (color & 0xff00u) |
color << 16 & 0xff0000u | 0xff000000u; (color << 16 & 0xff0000u) | 0xff000000u;
azimuth = angleConvert<Degrees,Radians>(azimuth); azimuth = angleConvert<Degrees,Radians>(azimuth);
altitude = angleConvert<Degrees,Radians>(altitude); altitude = angleConvert<Degrees,Radians>(altitude);