Revert "wip 3d"

This reverts commit 4b2b826.

Author: tim-blackbird

crates/bevy_gizmos/Cargo.toml

@@ -21,5 +21,3 @@ bevy_utils = { path = "../bevy_utils", version = "0.9.0" }
 bevy_core = { path = "../bevy_core", version = "0.9.0" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.9.0" }
 bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0" }
-
-radsort = "0.1"

crates/bevy_gizmos/src/lib.rs

@@ -2,7 +2,6 @@ use std::mem;
 
 use bevy_app::{CoreSet, IntoSystemAppConfig, Plugin};
 use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped};
-use bevy_core_pipeline::{core_2d, core_3d};
 use bevy_ecs::{
     prelude::{Component, DetectChanges},
     schedule::IntoSystemConfig,
@@ -13,8 +12,7 @@ use bevy_math::Mat4;
 use bevy_reflect::TypeUuid;
 use bevy_render::{
     mesh::Mesh,
-    render_graph::RenderGraph,
-    render_phase::{sort_phase_system, AddRenderCommand, DrawFunctions},
+    render_phase::AddRenderCommand,
     render_resource::{PrimitiveTopology, Shader, SpecializedMeshPipelines},
     Extract, ExtractSchedule, RenderApp, RenderSet,
 };
@@ -26,15 +24,12 @@ use bevy_sprite::{Mesh2dHandle, Mesh2dUniform};
 
 pub mod gizmos;
 
-mod node_2d;
-mod node_3d;
-
 #[cfg(feature = "bevy_sprite")]
 mod pipeline_2d;
 #[cfg(feature = "bevy_pbr")]
 mod pipeline_3d;
 
-use crate::{gizmos::GizmoStorage, node_2d::GizmoNode2d, node_3d::GizmoNode3d};
+use crate::gizmos::GizmoStorage;
 
 /// The `bevy_gizmos` prelude.
 pub mod prelude {
@@ -62,64 +57,26 @@ impl Plugin for GizmoPlugin {
 
         #[cfg(feature = "bevy_sprite")]
         {
+            use bevy_core_pipeline::core_2d::Transparent2d;
             use pipeline_2d::*;
 
             render_app
-                .init_resource::<GizmoPipeline2d>()
-                .init_resource::<SpecializedMeshPipelines<GizmoPipeline2d>>()
-                .init_resource::<DrawFunctions<GizmoLine2d>>()
-                .add_render_command::<GizmoLine2d, DrawGizmoLines>()
-                .add_system(sort_phase_system::<GizmoLine2d>)
-                .add_system_to_schedule(ExtractSchedule, extract_gizmo_line_2d_camera_phase)
+                .add_render_command::<Transparent2d, DrawGizmoLines>()
+                .init_resource::<GizmoLinePipeline>()
+                .init_resource::<SpecializedMeshPipelines<GizmoLinePipeline>>()
                 .add_system(queue_gizmos_2d.in_set(RenderSet::Queue));
-
-            let gizmo_node = GizmoNode2d::new(&mut render_app.world);
-            let mut binding = render_app.world.resource_mut::<RenderGraph>();
-            let graph = binding.get_sub_graph_mut(core_2d::graph::NAME).unwrap();
-
-            graph.add_node(GizmoNode2d::NAME, gizmo_node);
-            graph.add_slot_edge(
-                graph.input_node().id,
-                core_2d::graph::input::VIEW_ENTITY,
-                GizmoNode2d::NAME,
-                GizmoNode2d::IN_VIEW,
-            );
-            graph.add_node_edge(
-                core_2d::graph::node::END_MAIN_PASS_POST_PROCESSING,
-                GizmoNode2d::NAME,
-            );
-            graph.add_node_edge(GizmoNode2d::NAME, core_2d::graph::node::UPSCALING);
         }
 
         #[cfg(feature = "bevy_pbr")]
         {
+            use bevy_core_pipeline::core_3d::Opaque3d;
             use pipeline_3d::*;
 
             render_app
-                .init_resource::<GizmoPipeline3d>()
-                .init_resource::<SpecializedMeshPipelines<GizmoPipeline3d>>()
-                .init_resource::<DrawFunctions<GizmoLine3d>>()
-                .add_render_command::<GizmoLine3d, DrawGizmoLines>()
-                .add_system(sort_phase_system::<GizmoLine3d>)
-                .add_system_to_schedule(ExtractSchedule, extract_gizmo_line_3d_camera_phase)
+                .add_render_command::<Opaque3d, DrawGizmoLines>()
+                .init_resource::<GizmoPipeline>()
+                .init_resource::<SpecializedMeshPipelines<GizmoPipeline>>()
                 .add_system(queue_gizmos_3d.in_set(RenderSet::Queue));
-
-            let gizmo_node = GizmoNode3d::new(&mut render_app.world);
-            let mut binding = render_app.world.resource_mut::<RenderGraph>();
-            let graph = binding.get_sub_graph_mut(core_3d::graph::NAME).unwrap();
-
-            graph.add_node(GizmoNode3d::NAME, gizmo_node);
-            graph.add_slot_edge(
-                graph.input_node().id,
-                core_3d::graph::input::VIEW_ENTITY,
-                GizmoNode3d::NAME,
-                GizmoNode3d::IN_VIEW,
-            );
-            graph.add_node_edge(
-                core_3d::graph::node::END_MAIN_PASS_POST_PROCESSING,
-                GizmoNode3d::NAME,
-            );
-            graph.add_node_edge(GizmoNode3d::NAME, core_3d::graph::node::UPSCALING);
         }
     }
 }