diff --git a/DList.rpo b/DList.rpo new file mode 100644 index 0000000..3006b43 --- /dev/null +++ b/DList.rpo @@ -0,0 +1,68 @@ +M DList.C +D /Users/georgefrancis/illimath/kaiser/4Dtetris +A '-O' '-g' '-frepo' '-DMAC_OS_X' '-I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers' '-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers' '-c' '-o' 'DList.o' +O _ZSt13__cmath_powerIeET_S0_j +O _ZSt13__cmath_powerIfET_S0_j +O _ZSt13__cmath_powerIdET_S0_j +O _ZTVSt13basic_istreamIwSt11char_traitsIwEE +O _ZTVSi +O _ZTVSt13basic_ostreamIwSt11char_traitsIwEE +O _ZTVSo +O _ZTVSt14collate_bynameIwE +O _ZTVSt14codecvt_bynameIwc11__mbstate_tE +O _ZTVSt15messages_bynameIwE +O _ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15numpunct_bynameIwE +O _ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt17moneypunct_bynameIwLb1EE +O _ZTVSt17moneypunct_bynameIwLb0EE +O _ZTVSt14collate_bynameIcE +O _ZTVSt14codecvt_bynameIcc11__mbstate_tE +O _ZTVSt15messages_bynameIcE +O _ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15numpunct_bynameIcE +O _ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt17moneypunct_bynameIcLb1EE +O _ZTVSt17moneypunct_bynameIcLb0EE +O _ZSt12__pow_helperIeET_S0_i +O _ZSt12__pow_helperIfET_S0_i +O _ZSt12__pow_helperIdET_S0_i +O _ZTVSt9basic_iosIwSt11char_traitsIwEE +O _ZTVSt9basic_iosIcSt11char_traitsIcEE +O _ZTVSt8messagesIwE +O _ZTVSt8messagesIcE +O _ZTVSt10moneypunctIwLb0EE +O _ZTVSt10moneypunctIwLb1EE +O _ZTVSt10moneypunctIcLb0EE +O _ZTVSt10moneypunctIcLb1EE +O _ZTVSt11__timepunctIwE +O _ZTVSt11__timepunctIcE +O _ZTVSt7collateIwE +O _ZTVSt7collateIcE +O _ZTVSt8numpunctIwE +O _ZTVSt8numpunctIcE +O _ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE +O _ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE +O _ZTVSt12ctype_bynameIwE +O _ZTVSt12ctype_bynameIcE +O _ZTVSt21__ctype_abstract_baseIwE +O _ZTVSt21__ctype_abstract_baseIcE +O _ZTVSt15basic_streambufIwSt11char_traitsIwEE +O _ZNSt15basic_streambufIwSt11char_traitsIwEE13_S_pback_sizeE +O _ZTVSt15basic_streambufIcSt11char_traitsIcEE +O _ZNSt15basic_streambufIcSt11char_traitsIcEE13_S_pback_sizeE +O _ZNSt17_Swap_lock_structILi0EE12_S_swap_lockE +O _ZSt23lexicographical_compareIPKaS1_EbT_S2_T0_S3_ +O _ZSt3minImERKT_S2_S2_ diff --git a/FourD.h b/FourD.h index d416056..080143f 100644 --- a/FourD.h +++ b/FourD.h @@ -13,7 +13,7 @@ #include "Asserts.h" #include "Shared.h" -#include +#include class FourD { diff --git a/GenPiece.C b/GenPiece.C index c5ef0b8..6f53b02 100644 --- a/GenPiece.C +++ b/GenPiece.C @@ -61,8 +61,8 @@ int **GenPiece::CanRotate(int dir, int dude, int sign) int dircenter, dudecenter; if (centerstat < 0) { // center is messed up - dircenter = (int)(ffloor((((*center)[dir] - botcorner[dir])/LEN[dir])+.5)); - dudecenter = (int)(ffloor((((*center)[dude] - botcorner[dude])/LEN[dude]) + dircenter = (int)(floor((((*center)[dir] - botcorner[dir])/LEN[dir])+.5)); + dudecenter = (int)(floor((((*center)[dude] - botcorner[dude])/LEN[dude]) + .5)); } else { // center is (0,0) diff --git a/Hyper.C b/Hyper.C index 9898b23..75890bc 100644 --- a/Hyper.C +++ b/Hyper.C @@ -13,6 +13,9 @@ //#define DEBUG_HYPER #include "Hyper.h" +#include "DList.h" + +DList junk; // is this how to instantiate this template?? extern Board *board; extern float *LEN; diff --git a/Hyper.h b/Hyper.h index 5a7ebe3..9fd4210 100644 --- a/Hyper.h +++ b/Hyper.h @@ -11,7 +11,7 @@ #ifndef _HYPER_H_ #define _HYPER_H_ -#include +#include #include "FourD.h" #include "Asserts.h" #include "Board.h" diff --git a/Hyper.rpo b/Hyper.rpo new file mode 100644 index 0000000..62092c7 --- /dev/null +++ b/Hyper.rpo @@ -0,0 +1,68 @@ +M Hyper.C +D /Users/georgefrancis/illimath/kaiser/4Dtetris +A '-O' '-g' '-frepo' '-DMAC_OS_X' '-I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers' '-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers' '-c' '-o' 'Hyper.o' +O _ZSt13__cmath_powerIeET_S0_j +O _ZSt13__cmath_powerIfET_S0_j +O _ZSt13__cmath_powerIdET_S0_j +O _ZTVSt13basic_istreamIwSt11char_traitsIwEE +O _ZTVSi +O _ZTVSt13basic_ostreamIwSt11char_traitsIwEE +O _ZTVSo +O _ZTVSt14collate_bynameIwE +O _ZTVSt14codecvt_bynameIwc11__mbstate_tE +O _ZTVSt15messages_bynameIwE +O _ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15numpunct_bynameIwE +O _ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt17moneypunct_bynameIwLb1EE +O _ZTVSt17moneypunct_bynameIwLb0EE +O _ZTVSt14collate_bynameIcE +O _ZTVSt14codecvt_bynameIcc11__mbstate_tE +O _ZTVSt15messages_bynameIcE +O _ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15numpunct_bynameIcE +O _ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt17moneypunct_bynameIcLb1EE +O _ZTVSt17moneypunct_bynameIcLb0EE +O _ZSt12__pow_helperIeET_S0_i +O _ZSt12__pow_helperIfET_S0_i +O _ZSt12__pow_helperIdET_S0_i +O _ZTVSt9basic_iosIwSt11char_traitsIwEE +O _ZTVSt9basic_iosIcSt11char_traitsIcEE +O _ZTVSt8messagesIwE +O _ZTVSt8messagesIcE +O _ZTVSt10moneypunctIwLb0EE +O _ZTVSt10moneypunctIwLb1EE +O _ZTVSt10moneypunctIcLb0EE +O _ZTVSt10moneypunctIcLb1EE +O _ZTVSt11__timepunctIwE +O _ZTVSt11__timepunctIcE +O _ZTVSt7collateIwE +O _ZTVSt7collateIcE +O _ZTVSt8numpunctIwE +O _ZTVSt8numpunctIcE +O _ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE +O _ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE +O _ZTVSt12ctype_bynameIwE +O _ZTVSt12ctype_bynameIcE +O _ZTVSt21__ctype_abstract_baseIwE +O _ZTVSt21__ctype_abstract_baseIcE +O _ZTVSt15basic_streambufIwSt11char_traitsIwEE +O _ZNSt15basic_streambufIwSt11char_traitsIwEE13_S_pback_sizeE +O _ZTVSt15basic_streambufIcSt11char_traitsIcEE +O _ZNSt15basic_streambufIcSt11char_traitsIcEE13_S_pback_sizeE +O _ZNSt17_Swap_lock_structILi0EE12_S_swap_lockE +O _ZSt23lexicographical_compareIPKaS1_EbT_S2_T0_S3_ +O _ZSt3minImERKT_S2_S2_ diff --git a/Main.C b/Main.C index cf5863e..fc7af30 100644 --- a/Main.C +++ b/Main.C @@ -9,11 +9,16 @@ // // (C) 1996 Board of Trustees University of Illinois +#include +#include +#include +#include #include -// #include -#include -#include -#include +// #include from Irix +//#include +//#include +// #include +#include #include #include #include "Board.h" @@ -21,9 +26,15 @@ #include "GenPiece.h" #include "Pieces.h" #include "Rotor.h" +#include "DList.h" // unnecessary? +#include "Hyper.h" // unnecessary? #define SOAK(K) while(getbutton(K)) +// How do we instantiate a template? Just name one? +#include "DList.C" // ugh +template class DList; + int *DIM; float *LEN; Board *board; @@ -762,7 +773,7 @@ void Reshape(int width, int height) } -void main(int argc, char **argv) +int main(int argc, char **argv) { cout << "\n\nHyperTetris\n by\nGreg Kaiser\n" << endl; cout << "(C) 1996 Board of Trustees University of Illinois\n" << endl; diff --git a/Main.rpo b/Main.rpo new file mode 100644 index 0000000..9e5c444 --- /dev/null +++ b/Main.rpo @@ -0,0 +1,73 @@ +M Main.C +D /Users/georgefrancis/illimath/kaiser/4Dtetris +A '-O' '-g' '-frepo' '-DMAC_OS_X' '-I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers' '-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers' '-c' '-o' 'Main.o' +O _ZSt13__cmath_powerIeET_S0_j +O _ZSt13__cmath_powerIfET_S0_j +O _ZSt13__cmath_powerIdET_S0_j +C _ZN5DListI5HyperE9EndOfListEv +C _ZN5DListI5HyperE3GetEv +C _ZN5DListI5HyperE8NotEmptyEv +C _ZN5DListI5HyperE4TailEv +C _ZN5DListI5HyperE4HeadEv +O _ZTVSt13basic_istreamIwSt11char_traitsIwEE +O _ZTVSi +O _ZTVSt13basic_ostreamIwSt11char_traitsIwEE +O _ZTVSo +O _ZTVSt14collate_bynameIwE +O _ZTVSt14codecvt_bynameIwc11__mbstate_tE +O _ZTVSt15messages_bynameIwE +O _ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt15numpunct_bynameIwE +O _ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE +O _ZTVSt17moneypunct_bynameIwLb1EE +O _ZTVSt17moneypunct_bynameIwLb0EE +O _ZTVSt14collate_bynameIcE +O _ZTVSt14codecvt_bynameIcc11__mbstate_tE +O _ZTVSt15messages_bynameIcE +O _ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt15numpunct_bynameIcE +O _ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE +O _ZTVSt17moneypunct_bynameIcLb1EE +O _ZTVSt17moneypunct_bynameIcLb0EE +O _ZSt12__pow_helperIeET_S0_i +O _ZSt12__pow_helperIfET_S0_i +O _ZSt12__pow_helperIdET_S0_i +O _ZTVSt9basic_iosIwSt11char_traitsIwEE +O _ZTVSt9basic_iosIcSt11char_traitsIcEE +O _ZTVSt8messagesIwE +O _ZTVSt8messagesIcE +O _ZTVSt10moneypunctIwLb0EE +O _ZTVSt10moneypunctIwLb1EE +O _ZTVSt10moneypunctIcLb0EE +O _ZTVSt10moneypunctIcLb1EE +O _ZTVSt11__timepunctIwE +O _ZTVSt11__timepunctIcE +O _ZTVSt7collateIwE +O _ZTVSt7collateIcE +O _ZTVSt8numpunctIwE +O _ZTVSt8numpunctIcE +O _ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE +O _ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE +O _ZTVSt12ctype_bynameIwE +O _ZTVSt12ctype_bynameIcE +O _ZTVSt21__ctype_abstract_baseIwE +O _ZTVSt21__ctype_abstract_baseIcE +O _ZTVSt15basic_streambufIwSt11char_traitsIwEE +O _ZNSt15basic_streambufIwSt11char_traitsIwEE13_S_pback_sizeE +O _ZTVSt15basic_streambufIcSt11char_traitsIcEE +O _ZNSt15basic_streambufIcSt11char_traitsIcEE13_S_pback_sizeE +O _ZNSt17_Swap_lock_structILi0EE12_S_swap_lockE +O _ZSt23lexicographical_compareIPKaS1_EbT_S2_T0_S3_ +O _ZSt3minImERKT_S2_S2_ diff --git a/Rotor.h b/Rotor.h index af9197d..22c5618 100644 --- a/Rotor.h +++ b/Rotor.h @@ -8,8 +8,8 @@ // // (C) 1996 Board of Trustees University of Illinois -#include -#include +// #include +#include #include "Shared.h" class Rotor { diff --git a/Shared.h b/Shared.h index e701c4b..489d724 100644 --- a/Shared.h +++ b/Shared.h @@ -48,7 +48,8 @@ //#define clear() glClear(GL_COLOR_BUFFER_BIT) // has problems with clear in the iostream library #define zclear() glCear(GL_DEPTH_BUFFER_BIT) -#include +#include +// #include void getmatrix(float* mat); diff --git a/mac.mf b/mac.mf new file mode 100644 index 0000000..3a6d23a --- /dev/null +++ b/mac.mf @@ -0,0 +1,15 @@ +GLUTINCS = -I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers + +GLUTLIBS = -L/usr/local/lib -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL -lGLU -lobjc -lm + +#DEFS = -DZLIB -DCAVE -DSOUND +DEFS = -DMAC_OS_X + +COPTS = -O +CC = gcc + +CFLAGS = ${COPTS} ${DEFS} -I/usr/include/sys ${GLUTINCS} +LDFLAGS = ${COPTS} ${ZLIBS} ${GLUTLIBS} -framework GLUT + +.c: + ${CC} -o $@ $*.c ${CFLAGS} ${LDFLAGS} diff --git a/readme-gkf b/readme-gkf new file mode 100644 index 0000000..c51babd --- /dev/null +++ b/readme-gkf @@ -0,0 +1,2 @@ +12jan05 +first Mac version that compiled, tanks to Stuart Levy diff --git a/skel.c b/skel.c index 34cbecd..85a0a5d 100644 --- a/skel.c +++ b/skel.c @@ -21,7 +21,7 @@ #define S(u) sin(u*DG) #define C(u) cos(u*DG) #define CLAMP(x,u,v) (xv ? v: x)) -// global variables +/* global variables */ float gap, gap0=1.; /* kludge so that arguments() can set a default gap0 */ float lux[3]={1.,2.,3.}; /*world light direction vector */ float luxx[3]; /* object space direction vector*/ @@ -30,7 +30,7 @@ float mysiz,speed, torq, focal, far; /*console navigation variables */ int win = 1; /* 2 full screen, use 0 for demand sized */ unsigned int BUT, XX, YY,SHIF; /* used in chaptrack gluttery */ int xt,yt; /* once was xt,yt,xm,ym for viewportery */ -int mode,morph,msg; /* pretty global */ +int mode,morph,msg,binoc; /* pretty global */ int th0, th1, dth, ta0, ta1, dta; /* torus parameters */ #define FLYMODE (0) #define TURNMODE (1) @@ -53,12 +53,12 @@ void autotymer(int reset){ /* cheap animations */ Break: ; /* yes Virginia, C has gotos */ } /**********************************************************************/ -void deFault(void){ +void deFault(void){ float tmp; th0=5; th1=355; ta0=5; ta1=355; gap = gap0; msg=1; binoc=0; nose=.06; mode=TURNMODE; speed=.1; torq=.02; focal = 2.; far =13.; mysiz=.01; morph=0; FOR(ii,0,16) starmat[ii]=aff[ii] = (ii/4==ii%4); /* identities */ -FOR(ii,0,3)lux[ii]/=NRM(lux); amb = .3; pwr = 10. ; +tmp=NRM(lux); FOR(ii,0,3)lux[ii]/=tmp; amb = .3; pwr = 10. ; aff[12]=0; aff[13]= 0; aff[14]= -4.2; /* place where we can see it */ autotymer(1); /* reset autotymer to start at the beginning */ } @@ -306,4 +306,3 @@ int main(int argc, char **argv){ glutMainLoop(); } - diff --git a/tet.mf b/tet.mf new file mode 100644 index 0000000..080e81a --- /dev/null +++ b/tet.mf @@ -0,0 +1,42 @@ +OBJS = Main.o\ + FourD.o\ + Hyper.o\ + Asserts.o\ + Board.o\ + GenPiece.o\ + CubePiece.o\ + DList.o\ + LPiece.o\ + StraightPiece.o\ + TPiece.o\ + SPiece.o\ + CornerPiece.o\ + TwistyPiece.o\ + ZPiece.o\ + ThreeLinePiece.o\ + TriPiece.o\ + TwoPiece.o\ + SimplePiece.o\ + Rotor.o\ + Shared.o + +GLUTINCS = -I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers + +GLUTLIBS = -L/usr/local/lib -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL -lGLU -lobjc -lm + +DEFS = -DMAC_OS_X + +COPTS = -O -g -fno-implicit-templates +CC = g++ + +CXXFLAGS = ${COPTS} ${DEFS} ${GLUTINCS} +LDFLAGS = ${COPTS} ${ZLIBS} ${GLUTLIBS} -framework GLUT + +all: 4Dtetris + +4Dtetris: $(OBJS) + ${CC} -o $@ $(OBJS) $(CXXFLAGS) $(LDFLAGS) + + + +