From 977eaca37043383f979953e4b1d9f63a83c0c57f Mon Sep 17 00:00:00 2001 From: DevKage Date: Wed, 13 Mar 2024 11:10:27 +0530 Subject: [PATCH 1/2] Un-export Timer --- packages/forge2d/example/web/demo.dart | 2 +- packages/forge2d/lib/src/common.dart | 1 - packages/forge2d/lib/src/dynamics/world.dart | 7 ++++--- packages/forge2d/pubspec.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/forge2d/example/web/demo.dart b/packages/forge2d/example/web/demo.dart index 6edfadee..a1168618 100644 --- a/packages/forge2d/example/web/demo.dart +++ b/packages/forge2d/example/web/demo.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:html' hide Body; -import 'package:forge2d/forge2d_browser.dart' hide Timer; +import 'package:forge2d/forge2d_browser.dart'; /// An abstract class for any Demo of the Forge2D library. abstract class Demo { diff --git a/packages/forge2d/lib/src/common.dart b/packages/forge2d/lib/src/common.dart index 48a9ea41..12d75c34 100644 --- a/packages/forge2d/lib/src/common.dart +++ b/packages/forge2d/lib/src/common.dart @@ -2,6 +2,5 @@ export 'common/color3i.dart'; export 'common/raycast_result.dart'; export 'common/rot.dart'; export 'common/sweep.dart'; -export 'common/timer.dart'; export 'common/transform.dart'; export 'common/viewport_transform.dart'; diff --git a/packages/forge2d/lib/src/dynamics/world.dart b/packages/forge2d/lib/src/dynamics/world.dart index 9a8b11f8..2ec80c76 100644 --- a/packages/forge2d/lib/src/dynamics/world.dart +++ b/packages/forge2d/lib/src/dynamics/world.dart @@ -5,6 +5,7 @@ import 'dart:math'; import 'package:forge2d/forge2d.dart'; +import 'package:forge2d/src/common/timer.dart'; import 'package:forge2d/src/settings.dart' as settings; /// The world class manages all physics entities, dynamic simulation, and @@ -514,7 +515,7 @@ class World { final Island island = Island(); final List stack = []; - final Timer broadphaseTimer = Timer(); + final Timer _broadphaseTimer = Timer(); void solve(TimeStep step) { _profile.solveInit.startAccum(); @@ -648,7 +649,7 @@ class World { _profile.solveVelocity.endAccum(); _profile.solvePosition.endAccum(); - broadphaseTimer.reset(); + _broadphaseTimer.reset(); // Synchronize fixtures, check for out of range bodies. for (final b in bodies) { // If a body was not in an island then it did not move. @@ -666,7 +667,7 @@ class World { // Look for new contacts. contactManager.findNewContacts(); - _profile.broadphase.record(broadphaseTimer.getMilliseconds()); + _profile.broadphase.record(_broadphaseTimer.getMilliseconds()); } final Island _toiIsland = Island(); diff --git a/packages/forge2d/pubspec.yaml b/packages/forge2d/pubspec.yaml index 6dca198e..faddbd27 100644 --- a/packages/forge2d/pubspec.yaml +++ b/packages/forge2d/pubspec.yaml @@ -7,11 +7,11 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - meta: ^1.9.1 + meta: ^1.11.0 vector_math: ^2.1.4 dev_dependencies: dartdoc: ^7.0.2 flame_lint: ^1.1.1 mocktail: ^1.0.1 - test: any + test: ^1.24.9 From fbacad70561bdbc7324abd7a54f82e281ef4b582 Mon Sep 17 00:00:00 2001 From: DevKage Date: Wed, 13 Mar 2024 19:24:10 +0530 Subject: [PATCH 2/2] Revert changes from world.dart --- packages/forge2d/lib/src/dynamics/world.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/forge2d/lib/src/dynamics/world.dart b/packages/forge2d/lib/src/dynamics/world.dart index 2ec80c76..5e566bfe 100644 --- a/packages/forge2d/lib/src/dynamics/world.dart +++ b/packages/forge2d/lib/src/dynamics/world.dart @@ -515,7 +515,7 @@ class World { final Island island = Island(); final List stack = []; - final Timer _broadphaseTimer = Timer(); + final Timer broadphaseTimer = Timer(); void solve(TimeStep step) { _profile.solveInit.startAccum(); @@ -649,7 +649,7 @@ class World { _profile.solveVelocity.endAccum(); _profile.solvePosition.endAccum(); - _broadphaseTimer.reset(); + broadphaseTimer.reset(); // Synchronize fixtures, check for out of range bodies. for (final b in bodies) { // If a body was not in an island then it did not move. @@ -667,7 +667,7 @@ class World { // Look for new contacts. contactManager.findNewContacts(); - _profile.broadphase.record(_broadphaseTimer.getMilliseconds()); + _profile.broadphase.record(broadphaseTimer.getMilliseconds()); } final Island _toiIsland = Island();