Node Model #268

wdanilo · 2020-03-17T04:12:31Z

Pull Request Description

Implements Nodes graph IDE model.
Implements Shapes animations in GUI. In order to implement it a big refactoring to our animation system was done.
Partially implements Node selection. It allows for selecting nodes by clicking, it displays a rectangular area for group node selection, but the rectangular selection does not work yet. Its implementation is complex (it was described in the task as research task) and it will be delivered in some other PR in the future when our FRP model will settle down more.
Contains a lot of refactoring mostly needed for the tasks above and connected with improper, too wide RefCell usage. Now our codebase has much less RefCells! ❤️

Checklist

Please include the following checklist in your PR:

The documentation has been updated if necessary.
All code conforms to the Rust, Scala, Java or Haskell style guides as appropriate.
All code has been tested where possible.

See: https://stackoverflow.com/questions/60179850/webgl-2-0-canvas-blending-with-html-in-linear-color-space

fixed bugs which appears once several TextFields are on screen.

farmaazon · 2020-04-01T08:44:47Z

src/rust/Cargo.toml

@@ -29,7 +30,7 @@ members = [
 ]

 [profile.dev]
-opt-level = 0
+opt-level = 2


Check how it works with tests and CI caching.

farmaazon · 2020-04-01T08:47:08Z

build/run.js

@@ -194,7 +195,7 @@ commands.watch = command(`Start a file-watch utility and run interactive mode`)
 commands.watch.parallel = true
 commands.watch.rust = async function() {
    let target = '"' + `node ${paths.script.main} build --no-js --dev -- ` + subProcessArgs.join(" ") + '"'
-    let args   = ['watch','--watch','lib','-s',`${target}`]
+    let args   = ['watch','-s',`${target}`]


remember to add --npm flag

For now I did something simpler (as discussed via phone). All flags after -- are passed to cargo only (not to npm anymore).

farmaazon · 2020-04-01T08:53:25Z

src/rust/ensogl/src/animation/physics/inertia.rs

-impl Default for SimulationThresholds {
-    fn default() -> Self {
-        Self::new(0.1,0.1)
+impl<T:Position,Cb> CloneRef for Simulator<T,Cb> {


derive(CloneRef) - checke every impl CloneRef in your PR if it may be replaced with derive

Done. Not everywhere as CloneRef deriving does not work yet for structs with bounds, but done where possible.

The fix is ready and blocked by your review since Tuesday.
#323

@mwu-tow oh, I was not aware! Or I was but forgot. sorry for that!

farmaazon · 2020-04-01T08:59:54Z

src/rust/ensogl/src/control/callback.rs

+
+/// Registry gathering callbacks. Each registered callback is assigned with a handle. Callback and
+/// handle lifetimes are strictly connected. As soon a handle is dropped, the callback is removed
+/// as well.


The doc is the same as for Registry, there should be information about difference between them

farmaazon · 2020-04-01T09:04:52Z

src/rust/ensogl/src/display/object.rs

+    pub on_updated   : RefCell<Option<Box<dyn Fn(&NodeData)>>>,
+    pub on_show      : RefCell<Option<Box<dyn Fn()>>>,
+    pub on_hide      : RefCell<Option<Box<dyn Fn()>>>,
+    pub on_show_with : RefCell<Option<Box<dyn Fn(&Scene)>>>,


Describe when exactly the "on_show_with" and "on_hinde_with" is called.

farmaazon · 2020-04-01T12:34:39Z

src/rust/ensogl/src/system/gpu/data/buffer.rs

+//                    _ => Err(BadVariant)
+//                }
+//            }
+//        }


Commented code

farmaazon · 2020-04-01T12:42:32Z

src/rust/lib/graph/src/component/cursor.rs

+use ensogl::display::layout::alignment;
+use ensogl::system::web;
+use ensogl::control::callback;
+use ensogl::gui::component::animation;


Fix import order

farmaazon · 2020-04-01T12:51:56Z

src/rust/lib/graph/src/lib.rs

+    }
+
+    pub fn for_each_taken<F:Fn(Node)>(&self,f:F) {
+        self.take().into_iter().for_each(|(_,node)| { node.upgrade().for_each(|n| f(n)) })


You may use WeakValueHashMap from weak_table (imported in prelude)

OK, not in this PR, but Ill take a look at it, thanks!

farmaazon · 2020-04-01T12:54:09Z

src/rust/lib/prelude/Cargo.toml

+  'WheelEvent',
+  'DomRect',
+  'AddEventListenerOptions'
+]


farmaazon · 2020-04-01T13:08:02Z

src/rust/lib/shapely/impl/Cargo.toml

+paste        = "0.1"
+derivative   = "1.0.3"
+shrinkwraprs = "0.3.0"


Suggested change

paste = "0.1"

derivative = "1.0.3"

shrinkwraprs = "0.3.0"

paste = { version = "0.1" }

derivative = { version = "1.0.3" }

shrinkwraprs = { version = "0.3.0" }

and align closing }

farmaazon · 2020-04-03T08:42:56Z

src/rust/ensogl/src/control/callback.rs

+/// Specialized version of `Registry` for arguments implementing `Copy`. Passing copy-able elements
+/// as values is more performant than by reference.


Did you benchmarked it? I would say, that rust optimizer will handle such case anyway (because it know, that is "readonly refrence" and cannot be changed by other process, so it can replace reference with copy!

farmaazon · 2020-04-03T08:43:26Z

src/rust/ensogl/src/display/object.rs

+    pub use super::Object    as TRAIT_Object;
+    pub use super::ObjectOps as TRAIT_ObjectOps;


The comment explaining why we're doing this should be rather here, not by the ObjectOps definition

Original commit: enso-org/ide@169b3d1

wdanilo added 5 commits March 17, 2020 05:10

Switching to SRGB-based blending. It sucks but browsers are broken.

2807b14

See: https://stackoverflow.com/questions/60179850/webgl-2-0-canvas-blending-with-html-in-linear-color-space

Adding new display object abstraction. Adding first node abstractions

4d3490e

Refactoring display object conversions

89a96eb

Removing RefCell from Symbol

8bc785a

Removing RefCell from SpriteSystem

83cdf2d

wdanilo changed the title ~~Node Selection~~ Node Model Mar 18, 2020

wdanilo and others added 24 commits March 18, 2020 01:15

Fixing accidental recursion

02e824c

Removing RefCell from Sprite

a8fece0

Moving camera to new display object handling system

b718cdd

Removing RefCell from DomSymbol

db36a97

Refactoring

506e191

Fixing camera refactor bug

9c9a0ca

Optimizing camera update rate.

047a34e

Refactoring

56e9e57

Refactoring

1b3d17b

Merge branch 'master' into wip/wd/dev

e10abd0

Stub of Graph model

2b61a74

Refactoring

e9ebe95

Merge branch 'wip/wd/dev' of github.com:luna/basegl into wip/wd/dev

8dad031

Adding comments to the API

24874cc

Fixing navigator zoom

737b311

Removing some RefCells from display object

c15ef6c

Refactoring display object. Removing tmp functions for fixing refcells.

b20e872

Refactoring display object

2e46966

Refactoring WeakNode

4240552

Refactoring

8efe938

Merge branch 'master' of github.com:luna/ide into wip/wd/dev

2bb35bb

Graph Editor in IDE

cc06413

Add Simple Node Searcher panel.

716715d

Implement simple focusing on TextFields

26ef5e1

fixed bugs which appears once several TextFields are on screen.

wdanilo added 3 commits April 1, 2020 10:01

Linting

410d4d7

Update package-lock.json

d86e485

Merge branch 'master' into wip/wd/dev

1d2fcea

farmaazon suggested changes Apr 1, 2020

View reviewed changes

farmaazon self-requested a review April 1, 2020 13:18

farmaazon approved these changes Apr 1, 2020

View reviewed changes

farmaazon and others added 10 commits April 1, 2020 17:34

Merge remote-tracking branch 'origin/master' into wip/wd/dev

c72d0b7

Merge branch 'wip/wd/dev' of github.com:luna/ide into wip/wd/dev

86f1bce

Rename graph crate to graph-editor

c85e3d7

restore text editor in IDE

fac8641

Fixing examples

eab2325

Applying PR review

c203940

Merge branch 'wip/wd/dev' of github.com:luna/basegl into wip/wd/dev

781e86f

Applying PR review

3052cc5

PR review fixes

2ac5584

Merge branch 'master' into wip/wd/dev

eedf6da

wdanilo marked this pull request as ready for review April 3, 2020 06:15

wdanilo added 2 commits April 3, 2020 08:18

Merge branch 'master' into wip/wd/dev

ddead29

Removing manual CloneRef impls.

ae148eb

farmaazon reviewed Apr 3, 2020

View reviewed changes

farmaazon and others added 7 commits April 3, 2020 11:01

Remove deprecated function

f561765

Removing tests which are duplicated with debug scenes.

d2e09d9

Merge branch 'wip/wd/dev' of github.com:luna/basegl into wip/wd/dev

15fe4dc

Applying PR review

4c4d644

Reverting opt-level

0b4cf19

Fixing test compilation

05fa4cf

Trying to fix CI

f03a648

wdanilo merged commit 169b3d1 into master Apr 3, 2020

wdanilo deleted the wip/wd/dev branch April 15, 2020 21:59

mwu-tow pushed a commit to enso-org/enso that referenced this pull request Oct 30, 2021

Node Model (enso-org/ide#268)

709ea61

Original commit: enso-org/ide@169b3d1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Node Model #268

Node Model #268

wdanilo commented Mar 17, 2020 •

edited

Loading

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

wdanilo Apr 2, 2020

farmaazon Apr 1, 2020

wdanilo Apr 2, 2020

mwu-tow Apr 3, 2020

wdanilo Apr 3, 2020

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

wdanilo Apr 3, 2020

farmaazon Apr 1, 2020

farmaazon Apr 1, 2020

farmaazon Apr 3, 2020

farmaazon Apr 3, 2020

		/// Specialized version of `Registry` for arguments implementing `Copy`. Passing copy-able elements
		/// as values is more performant than by reference.

		pub use super::Object as TRAIT_Object;
		pub use super::ObjectOps as TRAIT_ObjectOps;

Node Model #268

Node Model #268

Conversation

wdanilo commented Mar 17, 2020 • edited Loading

Pull Request Description

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wdanilo commented Mar 17, 2020 •

edited

Loading