Adjust visualization to new CGE with optimize-shapes-collection

See castle-engine/castle-engine#614

castle_model_viewer.dpr

@@ -201,7 +201,6 @@ type
   TV3DViewport = class(TV3DShadowsViewport)
   protected
     procedure RenderFromView3D(const Params: TRenderParams); override;
-    procedure RenderOnePass(const Params: TRenderParams); override;
   public
     constructor Create(AOwner: TComponent); override;
     procedure BeforeRender; override;
@@ -687,33 +686,23 @@ begin
         SelectedItem^.World.Triangle,
         SelectedPointWorld
       );
-  end else
-  begin
-    SceneBoundingBox.Exists := false;
   end;
 end;
 
-procedure TV3DViewport.RenderOnePass(const Params: TRenderParams);
+procedure TV3DViewport.RenderFromView3D(const Params: TRenderParams);
 begin
   SceneBoundingBoxUpdate(Params.RenderingCamera);
-  inherited;
-  { RenderVisualizations are opaque, so they should be rendered here
-    to correctly mix with partially transparent 3D scenes.
-    Render as ShadowVolumesReceivers=true to make selected triangle
-    drawn last (on top), to be clearly and always visible. }
-  if (not Params.Transparent) and
-     (true in Params.ShadowVolumesReceivers) then
-    RenderVisualizations(Params.RenderingCamera);
-end;
 
-procedure TV3DViewport.RenderFromView3D(const Params: TRenderParams);
-begin
   Scene.Visible := FillMode <> fmSilhouetteBorderEdges;
   SceneDebugEdges.Exists := FillMode = fmSilhouetteBorderEdges;
   if SceneDebugEdges.Exists then
     SceneDebugEdges.UpdateEdges(Scene);
   inherited;
-  { inherited will call RenderOnePass that will call RenderVisualizations }
+
+  { Draw visualizations after viewport contents, this is important for
+    "selected" visualization that doesn't use depth test and assumes it is
+    just drawn on top of everything. }
+  RenderVisualizations(Params.RenderingCamera);
 end;
 
 procedure TV3DViewport.BeforeRender;

code/v3dsceneshadows.pas

@@ -28,7 +28,7 @@
 interface
 
 uses CastleWindow, CastleScene, CastleTransform, CastleVectors, CastleViewport,
-  CastleRenderOptions,
+  CastleRenderOptions, CastleUtils,
   V3DSceneViewports;
 
 type
@@ -37,7 +37,9 @@ interface
     configurations (bump mapping, fill modes etc.) }
   TV3DShadowsViewport = class(TMyViewport)
   protected
-    procedure RenderOnePass(const Params: TRenderParams); override;
+    procedure RenderOnePass(const Params: TRenderParams;
+      const UsingBlending: Boolean;
+      const FilterShadowVolumesReceivers: TBooleanSet); override;
   end;
 
 var
@@ -56,7 +58,9 @@ procedure ViewportShadowsProperties(Viewport: TCastleViewport);
   Viewport.ShadowVolumesRender := ShadowVolumesRender;
 end;
 
-procedure TV3DShadowsViewport.RenderOnePass(const Params: TRenderParams);
+procedure TV3DShadowsViewport.RenderOnePass(const Params: TRenderParams;
+  const UsingBlending: Boolean;
+  const FilterShadowVolumesReceivers: TBooleanSet);
 
   procedure RenderOnePassShadowsBegin(Scene: TCastleScene);
   begin