diff --git a/polymer/build/Makefile.deps b/polymer/build/Makefile.deps index 6e93bfd35..d558f306f 100644 --- a/polymer/build/Makefile.deps +++ b/polymer/build/Makefile.deps @@ -10,7 +10,7 @@ $(OBJ)compat.$o: $(SRC)compat.c $(INC)compat.h $(OBJ)config.$o: $(SRC)config.c $(INC)compat.h $(INC)osd.h $(INC)editor.h $(OBJ)crc32.$o: $(SRC)crc32.c $(INC)crc32.h $(OBJ)defs.$o: $(SRC)defs.c $(INC)build.h $(INC)baselayer.h $(INC)scriptfile.h $(INC)compat.h -$(OBJ)engine.$o: $(SRC)engine.c $(SRC)polymost.c $(INC)kplib.h $(SRC)hightile.c $(SRC)mdsprite.c $(INC)md4.h $(INC)lzf.h $(INC)lzwnew.h $(INC)compat.h $(INC)build.h $(INC)pragmas.h $(INC)cache1d.h $(INC)a.h $(INC)osd.h $(INC)baselayer.h +$(OBJ)engine.$o: $(SRC)engine.c $(SRC)polymost.c $(SRC)polymer.c $(INC)kplib.h $(SRC)hightile.c $(SRC)mdsprite.c $(INC)md4.h $(INC)lzf.h $(INC)lzwnew.h $(INC)compat.h $(INC)build.h $(INC)pragmas.h $(INC)cache1d.h $(INC)a.h $(INC)osd.h $(INC)baselayer.h $(OBJ)game.$o: $(SRC)game.c $(INC)compat.h $(INC)build.h $(INC)names.h $(INC)pragmas.h $(INC)cache1d.h $(INC)game.h $(INC)osd.h $(INC)baselayer.h $(OBJ)glbuild.$o: $(SRC)glbuild.c $(INC)glbuild.h $(INC)baselayer.h $(OBJ)jfaud_sound.$o: $(SRC)jfaud_sound.cpp $(INC)osd.h $(INC)compat.h $(INC)cache1d.h diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c index 8bfa109b6..5b5fa3d01 100644 --- a/polymer/build/src/engine.c +++ b/polymer/build/src/engine.c @@ -698,7 +698,8 @@ int hicclearsubst(long picnum, long palnum) { return 0; } long polymost_drawtilescreen (long tilex, long tiley, long wallnum, long dimen) { return -1; } #endif //============================================================================= //POLYMOST ENDS - + +#include "polymer.c" // // getpalookup (internal) @@ -5661,7 +5662,12 @@ void drawrooms(long daposx, long daposy, long daposz, } while (i != 0); umost[0] = shortptr1[0]-windowy1; dmost[0] = shortptr2[0]-windowy1; - + + if (0) + { + polymer_drawrooms(); + return; + } //============================================================================= //POLYMOST BEGINS #ifdef POLYMOST polymost_drawrooms(); if (rendmode) { return; } diff --git a/polymer/build/src/polymer.c b/polymer/build/src/polymer.c index e69de29bb..9e378dd6c 100644 --- a/polymer/build/src/polymer.c +++ b/polymer/build/src/polymer.c @@ -0,0 +1,32 @@ +//placeholder placeholder lol + +void polymer_glinit(void) +{ + bglClearColor(0.0f, 0.0f, 0.0f, 1.0f); + bglClear(GL_COLOR_BUFFER_BIT); + bglViewport(0, 0, 1024, 768); + bglDisable(GL_TEXTURE_2D); + bglEnable(GL_DEPTH_TEST); + bglMatrixMode(GL_PROJECTION); + bglLoadIdentity(); + bglFrustum(-1.0f, 1.0f, -0.75f, 0.75, 1.0f, 100.0f); + bglMatrixMode(GL_MODELVIEW); + bglLoadIdentity(); +} + +void polymer_drawsector(short sectnum) +{ + sectortype *sec; + walltype *wal; + + sec = §or[sectnum]; + wal = &wall[sec->wallptr]; + OSD_Printf("%i\n", sec->wallnum); +} + +void polymer_drawrooms(void) +{ + OSD_Printf("drawrooms\n"); + polymer_glinit(); + polymer_drawsector(globalcursectnum); +}