Add support for 3D simulations by AleGnucci · Pull Request #38 · scafi/scafi

AleGnucci · 2020-01-15T16:51:32Z

This pull request adds to Scafi the support for 3D simulations.

…ingly

…tegration with scafi, changing Point2D to Point3D where needed

…egration

…lator-gui and continued work on integration with renderer-3d

…tings class to setup itself

…nued work on integration with renderer-3d

…s moving to the wrong position, also added Controller interface for easier integration with Scafi

…ectly shows the 3d points and connections.

…he correct colors are assigned when setting sensors.

…o that it's possible to right click. Also now the scene can be reset.

…when needed. Finally, the north menu shows correctly.

…r radius and to support observations

…dinate too. The 3d simulation should now also be faster but there is a problem with the javaFx UI thread getting flooded

…n led activator.

…en rendering many nodes.

…ails. Also worket more to use ScatterMesh to optimize the rendering.

…thread.

…ts and scala documentation

…e node size not changing

…o, moving nodes now have the correct color.

… in 3d demos

…the selection volume can be done in laptops.

…n unexpected way.

…xed a bug that sometimes prevented the camera from moving

…umption before executing the correct handler

…er also moved them

…for Java 8.

metaphori

Good job!

metaphori · 2020-01-28T19:07:49Z

-  var position: Point2D
+  var position: Point3D
+
+  def position2d: Point2D


Having both fields seem redundant. We should consider dropping position2d and just keeping position. 2D simulations shouldn't be affected, using Point3D objects with z=0, right?

position2d is implemented simply as position with z=0. I created it so that the code that expects a Point2D still works without making any changes to it. Should i modify each use of Node's position so that they always expect a Point3D?

We may drop position2d and when a 2D position is needed, just provide the 2D-view of the 3D position (maybe an implicit converter can safely help).

I'll remove position2d. Would it be ok to put def toPoint2D: Point2D = new Point2D(p.x, p.y) inside it.unibo.scafi.space.optimization.RichPoint3D (or maybe even in Point3D itself)? That way everyone can reuse the 2d view logic.

I see that

Point2D is a subclass of Point3D

Point3D already has an implicit def toPoint2D(p: Point3D): Point2D = Point2D(p.x, p.y)
The latter can also be called explicitly, so there is no need of a new method.

metaphori · 2020-01-28T19:09:23Z

 env:
  global:
-  - RELEASE_SCALA_VERSION=2.12.2
+  - RELEASE_SCALA_VERSION=2.12.10


What was the reason for this increment of the version?

This was done to avoid Scala-JDK compatibility problems when using JDK11.
I checked on docs.scala-lang.org and 2.12.4 seems the minimum 2.12 version required for JDK11, but it also says that

As of Scala 2.13.0, 2.12.8 and 2.11.12, JDK 11 support is incomplete

I finally saw that on the “Support JDK 11” issue they recently added

In general, Scala now works just fine on JDK 11

so i decided to upgrade to scala 2.12.10, to be safe.
Should i use a different version?

No, I'd say it is fine! Thanks

metaphori · 2020-01-28T19:11:45Z

+
+  override def _3: Double = z
+
+  override def canEqual(otherObject: Any): Boolean = otherObject match {case _: Point3D => true; case _ => false}


Isn't this caught by scala style?

Scalastyle is not catching it for me. I can rewrite canEqual as otherObject.isInstanceOf[Point3D], would that be ok?

No, it is fine.
I was now thinking if we wanted Point3D(1,1,0)==Point2D(1,1) to be true or not: it might be reasonable but if this wasn't so before, that's fine.

AleGnucci · 2020-01-29T16:20:40Z

Some TravisCI builds failed to download a bunch of dependencies, but my last commit simply modified some scala files. I think that at that moment Maven wasn't responding, so maybe we just have to retry the builds. Do i do that creating an empty commit?

metaphori and others added 30 commits January 15, 2020 10:29

README update: just basic info as more info on the website

5c88bd8

Initial commit. Added renderer-3d module and updated build.sbt accord…

32c1173

…ingly

Upgraded to Java 11 because of ScalaFx compatibility. Also started in…

ad7171c

…tegration with scafi, changing Point2D to Point3D where needed

Started creating new classes for scafi integration with 3d renderer

212d6bf

Added interfaces and worked on new classes for scafi - 3drenderer int…

9a74210

…egration

Added dependency injection where needed to reuse some classes in simu…

dc0fd66

…lator-gui and continued work on integration with renderer-3d

Connected the 3d controller with the 3d view, but not completely yet.

9deaee9

Continued integration with renderer-3d, now the renderer uses the Set…

e2c9de1

…tings class to setup itself

Added RunnableTestExample class, also removed multiple bugs and conti…

395cd25

…nued work on integration with renderer-3d

Added a test suite for renderer-3d, also removed a bug regarding node…

f5a3812

…s moving to the wrong position, also added Controller interface for easier integration with Scafi

Added two basic demos for 3d simulations, also now the simulator corr…

2f17451

…ectly shows the 3d points and connections.

Corrected bug that caused the creation of a second window, also now t…

9c91b28

…he correct colors are assigned when setting sensors.

Camera rotation now works using middle mouse button and arrow keys, s…

dfe38b1

…o that it's possible to right click. Also now the scene can be reset.

Camera rotation now behaves better, also the node labels rotate only …

b3fdf9b

…when needed. Finally, the north menu shows correctly.

Now the popup menu is enabled, also started work on showing the senso…

37d2d12

…r radius and to support observations

Removed some bugs

ed9a760

Simulation now correctly detects updates neighbours, using the z coor…

c2e038e

…dinate too. The 3d simulation should now also be faster but there is a problem with the javaFx UI thread getting flooded

Solved problem of controller flooding UI with requests. Also worked o…

3bc1f15

…n led activator.

Started work on integration with fxyz library to boost performance wh…

e765d0b

…en rendering many nodes.

Added logger dependency and code to notify when the 3d renderer api f…

91fb9e8

…ails. Also worket more to use ScatterMesh to optimize the rendering.

Continued work on optimization attempt

76712e0

Removed unused library and optimized thread usage

1b75d57

Solved some bugs and improved performance slightly

9812e51

Added faster atan2 implementation and reduced code running on JavaFx …

ed0b589

…thread.

Profiled and optimized code in multiple places.

426f981

Created an interface for the 3d renderer, also started writing commen…

33cd234

…ts and scala documentation

Added more comments and documentation

26c19b6

Completed documentation and comments

7ba1ddc

Added the ability to change the scene size but there is a bug with th…

6fbdab3

…e node size not changing

Removed some bugs.

35f6270

AleGnucci added 26 commits January 15, 2020 11:06

The 3d simulation now shows the sensor colors in the right order. Als…

700d59d

…o, moving nodes now have the correct color.

Selection change is now smoother. Also, made connections more visible…

e55a662

… in 3d demos

Reduced simulator speed when deltaRound is zero. Also, now modifying …

1889de9

…the selection volume can be done in laptops.

Fixed a bug that sometimes caused the selection volume to update in a…

e6b7620

…n unexpected way.

Actuator sphere is now scaled properly

e5a0107

Fixed some bugs

0427b64

Now sometimes moving nodes update the rotation of their label

b541c7b

Fixed a small mistake

a9e64da

resetScene now moves the camera in the right place.

1ec27a1

Upgraded a dependency version

d8b83cd

Upgraded scala version to avoid incompatibility with java 11. Also fi…

3382c6e

…xed a bug that sometimes prevented the camera from moving

Used addEventFilter instead of setOn methods to avoid user event cons…

2a9f4dc

…umption before executing the correct handler

Fixed a bug regarding mouse and keyboard listeners

a20c8f6

Now moving nodes don't show the led actuator

00ac951

Slightly improved performance when changing a sphere radius of a node

0fb3eed

Removed some useless operations done while user is moving nodes

8dbdd1a

Fixed bug that caused moving nodes to be updated too late when the us…

729fcfd

…er also moved them

Fixed a small bug

6613a4a

Rebased the 3d simulator from branch master to branch develop

afe39e8

Fixed a regression

a9e60b6

Fixed a bug regarding the stop button

f692b5a

Removed useless dependency in renderer3d

c64d581

Removed dependency scalafx-extras, since it doesn't support scala 2.11

ec1296f

Added compatibility for scala 2.11

65759ba

Fixed a warning

e216aa6

Fixed scaladoc links, also removed FXyz dependency and added support …

7daef5b

…for Java 8.

metaphori reviewed Jan 28, 2020

View reviewed changes

Removed position2d from Node

0b06e0a

metaphori merged commit 92813dd into scafi:develop Jan 29, 2020


		override def _3: Double = z

		override def canEqual(otherObject: Any): Boolean = otherObject match {case _: Point3D => true; case _ => false}

Conversation

AleGnucci commented Jan 15, 2020

Uh oh!

metaphori left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

metaphori Jan 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AleGnucci commented Jan 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

metaphori Jan 29, 2020 •

edited

Loading