From 5fce09cb52f7c24662650a998d279433a324e517 Mon Sep 17 00:00:00 2001
From: rezural <rezural@protonmail.com>
Date: Thu, 24 Dec 2020 21:42:46 +1100
Subject: rework some threading code with the ui

---
 src_testbed/ui.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index f88db9d..f72ca73 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -3,6 +3,7 @@ use kiss3d::window::Window;
 use rapier::dynamics::IntegrationParameters;
 
 use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags};
+use crate::harness::RunState;
 
 const SIDEBAR_W: f64 = 200.0;
 const ELEMENT_W: f64 = SIDEBAR_W - 20.0;
@@ -98,6 +99,7 @@ impl TestbedUi {
         window: &mut Window,
         integration_parameters: &mut IntegrationParameters,
         state: &mut TestbedState,
+        run_state: &mut RunState,
     ) {
         let ui_root = window.conrod_ui().window;
         let mut ui = window.conrod_ui_mut().set_widgets();
@@ -254,7 +256,7 @@ impl TestbedUi {
         let curr_vel_iters = integration_parameters.max_velocity_iterations;
         let curr_pos_iters = integration_parameters.max_position_iterations;
         #[cfg(feature = "parallel")]
-        let curr_num_threads = state.num_threads;
+        let curr_num_threads = run_state.num_threads;
         let curr_max_ccd_substeps = integration_parameters.max_ccd_substeps;
         let curr_min_island_size = integration_parameters.min_island_size;
         let curr_warmstart_coeff = integration_parameters.warmstart_coeff;
@@ -305,10 +307,10 @@ impl TestbedUi {
             .w_h(ELEMENT_W, ELEMENT_H)
             .set(self.ids.slider_num_threads, &mut ui)
             {
-                if state.num_threads != val as usize {
-                    state.num_threads = val as usize;
-                    state.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
-                        .num_threads(state.num_threads)
+                if run_state.num_threads != val as usize {
+                    run_state.num_threads = val as usize;
+                    run_state.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
+                        .num_threads(run_state.num_threads)
                         .build()
                         .unwrap();
                 }
-- 
cgit 


From caf9d71bc7ae069d1d80194164f54b1132e3b2ad Mon Sep 17 00:00:00 2001
From: rezural <rezural@protonmail.com>
Date: Thu, 24 Dec 2020 21:45:00 +1100
Subject: cargo fmt

---
 src_testbed/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index f72ca73..1b9084c 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -2,8 +2,8 @@ use kiss3d::conrod::{self, Borderable, Colorable, Labelable, Positionable, Sizea
 use kiss3d::window::Window;
 use rapier::dynamics::IntegrationParameters;
 
-use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags};
 use crate::harness::RunState;
+use crate::testbed::{RunMode, TestbedActionFlags, TestbedState, TestbedStateFlags};
 
 const SIDEBAR_W: f64 = 200.0;
 const ELEMENT_W: f64 = SIDEBAR_W - 20.0;
-- 
cgit 


From aaf2872e5c8cd444d34b3503dd3380b1dcd074f2 Mon Sep 17 00:00:00 2001
From: rezural <rezural@protonmail.com>
Date: Thu, 31 Dec 2020 13:06:13 +1100
Subject: leading _ for run_state to squash warning

---
 src_testbed/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 1b9084c..4c511f2 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -99,7 +99,7 @@ impl TestbedUi {
         window: &mut Window,
         integration_parameters: &mut IntegrationParameters,
         state: &mut TestbedState,
-        run_state: &mut RunState,
+        _run_state: &mut RunState,
     ) {
         let ui_root = window.conrod_ui().window;
         let mut ui = window.conrod_ui_mut().set_widgets();
-- 
cgit 


From 1ac2d03fea4f51164df0b662fe990c27aedaf0ab Mon Sep 17 00:00:00 2001
From: rezural <rezural@protonmail.com>
Date: Thu, 31 Dec 2020 13:56:37 +1100
Subject: Revert "leading _ for run_state to squash warning"

This reverts commit aaf2872e5c8cd444d34b3503dd3380b1dcd074f2.
---
 src_testbed/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src_testbed/ui.rs')

diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 4c511f2..1b9084c 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -99,7 +99,7 @@ impl TestbedUi {
         window: &mut Window,
         integration_parameters: &mut IntegrationParameters,
         state: &mut TestbedState,
-        _run_state: &mut RunState,
+        run_state: &mut RunState,
     ) {
         let ui_root = window.conrod_ui().window;
         let mut ui = window.conrod_ui_mut().set_widgets();
-- 
cgit