summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2024-03-15 20:42:42 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2024-03-15 20:42:42 +0100
commit8b094e8af3215bed1c3c3c662e4b93163dac6bbc (patch)
tree4bfe94e43074e774cfe71186a467fabcd328406e /test
parentb3e1df35848003952369f8cbf05cdd41ae62d839 (diff)
Fix a bunch of compiler warnings, particularly for old compilers
Works now much better with old C99 and C++98 standard compilers. Fixed: C++ comments in C files and headers included by C files. There are still some warnings with C90 though but these would be hard to fix and left as-is for now. test/fractals.cxx: some arrays were too small by 1, or the compiler warned at least (false positive?). Anyway, it's fixed now.
Diffstat (limited to 'test')
-rw-r--r--test/fractals.cxx19
1 files changed, 10 insertions, 9 deletions
diff --git a/test/fractals.cxx b/test/fractals.cxx
index b680d3d0d..bbdde0569 100644
--- a/test/fractals.cxx
+++ b/test/fractals.cxx
@@ -5,7 +5,7 @@
// demonstrate how to add FLTK controls to a GLUT program. The GLUT
// code is unchanged except for the end (search for FLTK to find changes).
//
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2024 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -77,6 +77,7 @@ typedef enum { NOTALLOWED, MOUNTAIN, TREE, ISLAND, BIGMTN, STEM, LEAF,
MOUNTAIN_MAT, WATER_MAT, LEAF_MAT, TREE_MAT, STEMANDLEAVES,
AXES } DisplayLists;
+// Note: MAXLEVEL is the highest level, range is 0..MAXLEVEL
#define MAXLEVEL 8
int Rebuild = 1, /* Rebuild display list in next display? */
@@ -146,11 +147,11 @@ float xzslope(float v1[3], float v2[3])
/************************ MOUNTAIN STUFF ***********************/
/***************************************************************/
-GLfloat DispFactor[MAXLEVEL]; /* Array of what to multiply random number
- by for a given level to get midpoint
- displacement */
-GLfloat DispBias[MAXLEVEL]; /* Array of what to add to random number
- before multiplying it by DispFactor */
+GLfloat DispFactor[MAXLEVEL + 1]; /* Array of what to multiply random number
+ by for a given level to get midpoint
+ displacement */
+GLfloat DispBias[MAXLEVEL + 1]; /* Array of what to add to random number
+ before multiplying it by DispFactor */
#define NUMRANDS 191
float RandTable[NUMRANDS]; /* hash table of random numbers so we can
@@ -233,9 +234,9 @@ void FMR(GLfloat v1[3], GLfloat v2[3], GLfloat v3[3], int level)
void FractalMountain(GLfloat v1[3], GLfloat v2[3], GLfloat v3[3],
int pegged[3])
{
- GLfloat lengths[MAXLEVEL];
- GLfloat fraction[8] = { 0.3f, 0.3f, 0.4f, 0.2f, 0.3f, 0.2f, 0.4f, 0.4f };
- GLfloat bias[8] = { 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f };
+ GLfloat lengths[MAXLEVEL + 1];
+ GLfloat fraction[8] = { 0.3f, 0.3f, 0.4f, 0.2f, 0.3f, 0.2f, 0.4f, 0.4f };
+ GLfloat bias[8] = { 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f };
int i;
float avglen = (xzlength(v1, v2) +
xzlength(v2, v3) +