-C++FLAGS= -Wall -O2
-CPPFLAGS= -I/usr/include
+CPPFLAGS= -I/usr/include -Wall -O2 -Wmissing-prototypes -Wstrict-prototypes $(WERROR)
+WERROR=-Werror
LDFLAGS=
LIBS=
0,0, 500,500, 0,0, pixelbase);
XGCValues gcvalues;
+ int i;
for (i=0; i<2; i++) {
gcvalues.plane_mask= planemasks[i];
// First, the fabric
void Cell::display(Output& o) {
int nn[4];
int totalnn= 0;
- for (int i=0; i<4; i++) {
+ int i;
+ for (i=0; i<4; i++) {
nn[i]= checkneededline(p[i],p[(i+1)&3]);
totalnn+= nn[i];
}
void SortedCellList::insert(Cell *it) {
double index= it->index();
- for (int fragment= used-1;
+ int fragment;
+ for (fragment= used-1;
fragment >= 0 && index < fragments[fragment]->entries[0].index;
fragment--);
if (fragment < 0) {
nf->entries[0].cell= it;
return;
}
- for (int entry= 0;
+ int entry;
+ for (entry= 0;
entry < fragments[fragment]->used &&
index > fragments[fragment]->entries[entry].index;
entry++);
*/
#include <stdlib.h>
+#include <stdio.h>
#include "library.hh"
#include "transforms.hh"
Parameter<int> tn("tn", "Number of sections around `strip'", 30, 1, 1, 500);
Parameter<int> un("un", "Number of sections across `strip'", 15, 1, 1, 500);
Parameter<double> theta("theta", "Angle of model rotation",
- /*-PI/2.*/0, PI/8., -PI*2., PI*2.);
-Parameter<double> eta("eta", "Angle of model elevation", 0., PI/8., -PI*2., PI*2.);
+ /*-PI/2.*/0, M_PI/8., -M_PI*2., M_PI*2.);
+Parameter<double> eta("eta", "Angle of model elevation", 0., M_PI/8., -M_PI*2., M_PI*2.);
Parameter<double> planedistance("plane", "Distance from projection plane to origin",
4., .25, 0., 100.);
Parameter<double> eyedistance("eye", "Distance from projection eye to origin",
#include "moebius.hh"
Point MoebiusStrip::edgepoint(double t) {
- double theta= (t-0.5)*4.0*PI;
+ double theta= (t-0.5)*4.0*M_PI;
double r= 1.0 - halfgap*(1.0 - sin(theta/2.0));
return Point(r*sin(theta),
-r*cos(theta),
// The second end is oriented towards [0,-1,0]
Point MoebiusEnfoldment::edgepoint(double t) {
- double theta= t*2.0*PI;
+ double theta= t*2.0*M_PI;
return Point(sin(theta),cos(theta),0);
}
double sizehere= sqrt(1-t*t);
return Point((u*2.0-1.0) * sizehere,
t,
- sizehere * thickness * sin(u*2.0*PI));
+ sizehere * thickness * sin(u*2.0*M_PI));
} else {
t /= bottomportion;
- double theta= (.5-u)*2*PI;
- Bezier bx(sin(theta*.5), -theta/PI, 0, 0);
+ double theta= (.5-u)*2*M_PI;
+ Bezier bx(sin(theta*.5), -theta/M_PI, 0, 0);
double ypushiness= (1-cos(theta))*2.5+1;
-// double fudge= (PI*sin(theta*.5)*cos(theta*.5))*(.5-u)*(.5-u)*4;
+// double fudge= (M_PI*sin(theta*.5)*cos(theta*.5))*(.5-u)*(.5-u)*4;
double fudge= (.5-u)*(.5-u)*4*cos(theta*.5);
Bezier by(-cos(theta*.5), 0,
cos(theta)*ypushiness + fudge*ypushiness,
}
AnyParameter* AnyParameter::find(const char *n) {
- for (AnyParameter* search= first;
+ AnyParameter* search;
+ for (search= first;
search && strcmp(search->name,n);
search= search->next);
return search;