Reenable non-player figure drawing

Cargo.toml

@@ -110,3 +110,8 @@ nativeBuildInputs = ["pkg-config"]
 # macos CI fix isn't merged yet
 winit = { git = "https://gitlab.com/veloren/winit.git", branch = "macos-test-spiffed" }
 vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" }
+
+# Pending https://github.com/gfx-rs/wgpu/pull/1080
+[patch.'https://github.com/gfx-rs/wgpu']
+wgpu-core = { git="https://github.com/JCapucho/wgpu" }
+wgpu-types = { git="https://github.com/JCapucho/wgpu" }

voxygen/src/scene/figure/mod.rs

@@ -4758,9 +4758,9 @@ impl FigureMgr {
     }
 
     #[allow(clippy::too_many_arguments)] // TODO: Pending review in #587
-    pub fn render(
+    pub fn render<'a>(
-        &self,
+        &'a self,
-        renderer: &mut Renderer,
+        drawer: &mut FirstPassDrawer<'a>,
         state: &State,
         player_entity: EcsEntity,
         tick: u64,
@@ -4802,8 +4802,7 @@ impl FigureMgr {
                     figure_lod_render_distance * scale.map_or(1.0, |s| s.0),
                     |state| state.visible(),
                 ) {
-                    // renderer.render_figure(model, &col_lights, global,
+                    drawer.draw_figure(model, bound, col_lights);
-                    // locals, bone_consts, lod);
                 }
             }
         }

voxygen/src/scene/mod.rs

@@ -1022,15 +1022,8 @@ impl Scene {
 
         self.terrain.render(drawer, focus_pos);
 
-        /* self.figure_mgr.render(
+        self.figure_mgr
-            renderer,
+            .render(drawer, state, player_entity, tick, global, lod, camera_data);
-            state,
-            player_entity,
-            tick,
-            global,
-            lod,
-            camera_data,
-        );*/
 
         self.lod.render(drawer);