X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsky%2Fmoon.cxx;h=91049ef4b598f1d090b798a01026ab2e29a0176d;hb=f1ab6e2533a1bf07439b3d5918430f496158d8f3;hp=3923ed2fe3da7a45a97ce44c348797bb38b36bdb;hpb=b72d36d96f7d637f8f60df8948d4c3357586e9a4;p=simgear.git diff --git a/simgear/sky/moon.cxx b/simgear/sky/moon.cxx index 3923ed2f..91049ef4 100644 --- a/simgear/sky/moon.cxx +++ b/simgear/sky/moon.cxx @@ -7,19 +7,20 @@ // // Separated out rendering pieces and converted to ssg by Curt Olson, // March 2000 -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. // -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. +// Library General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. // // $Id$ @@ -28,9 +29,12 @@ # include #endif +#include + #include -#include +#include STL_IOSTREAM +#include #include #include @@ -43,6 +47,13 @@ static int sgMoonOrbPreDraw( ssgEntity *e ) { /* cout << endl << "Moon orb pre draw" << endl << "----------------" << endl << endl; */ + + ssgLeaf *f = (ssgLeaf *)e; + if ( f -> hasState () ) f->getState()->apply() ; + + glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT ); + // cout << "push error = " << glGetError() << endl; + glDisable( GL_DEPTH_TEST ); glDisable( GL_FOG ); glBlendFunc ( GL_SRC_ALPHA, GL_ONE ) ; @@ -53,10 +64,13 @@ static int sgMoonOrbPreDraw( ssgEntity *e ) { static int sgMoonOrbPostDraw( ssgEntity *e ) { /* cout << endl << "Moon orb post draw" << endl << "----------------" << endl << endl; */ - glEnable( GL_DEPTH_TEST ); - glEnable( GL_FOG ); - glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; + // glEnable( GL_DEPTH_TEST ); + // glEnable( GL_FOG ); + // glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; + glPopAttrib(); + // cout << "pop error = " << glGetError() << endl; + /* test glDisable( GL_LIGHTING ); glDisable( GL_CULL_FACE ); @@ -71,6 +85,13 @@ static int sgMoonOrbPostDraw( ssgEntity *e ) { static int sgMoonHaloPreDraw( ssgEntity *e ) { /* cout << endl << "Moon halo pre draw" << endl << "----------------" << endl << endl; */ + + ssgLeaf *f = (ssgLeaf *)e; + if ( f -> hasState () ) f->getState()->apply() ; + + glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_FOG_BIT | GL_COLOR_BUFFER_BIT); + // cout << "push error = " << glGetError() << endl; + glDisable( GL_DEPTH_TEST ); glDisable( GL_FOG ); glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; @@ -81,9 +102,12 @@ static int sgMoonHaloPreDraw( ssgEntity *e ) { static int sgMoonHaloPostDraw( ssgEntity *e ) { /* cout << endl << "Moon halo post draw" << endl << "----------------" << endl << endl; */ - glEnable( GL_DEPTH_TEST ); - glEnable( GL_FOG ); - glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; + // glEnable( GL_DEPTH_TEST ); + // glEnable( GL_FOG ); + // glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; + + glPopAttrib(); + // cout << "pop error = " << glGetError() << endl; return true; } @@ -202,7 +226,7 @@ ssgBranch * SGMoon::build( FGPath path, double moon_size ) { // 90 degrees = moon rise/set // 180 degrees = darkest midnight bool SGMoon::repaint( double moon_angle ) { - if ( moon_angle * RAD_TO_DEG < 100 ) { + if ( moon_angle * SGD_RADIANS_TO_DEGREES < 100 ) { // else moon is well below horizon (so no point in repainting it) // x_10 = moon_angle^10 @@ -220,7 +244,10 @@ bool SGMoon::repaint( double moon_angle ) { (ambient * 11.0) - 3.0, // minimum value = 0.3 (ambient * 12.0) - 3.6, // minimum value = 0.0 0.5 ); - + + // temp test, forces the color to always be white + // sgSetVec4( color, 1.0, 1.0, 1.0, 1.0 ); + if (color[0] > 1.0) color[0] = 1.0; if (color[1] > 1.0) color[1] = 1.0; if (color[2] > 1.0) color[2] = 1.0; @@ -254,13 +281,14 @@ bool SGMoon::reposition( sgVec3 p, double angle, sgSetVec3( axis, 0.0, 0.0, -1.0 ); sgMakeRotMat4( GST, angle, axis ); - // xglRotatef(((RAD_TO_DEG * rightAscension)- 90.0), 0.0, 0.0, 1.0); + // xglRotatef( ((SGD_RADIANS_TO_DEGREES * rightAscension)- 90.0), + // 0.0, 0.0, 1.0); sgSetVec3( axis, 0.0, 0.0, 1.0 ); - sgMakeRotMat4( RA, (rightAscension * RAD_TO_DEG) - 90.0, axis ); + sgMakeRotMat4( RA, (rightAscension * SGD_RADIANS_TO_DEGREES) - 90.0, axis ); - // xglRotatef((RAD_TO_DEG * declination), 1.0, 0.0, 0.0); + // xglRotatef((SGD_RADIANS_TO_DEGREES * declination), 1.0, 0.0, 0.0); sgSetVec3( axis, 1.0, 0.0, 0.0 ); - sgMakeRotMat4( DEC, declination * RAD_TO_DEG, axis ); + sgMakeRotMat4( DEC, declination * SGD_RADIANS_TO_DEGREES, axis ); // xglTranslatef(0,moon_dist); sgSetVec3( v, 0.0, moon_dist, 0.0 );