Dartify all the C++ styled code

.gitignore

@@ -1,4 +1,7 @@
+.idea
 .packages
 .pub
 packages
 pubspec.lock
+.dart_tool
+build/

CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.0
+* Make code more like the dart standard and less C++
+
+### 0.4.6
+* Fix bug with torque not being modified from applyTorque
+
+### 0.4.5
+* Fixing warnings and formatting
+
+### 0.4.1 - 0.4.4
+* Updates related to Flame interop + bugfixes
+
 ### 0.4.0
 
 * Breaking: Made package strong-mode compliant 

README.md

@@ -1,20 +1,12 @@
-### A Dart 2D physics engine
-
-[![Build Status](https://travis-ci.org/google/box2d.dart.svg?branch=master)](https://travis-ci.org/google/box2d.dart)
-[![Coverage Status](https://coveralls.io/repos/google/box2d.dart/badge.svg?branch=master)](https://coveralls.io/r/google/box2d.dart)
-
-*This is a Dart port of Java's Box2D libraries.*
-
-*The Java Box2D library was originally written by Daniel Murphy (status
-February 2015).*
-
-```
-benchmark/bench2d.dart   Benchmark used by Joel Webber
-example/index.html       Browser demos as written by Dominic Hamon
-lib/                     Port of Daniel Murphy's jbox2d
-```
-
-First Dart port of an earlier version of Box2D library was
-done by Dominic Hamon. We are grateful for his work.
-
-__*Not an official Google project*__
+## Forge2D - A Dart port of the Box2D physics engine
+This is a dart port of the famous Box2D physics engine.
+You can use it indepentently in Dart or in your [flame](https://github.com/flame-engine/flame) project with the help of [flame_forge2d](https://github.com/flame-engine/flame_forge2d).
+Some documentation of how to use it together with flame can be found [here](https://github.com/flame-engine/flame/blob/master/doc/box2d.md).
+
+### Timeline
+Box2D was first written in C++ and released by [Erin Catto](https://github.com/erincatto) in 2007, but it is still maintained.
+It was then ported to Java (jbox2d) by Daniel Murphy around 2015.
+It was then ported from that Java port to Dart by [Dominic Hamon](https://github.com/dominichamon) and [Kevin Moore](https://github.com/kevmoo).
+Then [Lukas Klingsbo](https://github.com/spydon) refactored the code to follow the dart standard more, since it still had a lot of reminiscence from C++.
+After this refactor we renamed it to Forge2D since the upstream wasn't maintained to take in our PRs.
+There has also been countless other contributors which we are very thankful to!

analysis_options.yaml

@@ -2,3 +2,6 @@ analyzer:
   strong-mode:
     implicit-casts: false
     implicit-dynamic: false
+linter:
+  rules:
+    - slash_for_doc_comments

benchmark/README.md

@@ -0,0 +1,15 @@
+### Benchmark for Dart Box2D
+
+Run:
+```sh
+pub global run webdev build --output=benchmark:build
+```
+
+Either from the command line or from your IDE.
+
+Then run:
+```sh
+pub global run webdev daemon example:53322 --launch-app=benchmark/index.html
+```
+
+

benchmark/bench2d.dart

@@ -1,31 +1,7 @@
-/*******************************************************************************
- * Copyright (c) 2015, Daniel Murphy, Google
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *  * Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-
-import 'package:box2d/box2d.dart';
+import '../lib/box2d.dart';
 
 void main() {
-  new Bench2d()
+  Bench2d()
     ..initialize()
     ..warmup()
     ..bench();
@@ -64,30 +40,33 @@ double percentile(List<double> values, double pc) {
 class Bench2d {
   final World world;
 
-  Bench2d() : world = new World.withGravity(new Vector2(0.0, -10.0));
+  Bench2d() : world = World(Vector2(0.0, -10.0));
 
   void initialize() {
-    BodyDef bd = new BodyDef();
+    BodyDef bd = BodyDef();
     Body ground = world.createBody(bd);
 
-    EdgeShape groundShape = new EdgeShape()
-      ..set(new Vector2(-40.0, 0.0), new Vector2(40.0, 0.0));
+    PolygonShape groundShape = PolygonShape()
+      ..setAsEdge(Vector2(-20.0, -30.0), Vector2(20.0, -30.0));
     ground.createFixtureFromShape(groundShape, 0.0);
+    //EdgeShape groundShape = EdgeShape()
+    //  ..set(Vector2(-40.0, -30.0), Vector2(40.0, -30.0));
+    //ground.createFixtureFromShape(groundShape, 0.0);
 
     // add boxes
     const boxSize = .5;
-    PolygonShape shape = new PolygonShape()..setAsBoxXY(boxSize, boxSize);
+    PolygonShape shape = PolygonShape()..setAsBoxXY(boxSize, boxSize);
 
-    Vector2 x = new Vector2(-7.0, 0.75);
-    Vector2 y = new Vector2.zero();
-    Vector2 deltaX = new Vector2(0.5625, 1.0);
-    Vector2 deltaY = new Vector2(1.125, 0.0);
+    Vector2 x = Vector2(-7.0, 0.75);
+    Vector2 y = Vector2.zero();
+    Vector2 deltaX = Vector2(0.5625, 1.0);
+    Vector2 deltaY = Vector2(1.125, 0.0);
 
     for (int i = 0; i < PYRAMID_SIZE; ++i) {
       y.setFrom(x);
 
       for (int j = i; j < PYRAMID_SIZE; ++j) {
-        BodyDef bd = new BodyDef()
+        BodyDef bd = BodyDef()
           ..type = BodyType.DYNAMIC
           ..position.setFrom(y);
         world.createBody(bd)..createFixtureFromShape(shape, 5.0);
@@ -96,11 +75,13 @@ class Bench2d {
 
       x.add(deltaX);
     }
+    // TODO: Why does some bodies sleep prematurely
+    world.setAllowSleep(false);
   }
 
   List<double> bench() {
-    List<double> times = new List<double>(FRAMES);
-    Stopwatch stopwatch = new Stopwatch()..start();
+    List<double> times = List<double>(FRAMES);
+    Stopwatch stopwatch = Stopwatch()..start();
     for (int i = 0; i < FRAMES; ++i) {
       int begin = stopwatch.elapsedMilliseconds;
       step();
@@ -132,8 +113,8 @@ class Bench2d {
   }
 
   void checksum(World world) {
-    Vector2 positionSum = new Vector2.zero();
-    Vector2 linearVelocitySum = new Vector2.zero();
+    Vector2 positionSum = Vector2.zero();
+    Vector2 linearVelocitySum = Vector2.zero();
     double angularVelocitySum = 0.0;
     var checksum = (Body b) {
       positionSum = positionSum + b.position;

benchmark/bench2d_web.dart

@@ -1,36 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2015, Daniel Murphy, Google
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *  * Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-
 import 'dart:html';
 
-import 'package:box2d/box2d_browser.dart';
+import '../lib/box2d_browser.dart';
 
 import 'bench2d.dart';
 
 void main() {
   // Render version
-  new Bench2dWeb()
+  Bench2dWeb()
     ..initializeAnimation()
     ..runAnimation();
 }
@@ -45,26 +21,24 @@ class Bench2dWeb extends Bench2d {
   ViewportTransform viewport;
   DebugDraw debugDraw;
 
-  /**
-   * Creates the canvas and readies the demo for animation. Must be called
-   * before calling runAnimation.
-   */
+  /// Creates the canvas and readies the demo for animation. Must be called
+  /// before calling runAnimation.
   void initializeAnimation() {
     // Setup the canvas.
-    canvas = new CanvasElement()
+    canvas = CanvasElement()
       ..width = CANVAS_WIDTH
       ..height = CANVAS_HEIGHT;
 
     ctx = canvas.getContext("2d") as CanvasRenderingContext2D;
     document.body.append(canvas);
 
     // Create the viewport transform with the center at extents.
-    final extents = new Vector2(CANVAS_WIDTH / 2, CANVAS_HEIGHT / 2);
-    viewport = new CanvasViewportTransform(extents, extents)
+    final extents = Vector2(CANVAS_WIDTH / 2, CANVAS_HEIGHT / 2);
+    viewport = CanvasViewportTransform(extents, extents)
       ..scale = _VIEWPORT_SCALE;
 
     // Create our canvas drawing tool to give to the world.
-    debugDraw = new CanvasDraw(viewport, ctx);
+    debugDraw = CanvasDraw(viewport, ctx);
 
     // Have the world draw itself for debugging purposes.
     world.debugDraw = debugDraw;

benchmark/compile.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+shopt -s nullglob
+for f in *.dart; do
+  if [ "$f" == "demo.dart" ] ; then
+    continue;
+  fi
+  dart2js -o $f.js $f
+done

benchmark/index.html

@@ -14,7 +14,6 @@
         console.log('Browser does not support Dart. Expect JS fallback.');
       }
     </script>
-    <script type="application/dart" src="bench2d_web.dart"></script>
-    <script src="packages/browser/dart.js"></script>
+    <script defer src="bench2d_web.dart.js"></script>
   </body>
 </html>

example/.gitignore

@@ -0,0 +1,3 @@
+*.js
+*.js.deps
+*.js.map

example/README.md

@@ -0,0 +1,24 @@
+### Examples for Dart Box2D
+
+Run:
+```sh
+pub global run webdev build --output=example:build
+```
+
+Either from the command line or from your IDE.
+
+Then run:
+```sh
+pub global run webdev daemon example:53322 --launch-app=example/index.html
+```
+
+## Old way
+
+Run:
+```sh
+./compile.sh
+```
+
+and then open index.html in a browser.
+
+