Just a bit of renaming.

This commit is contained in:
curt
2003-05-14 19:31:53 +00:00
parent 1ae257944b
commit dd080de16c
4 changed files with 41 additions and 41 deletions
+2 -2
View File
@@ -28,7 +28,7 @@
#include "apt_signs.hxx" #include "apt_signs.hxx"
ssgBranch *gen_taxi_sign( SGMaterialLib *matlib, ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
const string path, const string content ) const string path, const string content )
{ {
// for demo purposes we assume each element (letter) is 1x1 meter. // for demo purposes we assume each element (letter) is 1x1 meter.
@@ -109,7 +109,7 @@ ssgBranch *gen_taxi_sign( SGMaterialLib *matlib,
} }
ssgBranch *gen_runway_sign( SGMaterialLib *matlib, ssgBranch *sgMakeRunwaySign( SGMaterialLib *matlib,
const string path, const string name ) const string path, const string name )
{ {
// for demo purposes we assume each element (letter) is 1x1 meter. // for demo purposes we assume each element (letter) is 1x1 meter.
+5 -5
View File
@@ -21,8 +21,8 @@
// $Id$ // $Id$
#ifndef _APT_SIGNS_HXX #ifndef _SG_APT_SIGNS_HXX
#define _APT_SIGNS_HXX #define _SG_APT_SIGNS_HXX
#ifndef __cplusplus #ifndef __cplusplus
@@ -42,13 +42,13 @@ SG_USING_STD(string);
// Generate a taxi sign // Generate a taxi sign
ssgBranch *gen_taxi_sign( SGMaterialLib *matlib, ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
const string path, const string content ); const string path, const string content );
// Generate a runway sign // Generate a runway sign
ssgBranch *gen_runway_sign( SGMaterialLib *matlib, ssgBranch *sgMakeRunwaySign( SGMaterialLib *matlib,
const string path, const string name ); const string path, const string name );
#endif // _APT_SIGNS_HXX #endif // _SG_APT_SIGNS_HXX
+2 -2
View File
@@ -47,7 +47,7 @@ static int StrobePostDraw( ssgEntity *e ) {
// Generate a directional light // Generate a directional light
ssgLeaf *gen_directional_light( sgVec3 pt, sgVec3 dir, sgVec3 up, ssgLeaf *sgMakeDirectionalLight( sgVec3 pt, sgVec3 dir, sgVec3 up,
const SGMaterial *mat ) { const SGMaterial *mat ) {
// calculate a vector perpendicular to dir and up // calculate a vector perpendicular to dir and up
@@ -575,7 +575,7 @@ static ssgLeaf *gen_normal_line( SGMaterialLib *matlib,
#endif #endif
ssgBranch *gen_directional_lights( const point_list &nodes, ssgBranch *sgMakeDirectionalLights( const point_list &nodes,
const point_list &normals, const point_list &normals,
const int_list &pnt_i, const int_list &pnt_i,
const int_list &nml_i, const int_list &nml_i,
+15 -15
View File
@@ -21,8 +21,8 @@
// $Id$ // $Id$
#ifndef _PT_LIGHTS_HXX #ifndef _SG_PT_LIGHTS_HXX
#define _PT_LIGHTS_HXX #define _SG_PT_LIGHTS_HXX
#ifndef __cplusplus #ifndef __cplusplus
@@ -51,16 +51,16 @@ typedef int_list::const_iterator int_point_list_iterator;
// Define the various supported light types // Define the various supported light types
typedef enum { typedef enum {
FG_RWYLIGHT_TAXI = 0, SG_RWYLIGHT_TAXI = 0,
FG_RWYLIGHT_VASI, SG_RWYLIGHT_VASI,
FG_RWYLIGHT_EDGE, SG_RWYLIGHT_EDGE,
FG_RWYLIGHT_TOUCHDOWN, SG_RWYLIGHT_TOUCHDOWN,
FG_RWYLIGHT_THRESHOLD, SG_RWYLIGHT_THRESHOLD,
FG_RWYLIGHT_WHITE, SG_RWYLIGHT_WHITE,
FG_RWYLIGHT_RED, SG_RWYLIGHT_RED,
FG_RWYLIGHT_GREEN, SG_RWYLIGHT_GREEN,
FG_RWYLIGHT_YELLOW SG_RWYLIGHT_YELLOW
} fgRunwayLightType; } sgPointLightType;
// Generate a directional light. This routines creates a // Generate a directional light. This routines creates a
@@ -92,10 +92,10 @@ typedef enum {
// Yes this get's to be long and convoluted. If you can suggest a // Yes this get's to be long and convoluted. If you can suggest a
// simpler way, please do! :-) // simpler way, please do! :-)
ssgLeaf *gen_directional_light( sgVec3 pt, sgVec3 dir, sgVec3 up ); ssgLeaf *sgMakeDirectionalLight( sgVec3 pt, sgVec3 dir, sgVec3 up );
ssgBranch *gen_directional_lights( const point_list &nodes, ssgBranch *sgMakeDirectionalLights( const point_list &nodes,
const point_list &normals, const point_list &normals,
const int_list &pnt_i, const int_list &pnt_i,
const int_list &nml_i, const int_list &nml_i,
@@ -104,4 +104,4 @@ ssgBranch *gen_directional_lights( const point_list &nodes,
sgVec3 up ); sgVec3 up );
#endif // _PT_LIGHTS_HXX #endif // _SG_PT_LIGHTS_HXX