From db730f01951231196cac36630d043c7a3676d446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 19 Nov 2023 04:11:46 +0900 Subject: Finish porting model handling to Zig --- src/Sprites.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/Sprites.cpp') diff --git a/src/Sprites.cpp b/src/Sprites.cpp index 30737df..12bb8b7 100644 --- a/src/Sprites.cpp +++ b/src/Sprites.cpp @@ -1,6 +1,7 @@ #include #include "Camera.h" +#include "Constants.h" #include "Models.h" #include "Sprites.h" #include "misc.h" @@ -12,7 +13,6 @@ extern bool blood; extern float fogcolorr; extern float fogcolorg; extern float fogcolorb; -//Functions extern float sinefluct; extern int environment; extern Model gunmodels[10]; @@ -21,6 +21,8 @@ extern float precipitationhorz; extern float precipitationvert; extern float precipitationdensity; extern float snowdelay; +extern bool visions; + int Sprites::MakeSprite(int atype, float abrightness, float acolor1, float acolor2, float acolor3, @@ -252,9 +254,15 @@ void Sprites::draw() glDepthMask(1); glRotatef(rotation[i],1,.6,.3); - if(type[i]==grenadesprite)gunmodels[grenadebasemodel].draw(); - if(type[i]==spoonsprite)gunmodels[grenadespoonmodel].draw(); - if(type[i]==pinsprite)gunmodels[grenadepinmodel].draw(); + if (type[i] == grenadesprite) + drawModel(gunmodels + grenadebasemodel, + visions ? BLACK : NULL); + if (type[i] == spoonsprite) + drawModel(gunmodels + grenadespoonmodel, + visions ? BLACK : NULL); + if (type[i] == pinsprite) + drawModel(gunmodels + grenadepinmodel, + visions ? BLACK : NULL); glEnable(GL_BLEND); glDisable(GL_FOG); -- cgit v1.2.3