Fix drawing sky portals

Fixes #25
xycaleth · Nov 8, 2019 · f212f36 · f212f36
1 parent cde6ef0
commit f212f36
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/codemp/rd-rend2/tr_local.h b/codemp/rd-rend2/tr_local.h
@@ -1801,7 +1801,7 @@ typedef struct {
  int numGridArrayElements;
 
 
-
+ int skyboxportal;
  int numClusters;
  int clusterBytes;
  const byte *vis; // may be passed in by CM_LoadMap to save space

diff --git a/codemp/rd-rend2/tr_scene.cpp b/codemp/rd-rend2/tr_scene.cpp
@@ -436,6 +436,11 @@ void RE_BeginScene(const refdef_t *fd)
  tr.refdef.num_dlights = 0;
  }
 
+ if (fd->rdflags & RDF_SKYBOXPORTAL)
+ {
+ tr.world->skyboxportal = 1;
+ }
+
  // a single frame may have multiple scenes draw inside it --
  // a 3D game view, 3D status bar renderings, 3D menus, etc.
  // They need to be distinguished by the light flare code, because

diff --git a/codemp/rd-rend2/tr_shade.cpp b/codemp/rd-rend2/tr_shade.cpp
@@ -1932,6 +1932,22 @@ void RB_EndSurface( void ) {
  return;
  }
 
+ if (tr.world) {
+ if (tr.world->skyboxportal)
+ {
+ // world
+ if (!(backEnd.refdef.rdflags & RDF_SKYBOXPORTAL) && (tess.currentStageIteratorFunc == RB_StageIteratorSky))
+ { // don't process these tris at all
+ return;
+ }
+ // portal sky
+ else if (!(backEnd.refdef.rdflags & RDF_DRAWSKYBOX) && (tess.currentStageIteratorFunc != RB_StageIteratorSky))
+ { // /only/ process sky tris
+ return;
+ }
+ }
+ }
+
  //
  // update performance counters
  //

diff --git a/codemp/rd-rend2/tr_sky.cpp b/codemp/rd-rend2/tr_sky.cpp
@@ -830,6 +830,10 @@ void RB_StageIteratorSky( void ) {
  return;
  }
 
+ if (tr.world->skyboxportal && !(backEnd.refdef.rdflags & RDF_SKYBOXPORTAL)) {
+ return;
+ }
+
  // go through all the polygons and project them onto
  // the sky box to see which blocks on each side need
  // to be drawn