Drawing only 3D stuff into custom framebuffer

OoliteProject · Aug 7, 2022 · cb61589 · cb61589
1 parent 3b70c92
commit cb61589
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/Core/Universe.m b/src/Core/Universe.m
@@ -4537,15 +4537,16 @@ - (BOOL) viewFrustumIntersectsSphereAt:(Vector)position withRadius:(GLfloat)radi
 - (void) drawUniverse
 {
 	OOLog(@"universe.profile.draw", @"%@", @"Begin draw");
-
-	if ((int)targetFramebufferSize.width != (int)[gameView viewSize].width || (int)targetFramebufferSize.height != (int)[gameView viewSize].height)
-	{
-		[self resizeTargetFramebufferWithViewSize:[gameView viewSize]];
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, targetFramebufferID);
 	if (!no_update)
 	{
+
+		if ((int)targetFramebufferSize.width != (int)[gameView viewSize].width || (int)targetFramebufferSize.height != (int)[gameView viewSize].height)
+		{
+			[self resizeTargetFramebufferWithViewSize:[gameView viewSize]];
+		}
+
+		glBindFramebuffer(GL_FRAMEBUFFER, targetFramebufferID);
+
 		@try
 		{
 			no_update = YES;	// block other attempts to draw
@@ -4731,7 +4732,7 @@ - (void) drawUniverse
 						if (bpHide && !drawthing->isImmuneToBreakPatternHide)  continue;
 						if (vdist == 1 && [drawthing cameraRangeFront] > farPlane*1.5) continue;
 						if (vdist == 0 && [drawthing cameraRangeBack] < nearPlane) continue;
-//						if (vdist == 1 && [drawthing isPlanet]) continue;
+						// if (vdist == 1 && [drawthing isPlanet]) continue;
 
 						if (!((d_status == STATUS_COCKPIT_DISPLAY) ^ demoShipMode)) // either demo ship mode or in flight
 						{
@@ -4847,6 +4848,16 @@ - (void) drawUniverse
 			}
 
 
+
+			glBindFramebuffer(GL_FRAMEBUFFER, defaultDrawFBO);
+
+
+			OOLog(@"universe.profile.secondPassDraw", @"%@", @"Begin second pass draw");
+			[self drawTargetTextureIntoDefaultFramebuffer];
+			OOLog(@"universe.profile.secondPassDraw", @"%@", @"End second pass drawing");
+
+			OOLog(@"universe.profile.drawHUD", @"%@", @"Begin HUD drawing");
+
 			/* Reset for HUD drawing */
 			OOGLResetProjection();
 			OOGLFrustum(-0.5, 0.5, -aspect*0.5, aspect*0.5, 1.0, MAX_CLEAR_DEPTH);
@@ -4920,6 +4931,7 @@ - (void) drawUniverse
 #if (defined (SNAPSHOT_BUILD) && defined (OOLITE_SNAPSHOT_VERSION))
 			[self drawWatermarkString:@"Development version " @OOLITE_SNAPSHOT_VERSION];
 #endif
+			OOLog(@"universe.profile.drawHUD", @"%@", @"End HUD drawing");
 
 			OOCheckOpenGLErrors(@"Universe after drawing HUD");
 
@@ -4949,13 +4961,7 @@ - (void) drawUniverse
 			}
 		}
 	}
-	glBindFramebuffer(GL_FRAMEBUFFER, defaultDrawFBO);
 	OOLog(@"universe.profile.draw", @"%@", @"End drawing");
-
-
-	OOLog(@"universe.profile.secondPassDraw", @"%@", @"Begin second pass draw");
-	[self drawTargetTextureIntoDefaultFramebuffer];
-	OOLog(@"universe.profile.secondPassDraw", @"%@", @"End second pass drawing");
 }