Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd85fa2457 | ||
|
|
430136fdc9 | ||
|
|
a616aa8e55 | ||
|
|
05b9166c25 | ||
|
|
71770eb92e | ||
|
|
2089a2a956 |
@@ -7,3 +7,4 @@ config.cache
|
||||
config.log
|
||||
config.status
|
||||
configure
|
||||
do-config.sh
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
New in 0.3.5.pre1
|
||||
* March 22, 2004
|
||||
New in 0.3.5
|
||||
* March 26, 2004
|
||||
|
||||
* Added Andy's nasal interpreter for small built in scripting tasks.
|
||||
Nasal integrates nicely with FlightGear's property system.
|
||||
|
||||
+9
-2
@@ -10,7 +10,7 @@ dnl Require at least automake 2.52
|
||||
AC_PREREQ(2.52)
|
||||
|
||||
dnl Initialize the automake stuff
|
||||
AM_INIT_AUTOMAKE(SimGear, 0.3.5.pre1)
|
||||
AM_INIT_AUTOMAKE(SimGear, 0.3.5)
|
||||
|
||||
dnl Specify KAI C++ compiler and flags.
|
||||
dnl Borrowed with slight modification from blitz distribution.
|
||||
@@ -113,6 +113,13 @@ else
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$with_jpeg_factory" = "xyes")
|
||||
|
||||
# specify the plib location
|
||||
AC_ARG_WITH(plib, [ --with-plib=PREFIX Specify the prefix path to plib])
|
||||
|
||||
if test "x$with_plib" != "x" ; then
|
||||
echo "plib prefix is $with_plib"
|
||||
EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
|
||||
fi
|
||||
|
||||
dnl Determine an extra directories to add to include/lib search paths
|
||||
case "${host}" in
|
||||
@@ -127,7 +134,7 @@ case "${host}" in
|
||||
if test -d /opt/X11R6 ; then
|
||||
EXTRA_DIR2="/opt/X11R6"
|
||||
fi
|
||||
EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2"
|
||||
EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
@@ -454,6 +454,7 @@ static void run1(struct Context* ctx, struct Frame* f, naRef code)
|
||||
break;
|
||||
case OP_MCALL:
|
||||
c = POP(ctx); b = POP(ctx); a = POP(ctx); // a,b,c = obj, func, args
|
||||
naVec_append(ctx->temps, a);
|
||||
setupFuncall(ctx, b, c);
|
||||
naHash_set(ctx->fStack[ctx->fTop-1].locals, ctx->meRef, a);
|
||||
break;
|
||||
|
||||
@@ -203,7 +203,16 @@ SGCloudLayer::rebuild()
|
||||
|
||||
const float layer_scale = layer_span / scale;
|
||||
const float mpi = SG_PI/4;
|
||||
const float alt_diff = layer_asl * 0.8;
|
||||
|
||||
// caclculate the difference between a flat-earth model and
|
||||
// a round earth model given the span and altutude ASL of
|
||||
// the cloud layer. This is the difference in altitude between
|
||||
// the top of the inverted bowl and the edge of the bowl.
|
||||
// const float alt_diff = layer_asl * 0.8;
|
||||
const float layer_to_core = (SG_EARTH_RAD * 1000 + layer_asl);
|
||||
const float layer_angle = acos( 0.5*layer_span / layer_to_core);
|
||||
const float border_to_core = layer_to_core * sin(layer_angle);
|
||||
const float alt_diff = layer_to_core - border_to_core;
|
||||
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
|
||||
@@ -47,13 +47,6 @@ inline void gamma_correct_rgb(float *color,
|
||||
color[0] = pow(color[0], tmp);
|
||||
color[1] = pow(color[1], tmp);
|
||||
color[2] = pow(color[2], tmp);
|
||||
|
||||
if ( color[0] < 0.0 ) { color[0] = 0.0; }
|
||||
if ( color[1] < 0.0 ) { color[1] = 0.0; }
|
||||
if ( color[2] < 0.0 ) { color[2] = 0.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; }
|
||||
};
|
||||
|
||||
inline void gamma_correct_c(float *color,
|
||||
@@ -63,8 +56,6 @@ inline void gamma_correct_c(float *color,
|
||||
return;
|
||||
|
||||
*color = pow(*color, reff/system);
|
||||
if ( *color < 0.0 ) { *color = 0.0; }
|
||||
if ( *color > 1.0 ) { *color = 1.0; }
|
||||
};
|
||||
|
||||
inline void gamma_restore_rgb(float *color,
|
||||
@@ -77,13 +68,6 @@ inline void gamma_restore_rgb(float *color,
|
||||
color[0] = pow(color[0], tmp);
|
||||
color[1] = pow(color[1], tmp);
|
||||
color[2] = pow(color[2], tmp);
|
||||
|
||||
if ( color[0] < 0.0 ) { color[0] = 0.0; }
|
||||
if ( color[1] < 0.0 ) { color[1] = 0.0; }
|
||||
if ( color[2] < 0.0 ) { color[2] = 0.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; }
|
||||
};
|
||||
|
||||
inline void gamma_restore_c(float *color,
|
||||
@@ -93,8 +77,6 @@ inline void gamma_restore_c(float *color,
|
||||
return;
|
||||
|
||||
*color = pow(*color, system/reff);
|
||||
if ( *color < 0.0 ) { *color = 0.0; }
|
||||
if ( *color > 1.0 ) { *color = 1.0; }
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user