zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Proper editor picking code for Polymer. Also fixes a bunch of tabs that MSVC snuck in polymer.c.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1554 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-12-07 07:01:44 +00:00
parent 1a1ba2b0b1
commit 905abc3091
3 changed files with 193 additions and 769 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/build/include/polymer.h
View file

@ -94,7 +94,7 @@ typedef struct s_prmaterial {
GLuint detailmap; GLuint detailmap;
GLfloat detailscale[2]; GLfloat detailscale[2];
// PR_BIT_DIFFUSE_MODULATION // PR_BIT_DIFFUSE_MODULATION
GLfloat diffusemodulation[4]; GLubyte diffusemodulation[4];
// PR_BIT_SPECULAR_MAP // PR_BIT_SPECULAR_MAP
GLuint specmap; GLuint specmap;
// PR_BIT_SPECULAR_MATERIAL // PR_BIT_SPECULAR_MATERIAL
@ -289,12 +289,6 @@ typedef struct s_pranimatespritesinfo {
int32_t x, y, a, smoothratio; int32_t x, y, a, smoothratio;
} _pranimatespritesinfo; } _pranimatespritesinfo;
// MEMORY POOL
/*
#define POLYMER_POOL_SIZE (128 * 1048576)
extern nedpool* polymer_pool;
*/
// EXTERNAL FUNCTIONS // EXTERNAL FUNCTIONS
int32_t polymer_init(void); int32_t polymer_init(void);
void polymer_uninit(void); void polymer_uninit(void);
@ -302,6 +296,7 @@ void polymer_glinit(void);
void polymer_loadboard(void); void polymer_loadboard(void);
void polymer_drawrooms(int32_t daposx, int32_t daposy, int32_t daposz, int16_t daang, int32_t dahoriz, int16_t dacursectnum); void polymer_drawrooms(int32_t daposx, int32_t daposy, int32_t daposz, int16_t daang, int32_t dahoriz, int16_t dacursectnum);
void polymer_drawmasks(void); void polymer_drawmasks(void);
void polymer_editorpick(void);
void polymer_rotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, int8_t dashade, char dapalnum, char dastat, int32_t cx1, int32_t cy1, int32_t cx2, int32_t cy2); void polymer_rotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, int8_t dashade, char dapalnum, char dastat, int32_t cx1, int32_t cy1, int32_t cx2, int32_t cy2);
void polymer_drawmaskwall(int32_t damaskwallcnt); void polymer_drawmaskwall(int32_t damaskwallcnt);
void polymer_drawsprite(int32_t snum); void polymer_drawsprite(int32_t snum);

9
polymer/eduke32/build/src/build.c
View file

@ -512,11 +512,12 @@ CANCEL:
#endif #endif
drawmasks(); drawmasks();
#ifdef POLYMER #ifdef POLYMER
if (rendmode == 4) if (rendmode == 4 && searchit == 2)
{ {
extern void polymer_alt_editorselect(void); polymer_editorpick();
if (searchit==2) drawrooms(pos.x,pos.y,pos.z,ang,horiz,cursectnum);
polymer_alt_editorselect(); ExtAnalyzeSprites();
drawmasks();
} }
#endif #endif

944
polymer/eduke32/build/src/polymer.c
View file

File diff suppressed because it is too large Load diff