mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 15:38:00 +02:00
Commented out cubes, added particle count, misc cleanup
This commit is contained in:
parent
20ae9e0f11
commit
8d47a75758
1 changed files with 9 additions and 8 deletions
17
main.cpp
17
main.cpp
|
@ -49,9 +49,6 @@
|
||||||
#include "cloud.h"
|
#include "cloud.h"
|
||||||
#include "agent.h"
|
#include "agent.h"
|
||||||
|
|
||||||
|
|
||||||
//TGAImg Img;
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
// Junk for talking to the Serial Port
|
// Junk for talking to the Serial Port
|
||||||
|
@ -95,7 +92,7 @@ ParticleSystem balls(0,
|
||||||
0.0 // Gravity
|
0.0 // Gravity
|
||||||
);
|
);
|
||||||
|
|
||||||
Cloud cloud(0, // Particles
|
Cloud cloud(100000, // Particles
|
||||||
box, // Bounding Box
|
box, // Bounding Box
|
||||||
false // Wrap
|
false // Wrap
|
||||||
);
|
);
|
||||||
|
@ -243,6 +240,8 @@ void initDisplay(void)
|
||||||
glEnable(GL_LIGHTING);
|
glEnable(GL_LIGHTING);
|
||||||
glEnable(GL_LIGHT0);
|
glEnable(GL_LIGHT0);
|
||||||
glEnable(GL_DEPTH_TEST);
|
glEnable(GL_DEPTH_TEST);
|
||||||
|
|
||||||
|
load_png_as_texture(texture_filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
void init(void)
|
void init(void)
|
||||||
|
@ -276,20 +275,24 @@ void init(void)
|
||||||
myHead.setNoise(noise);
|
myHead.setNoise(noise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// turning cubes off for the moment -
|
||||||
|
// uncomment to re-enable
|
||||||
|
/*
|
||||||
|
|
||||||
int index = 0;
|
int index = 0;
|
||||||
float location[] = {0,0,0};
|
float location[] = {0,0,0};
|
||||||
float scale = 10.0;
|
float scale = 10.0;
|
||||||
int j = 0;
|
int j = 0;
|
||||||
while (index < (MAX_CUBES/2)) {
|
while (index < (MAX_CUBES/2)) {
|
||||||
|
|
||||||
index = 0;
|
index = 0;
|
||||||
j++;
|
j++;
|
||||||
makeCubes(location, scale, &index, cubes_position, cubes_scale, cubes_color);
|
makeCubes(location, scale, &index, cubes_position, cubes_scale, cubes_color);
|
||||||
std::cout << "Run " << j << " Made " << index << " cubes\n";
|
std::cout << "Run " << j << " Made " << index << " cubes\n";
|
||||||
cube_count = index;
|
cube_count = index;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
//load_png_as_texture(texture_filename);
|
|
||||||
|
|
||||||
if (serial_on)
|
if (serial_on)
|
||||||
{
|
{
|
||||||
// Call readsensors for a while to get stable initial values on sensors
|
// Call readsensors for a while to get stable initial values on sensors
|
||||||
|
@ -525,8 +528,6 @@ void display(void)
|
||||||
|
|
||||||
/* Draw Point Sprites */
|
/* Draw Point Sprites */
|
||||||
|
|
||||||
load_png_as_texture(texture_filename);
|
|
||||||
|
|
||||||
glDisable( GL_POINT_SPRITE_ARB );
|
glDisable( GL_POINT_SPRITE_ARB );
|
||||||
glDisable( GL_TEXTURE_2D );
|
glDisable( GL_TEXTURE_2D );
|
||||||
if (!display_head) cloud.render();
|
if (!display_head) cloud.render();
|
||||||
|
|
Loading…
Reference in a new issue