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

Commented out cubes, added particle count, misc cleanup

Browse source
This commit is contained in:
Yoz Grahame 2012-11-26 14:47:30 -08:00
parent 20ae9e0f11
commit 8d47a75758
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main.cpp
View file

@ -49,9 +49,6 @@
#include "cloud.h"
#include "agent.h"
//TGAImg Img;
using namespace std;
// Junk for talking to the Serial Port
@ -95,7 +92,7 @@ ParticleSystem balls(0,
0.0 // Gravity
);
Cloud cloud(0, // Particles
Cloud cloud(100000, // Particles
box, // Bounding Box
false // Wrap
);
@ -243,6 +240,8 @@ void initDisplay(void)
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
glEnable(GL_DEPTH_TEST);
load_png_as_texture(texture_filename);
}
void init(void)
@ -276,20 +275,24 @@ void init(void)
myHead.setNoise(noise);
}
// turning cubes off for the moment -
// uncomment to re-enable
/*
int index = 0;
float location[] = {0,0,0};
float scale = 10.0;
int j = 0;
while (index < (MAX_CUBES/2)) {
index = 0;
j++;
makeCubes(location, scale, &index, cubes_position, cubes_scale, cubes_color);
std::cout << "Run " << j << " Made " << index << " cubes\n";
cube_count = index;
}
*/
//load_png_as_texture(texture_filename);
if (serial_on)
{
// Call readsensors for a while to get stable initial values on sensors
@ -525,8 +528,6 @@ void display(void)
/* Draw Point Sprites */
load_png_as_texture(texture_filename);
glDisable( GL_POINT_SPRITE_ARB );
glDisable( GL_TEXTURE_2D );
if (!display_head) cloud.render();