removed debug/info statements.
This commit is contained in:
parent
9e4bda9242
commit
8ec3f47276
3 changed files with 21 additions and 27 deletions
|
@ -49,8 +49,8 @@ namespace developer {
|
|||
return false;
|
||||
}
|
||||
|
||||
std::cout<<"[developer console] adding developer "
|
||||
"callback for token '" << token << "'" << std::endl;
|
||||
//std::cout<<"[developer console] adding developer "
|
||||
// "callback for token '" << token << "'" << std::endl;
|
||||
|
||||
m_callbacks[token] = cb;
|
||||
|
||||
|
|
|
@ -78,11 +78,11 @@ namespace endofthejedi {
|
|||
NULL, NULL, NULL);
|
||||
|
||||
|
||||
if (color_type == PNG_COLOR_TYPE_RGB) {
|
||||
puts("PNG_COLOR_TYPE_RGB");
|
||||
} else if (color_type == PNG_COLOR_TYPE_RGBA) {
|
||||
puts("PNG_COLOR_TYPE_RGBA");
|
||||
}
|
||||
//if (color_type == PNG_COLOR_TYPE_RGB) {
|
||||
// puts("PNG_COLOR_TYPE_RGB");
|
||||
//} else if (color_type == PNG_COLOR_TYPE_RGBA) {
|
||||
// puts("PNG_COLOR_TYPE_RGBA");
|
||||
//}
|
||||
|
||||
//update width and height based on png info
|
||||
|
||||
|
@ -95,11 +95,11 @@ namespace endofthejedi {
|
|||
|
||||
m_size = glm::vec2();
|
||||
|
||||
puts("#########################################");
|
||||
printf("# PNG: width=%d, height=%d\n", twidth, theight);
|
||||
printf("# powers of two: w=%d, h=%d\n", pot_width, pot_height);
|
||||
printf("# uv scale two: x=%f, y=%f\n", m_uvScale.x, m_uvScale.y);
|
||||
puts("#########################################");
|
||||
//puts("#########################################");
|
||||
//printf("# PNG: width=%d, height=%d\n", twidth, theight);
|
||||
//printf("# powers of two: w=%d, h=%d\n", pot_width, pot_height);
|
||||
//printf("# uv scale two: x=%f, y=%f\n", m_uvScale.x, m_uvScale.y);
|
||||
//puts("#########################################");
|
||||
|
||||
// Update the png info struct.
|
||||
png_read_update_info(png_ptr, info_ptr);
|
||||
|
|
|
@ -38,7 +38,8 @@ void RendererPolygon3d::setup() {
|
|||
addModel("../data/mesh/ship_ufo.stl", &m_shipModel);
|
||||
|
||||
m_texture = nullptr;
|
||||
m_backgroundTexturePath = "../data/img/background_3.png";
|
||||
//m_backgroundTexturePath = "../data/img/background_3.png";
|
||||
m_backgroundTexturePath = "../data/img/stars_nebular.png";
|
||||
loadBackgroundTexture();
|
||||
|
||||
m_postprocess_shader.init();
|
||||
|
@ -86,15 +87,15 @@ void RendererPolygon3d::loadBackgroundTexture() {
|
|||
glActiveTexture(GL_TEXTURE0);
|
||||
m_texture->loadPng();
|
||||
|
||||
std::cout << "texture loading: " << m_texture->valid() << std::endl;
|
||||
//std::cout << "texture loading: " << m_texture->valid() << std::endl;
|
||||
if (!m_texture->valid()) {
|
||||
std::cout << "loading failed!";
|
||||
return;
|
||||
// exit(-1);
|
||||
}
|
||||
|
||||
glm::vec2 s = m_texture->size();
|
||||
std::cout << "texture size is " << s.x << " X " << s.y << std::endl;
|
||||
//glm::vec2 s = m_texture->size();
|
||||
//std::cout << "texture size is " << s.x << " X " << s.y << std::endl;
|
||||
}
|
||||
|
||||
void RendererPolygon3d::renderBackgroundImage() {
|
||||
|
@ -252,6 +253,9 @@ void RendererPolygon3d::addExplosionEffect(size_t id,
|
|||
const glm::vec2 &missileVelocity,
|
||||
bool isPlanetHit, size_t n,
|
||||
float duration) {
|
||||
|
||||
(void) missileVelocity;
|
||||
|
||||
// float particleRadius = 0.005;
|
||||
// float particleRadius = 0.003;
|
||||
float particleRadius = 0.02;
|
||||
|
@ -586,18 +590,8 @@ void RendererPolygon3d::renderShips() {
|
|||
|
||||
void RendererPolygon3d::addModel(const std::string &filename,
|
||||
PolygonModel **dest) {
|
||||
|
||||
// std::cout<<"adding a model: " << filename << std::endl;
|
||||
|
||||
*dest = new PolygonModel(filename);
|
||||
if (!(*dest)->import()) {
|
||||
std::cout << "error: failed to load needed model!!!" << std::endl
|
||||
<< std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
(*dest)->setup(&m_shader_game_objects);
|
||||
(*dest)->uploadToOpenGl();
|
||||
|
||||
*dest = new PolygonModel(filename);
|
||||
if (!(*dest)->import()) {
|
||||
std::cout << "error: failed to load needed model!!!" << std::endl
|
||||
|
|
Loading…
Reference in a new issue