Skip to content

Commit

Permalink
"4Dtetris9may01.zip" -> "4Dtetris12jan05.zip"
Browse files Browse the repository at this point in the history
  • Loading branch information
@PierceLBrooks
PierceLBrooks committed Dec 30, 2024
1 parent 016c66c commit ecf799f
Show file tree
Hide file tree
Showing 14 changed files with 299 additions and 17 deletions.
68 changes: 68 additions & 0 deletions DList.rpo
View file
Original file line number Diff line number Diff line change
@@ -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_
2 changes: 1 addition & 1 deletion FourD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "Asserts.h"
#include "Shared.h"
#include <GL/glut.h>
#include <glut.h>

class FourD
{
Expand Down
4 changes: 2 additions & 2 deletions GenPiece.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions Hyper.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
//#define DEBUG_HYPER

#include "Hyper.h"
#include "DList.h"

DList<Hyper> junk; // is this how to instantiate this template??

extern Board *board;
extern float *LEN;
Expand Down
2 changes: 1 addition & 1 deletion Hyper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef _HYPER_H_
#define _HYPER_H_

#include <GL/glut.h>
#include <glut.h>
#include "FourD.h"
#include "Asserts.h"
#include "Board.h"
Expand Down
68 changes: 68 additions & 0 deletions Hyper.rpo
View file
Original file line number Diff line number Diff line change
@@ -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_
21 changes: 16 additions & 5 deletions Main.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,32 @@
//
// (C) 1996 Board of Trustees University of Illinois

#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <sys/time.h>
// #include <device.h>
#include <GL/glut.h>
#include <GL/gl.h>
#include <iostream.h>
// #include <device.h> from Irix
//#include <GL/glut.h>
//#include <GL/gl.h>
// #include <gl.h>
#include <glut.h>
#include <strings.h>
#include <math.h>
#include "Board.h"
#include "Shared.h"
#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<Hyper>;

int *DIM;
float *LEN;
Board *board;
Expand Down Expand Up @@ -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;
Expand Down
73 changes: 73 additions & 0 deletions Main.rpo
View file
Original file line number Diff line number Diff line change
@@ -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_
4 changes: 2 additions & 2 deletions Rotor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
//
// (C) 1996 Board of Trustees University of Illinois

#include <device.h>
#include <GL/glut.h>
// #include <device.h>
#include <glut.h>
#include "Shared.h"

class Rotor {
Expand Down
3 changes: 2 additions & 1 deletion Shared.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GL/gl.h>
#include <glut.h>
// #include <GL/gl.h>


void getmatrix(float* mat);
Expand Down
15 changes: 15 additions & 0 deletions mac.mf
View file
Original file line number Diff line number Diff line change
@@ -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}
2 changes: 2 additions & 0 deletions readme-gkf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
12jan05
first Mac version that compiled, tanks to Stuart Levy
9 changes: 4 additions & 5 deletions skel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define S(u) sin(u*DG)
#define C(u) cos(u*DG)
#define CLAMP(x,u,v) (x<u? u : (x>v ? 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*/
Expand All @@ -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)
Expand All @@ -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 */
}
Expand Down Expand Up @@ -306,4 +306,3 @@ int main(int argc, char **argv){
glutMainLoop();
}


Loading

0 comments on commit ecf799f

Please sign in to comment.