Added a new type of map object representing points #1799

agersant · 2017-10-24T07:03:32Z

Opening the PR while working on this so implementation can be discussed.

One thing I am not happy with at the moment is the various boundingBox functions. I don't think I am implementing this right. In my latest commits, I implemented OrthogonalRenderer::drawMapObject to draw pins. I then proceeded to update the bounding box functions like this:

objectBounds in objectselectionitem.cpp. As far as I can tell, this function is the one used to draw the animated selection rectangle when the item is highlighted. I put some magic numbers which match the pin drawing code I wrote in OrthogonalRenderer. I haven't looked at the other renderers yet but I'm worried they will need identical pin drawing functions too. Where should the pin drawing code and the constants live?
OrthogonalRenderer::boundingRect. This seems to be used to invalidate regions and repaint , so it needs a bit of padding (extraSpace) around the actual bounding box. Also uses the constants from the drawing code. Is this also used to position the resize handles? The handles end up a little bit removed from where they should be because of the padding. This doesn't happen for other object types so I must be doing something bad.
OrthogonalRenderer::shape. As far as I could tell, this one is used for mouse interactions and should match the visuals closely. (ie. identical to objectBounds from objectselectionitem). Also needs the drawing constants.

WIP screenshot:

Progress:

bjorn

It looks great already!

You raise an interesting set of questions that have bothered me as well already since a while. I don't like how the rendering of all the shapes, and now also the pin, it tied up into the MapRenderer interface. In fact I don't ever expect the objects to look a whole lot different, so I think rather their rendering should be shared and probably in the MapObjectItem. Only the isometric map renderer does anything special, and I guess this particular transformation could be abstracted instead of abstracting the whole rendering.

But rather than changing this for all existing object rendering, maybe we could start with the pins. Especially since they aren't subject to transformations, they should be an easy case. So you could try to put the pin rendering in MapObjectItem. The remaining problem is placing the selection marker, which I guess could be done by exposing the bounding rect calculation so that it can be used by objectBounds.

The downside of putting the rendering in MapObjectItem would be that the rendering code is no longer accessible by the tmxviewer tool shipping with Tiled. Maybe MapObjectItem should just call some rendering helper functions that we place in libtiled.

bjorn · 2017-10-26T12:44:40Z

src/tiled/objectselectiontool.cpp

+    const bool hasResizableItem = std::any_of(objects.begin(), objects.end(), [](MapObject *object) {
+        return canResize(object);
+    });
+    const bool showHandles = hasSelection && hasResizableItem && (mAction == NoAction || mAction == Selecting);


I believe the resize handles should also show as long as more than 1 objects are selected. Of course, resizing would only change the position of point objects (seems to be already working).

bjorn · 2017-10-26T12:46:23Z

src/tiled/objectselectiontool.cpp

@@ -858,7 +875,9 @@ void ObjectSelectionTool::updateHandles(bool resetOriginIndicator)
        return;

    const QList<MapObject*> &objects = mapDocument()->selectedObjects();
-    const bool showHandles = objects.size() > 0;
+    const bool showHandles = objects.size() > 0 && std::any_of(objects.begin(), objects.end(), [](MapObject *object) {


I guess objects.size() > 1 || (objects.size() > 0 && ... )

bjorn · 2017-10-26T12:47:48Z

src/tiled/objectselectiontool.cpp

-    const bool showHandles = objects.size() > 0;
+    const bool showHandles = objects.size() > 0 && std::any_of(objects.begin(), objects.end(), [](MapObject *object) {
+        return canResize(object);
+    });


Actually canResize could be passed into std::any_of directly, right?

bjorn · 2017-10-26T12:49:04Z

src/libtiled/orthogonalrenderer.cpp

-                                               10 + extraSpace + 1);
+                -10 - extraSpace,
+                10 + extraSpace + 1,
+                10 + extraSpace + 1);


Please leave the indentation intact here and below.

bjorn · 2017-10-26T12:49:48Z

src/libtiled/mapobject.h

-{ return mShape == Polygon || mShape == Polyline; }
+inline bool MapObject::hasDimensions() const
+{
+    switch(mShape) {


Coding style: please put a space after switch.

bjorn · 2017-10-26T13:25:42Z

One thing I forgot to mention, in order to fix the autobuilds (and compiling for me), please add new files also to the Qbs project (I'd also recommend using the Qbs project file, I'd like to get rid of the qmake one (#1484)).

agersant · 2017-10-28T18:45:10Z

Last two commits clean up the duplicate functionality between renderers and bounding box functions. I ended up using MapRenderer as the home for the draw/shape utility functions, this makes them available to the renderer subclasses and also to the tmxrasterizer.

agersant · 2017-10-28T21:46:09Z

New progress screenshot, now working on isometric maps and with tool icon:

agersant · 2017-10-28T22:17:56Z

Questions about the remaining items:

Is there anything to do for localization support? I am under the impression that it's up to translators to re-generate .ts files and fill in missing texts?
Is it safe to update the manual or should that only be done after a new release?

bjorn · 2017-10-29T22:46:55Z

Is there anything to do for localization support? I am under the impression that it's up to translators to re-generate .ts files and fill in missing texts?

For localization I do a string-freeze about two weeks before the release, which is when the .ts files are re-generated and all translators get a message asking them to start updating the translation. You don't have to do anything.

Is it safe to update the manual or should that only be done after a new release?

You could definitely help updating the manual and you could do so as part of this PR. When I released Tiled 1.0 the manual unfortunately didn't really exist, which is why there is no 1.0-version of the manual hosted. Now the manual covers a lot of things, and many of them are already 1.1-specific. What I'll do upon release is to host both the 1.1 manual (which I could make the default) as well as master, so that manual updates can always go along with the changes without confusing readers using the Tiled releases. This is easy to do now that we are hosted by readthedocs.org.

I should be able to get to another review on Tuesday.

* When placing point objects, allow changing the position while holding the mouse button, like when placing tile objects and template instances. * Prevent changing rotation of point objects through the Properties view. * Prevent switching to rotation mode when clicking a single selected point object (it wouldn't show the handles, but it would toggle the origin indicator).

bjorn · 2017-10-31T10:26:34Z

Great work, @agersant! I only found some minor issues and decided to just fix them instead of going through another review round.

agersant added 3 commits October 22, 2017 23:32

Point objects can be added, selected and moved on orthogonal maps

716e0be

Point items now draw as pins on orthogonal maps

da7cd5b

Fixed a bug where sensitive area of pins didn't match their visuals

5f41c6c

bjorn reviewed Oct 26, 2017

View reviewed changes

agersant added 5 commits October 26, 2017 22:55

Whitespace fixes

498c682

Show handles when multiple points are selected

36d71c4

Mades QBS build aware of new tool files

fb4f3c7

Share pin drawing function between renderers

6623e1a

Unified computations of pin object bounding boxes

42556a8

agersant added 7 commits October 28, 2017 11:54

Moved M_PI definition to utils

2957bc8

Fixed point objects shape in Lua export

f1ef0c5

Tentative fix for Windows build. Use #define for cmath.h to define M_PI

2da0a32

Added missing comma

c926d82

Added missing comma

82d7a55

Added icon for "create point" tool

859e725

Merge remote-tracking branch 'bjorn/master' into point-object

39b3814

agersant and others added 3 commits October 30, 2017 11:37

Point object can no longer be rotated

1f08e1c

Added point objects to documentation

bd50fb6

bjorn merged commit e3df8e0 into mapeditor:master Oct 31, 2017

bjorn mentioned this pull request May 17, 2022

Point objects: rotation not imported vnen/godot-tiled-importer#131

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added a new type of map object representing points #1799

Added a new type of map object representing points #1799

agersant commented Oct 24, 2017 •

edited

Loading

bjorn left a comment

bjorn Oct 26, 2017

bjorn Oct 26, 2017

bjorn Oct 26, 2017

bjorn Oct 26, 2017

bjorn Oct 26, 2017

bjorn commented Oct 26, 2017

agersant commented Oct 28, 2017

agersant commented Oct 28, 2017

agersant commented Oct 28, 2017

bjorn commented Oct 29, 2017 •

edited

Loading

bjorn commented Oct 31, 2017

Added a new type of map object representing points #1799

Added a new type of map object representing points #1799

Conversation

agersant commented Oct 24, 2017 • edited Loading

bjorn left a comment

Choose a reason for hiding this comment

bjorn Oct 26, 2017

Choose a reason for hiding this comment

bjorn Oct 26, 2017

Choose a reason for hiding this comment

bjorn Oct 26, 2017

Choose a reason for hiding this comment

bjorn Oct 26, 2017

Choose a reason for hiding this comment

bjorn Oct 26, 2017

Choose a reason for hiding this comment

bjorn commented Oct 26, 2017

agersant commented Oct 28, 2017

agersant commented Oct 28, 2017

agersant commented Oct 28, 2017

bjorn commented Oct 29, 2017 • edited Loading

bjorn commented Oct 31, 2017

agersant commented Oct 24, 2017 •

edited

Loading

bjorn commented Oct 29, 2017 •

edited

Loading