Skip to content

T23534: Rename project to libanimation#3

Merged
smspillaz merged 9 commits intomasterfrom
T23534
Aug 28, 2018
Merged

T23534: Rename project to libanimation#3
smspillaz merged 9 commits intomasterfrom
T23534

Conversation

@smspillaz
Copy link
Copy Markdown
Contributor

@smspillaz
Copy link
Copy Markdown
Contributor Author

Argh, looks like I based this work off the wrong fork, hence the mountain of conflicts.

They're resolvable, but I'll need to look into it in the morning, I suspect.

Comment thread .gitmodules
@@ -1,3 +0,0 @@
[submodule "wobbly/third_party/allow_move_optional"]
path = wobbly/third_party/allow_move_optional
url = git://github.com/smspillaz/CopyMoveConstrainedOptional
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should probably split out this change into a separate commit

@smspillaz smspillaz force-pushed the T23534 branch 2 times, most recently from edafedb to 293ea2f Compare August 14, 2018 06:30
Sam Spilsbury added 3 commits August 17, 2018 16:36
"libwobbly" is now a subset of this library, we're going to be
adding more stuff here.

Due to the name change the version is also reset to 0.
We'll be using this in other subdirectories
@smspillaz
Copy link
Copy Markdown
Contributor Author

Jenkins is failing because it still expects the package name to be libwobbly - merging https://github.com/endlessm/eos-build/pull/844 will fix that.

Copy link
Copy Markdown
Contributor

@joaquimrocha joaquimrocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of comments. Note that I reviewed this quicker than usual because it was mostly the name replacement, which should be fine.

# Build the libwobbly library.

api_version = '0.3'
api_version = '0'
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be fine if you kept it. I assume nothing will depend on the 0.3 version of it then.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah the API version got reset to 0 since we changed the name. Or at least I assume that's how things are meant to work.

}

AnimationWobblyAnchor *
animation_wobbly_anchor_new_for_native_anchor_rvalue (wobbly::Anchor &&anchor)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you really need to specify the rvalue in the function name?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not, though I guess I just wanted to make it clear that it wants an rvalue reference in case anyone was wondering why things might not compile when they pass it an lvalue :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left this as is for now

Comment thread animation/wobbly/wobbly.cpp Outdated
wgd::get <1> (tileSize) * column);
wgd::pointwise_subtract (start, deltaToTopLeft);
animation::Point deltaToTopLeft (agd::get <0> (tileSize) * row,
agd::get <1> (tileSize) * column);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: Misaligned line.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Comment thread animation/wobbly/wobbly.cpp Outdated
config::Width));
return animation::PointView <double> (mPoints,
CoordIndex (x, y,
config::Width));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: This could go in the line above as well. I don't think the whole code is strictly aligned to 80 chars (I may be wrong though).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It isn't. Well, it used to be but I ditched that rule since it was getting too unwieldy to comply with :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

#include <animation/wobbly/wobbly.h> // for PointView, Vector, Point, etc/wobbly_internal.h
#include <animation/geometry.h> // for PointView, PointModel, etc
#include <animation/geometry_traits.h> // for assign, scale, etc
#include <animation/wobbly/wobbly.h> // for PointView, Vector, Point, etc
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: You could aligned all the comments too.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:P

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting note: Those comments are actually generated by include-what-you-use, which I did have enabled on this project earlier, but turned off since its a pain to manage.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Comment thread animation/geometry.h
auto const x1 = dimension::get <0> (tl);
auto const x2 = dimension::get <0> (br);
auto const y1 = dimension::get <1> (tl);
auto const y2 = dimension::get <1> (br);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're changing the corners used for extracting the limits, and you're not changing the comparison, then it means the comparison is wrong now or before. Seems like it was wrong before. Or was it just the name of the vars that was incorrect? If so, then maybe making more emphasis on that fact in the commit message would be good?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, the values themselves didn't actually change, only the names, which were wrong. I'll re-emphasize that in the commit message.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit message fixed.

Sam Spilsbury added 4 commits August 29, 2018 03:53
It is 2018, manual headerguards are out of fashion.
Previous, this was "tr" and "bl" for "topRight" and "bottomLeft",
but that makes no sense because they actually represented the top left
and bottom right values. It should be tl and br.
@smspillaz smspillaz merged commit df59f8f into master Aug 28, 2018
@ptomato ptomato deleted the T23534 branch August 29, 2018 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants