preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-18 17:00:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Point to Point2D to avoid a cocoa name clash

Browse Source
This commit is contained in:
Henrik Rydgård committed 2024-05-29 18:52:39 +02:00
1 parent 7e7d1d587a
commit 455e28da6c
11 files changed
+43 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/UI/Tween.cpp
+4 -4
View File
@@ -67,7 +67,7 @@ void TweenBase<Value>::PersistData(PersistStatus status, std::string anonId, Per
template void TweenBase<uint32_t>::PersistData(PersistStatus status, std::string anonId, PersistMap &storage);
template void TweenBase<Visibility>::PersistData(PersistStatus status, std::string anonId, PersistMap &storage);
template void TweenBase<Point>::PersistData(PersistStatus status, std::string anonId, PersistMap &storage);
template void TweenBase<Point2D>::PersistData(PersistStatus status, std::string anonId, PersistMap &storage);
uint32_t ColorTween::Current(float pos) {
return colorBlend(to_, from_, pos);
@@ -99,7 +99,7 @@ Visibility VisibilityTween::Current(float p) {
}
void AnchorTranslateTween::DoApply(View *view, float pos) {
Point cur = Current(pos);
Point2D cur = Current(pos);
auto prev = view->GetLayoutParams()->As<AnchorLayoutParams>();
auto lp = new AnchorLayoutParams(prev ? *prev : AnchorLayoutParams(FILL_PARENT, FILL_PARENT));
@@ -108,9 +108,9 @@ void AnchorTranslateTween::DoApply(View *view, float pos) {
view->ReplaceLayoutParams(lp);
}
Point AnchorTranslateTween::Current(float p) {
Point2D AnchorTranslateTween::Current(float p) {
float inv = 1.0f - p;
return Point(from_.x * inv + to_.x * p, from_.y * inv + to_.y * p);
return Point2D(from_.x * inv + to_.x * p, from_.y * inv + to_.y * p);
}
} // namespace