Skip to content

Commit

Permalink
Cleanup|API: Renamed TimeDelta to TimeSpan
Browse files Browse the repository at this point in the history
  • Loading branch information
@skyjake
skyjake committed Nov 12, 2017
1 parent b911b0a commit c2763bb
Show file tree
Hide file tree
Showing 97 changed files with 285 additions and 281 deletions.
4 changes: 2 additions & 2 deletions doomsday/apps/client/include/network/serverlink.h
View file
Expand Up @@ -39,7 +39,7 @@ class ServerLink : public de::shell::AbstractLink

public:
DENG2_DEFINE_AUDIENCE2(DiscoveryUpdate, void linkDiscoveryUpdate(ServerLink const &link))
DENG2_DEFINE_AUDIENCE2(PingResponse, void pingResponse(de::Address const &, de::TimeDelta))
DENG2_DEFINE_AUDIENCE2(PingResponse, void pingResponse(de::Address const &, de::TimeSpan))
DENG2_DEFINE_AUDIENCE2(MapOutline, void mapOutlineReceived(de::Address const &, de::shell::MapOutlinePacket const &))

DENG2_DEFINE_AUDIENCE2(Join, void networkGameJoined())
Expand Down Expand Up @@ -95,7 +95,7 @@ class ServerLink : public de::shell::AbstractLink

void ping(de::Address const &address);

void connectDomain(de::String const &domain, de::TimeDelta const &timeout = 0) override;
void connectDomain(de::String const &domain, de::TimeSpan const &timeout = 0) override;
void connectHost(de::Address const &address) override;

/**
Expand Down
2 changes: 1 addition & 1 deletion doomsday/apps/client/include/render/playerweaponanimator.h
View file
Expand Up @@ -54,7 +54,7 @@ class PlayerWeaponAnimator

void setupVisPSprite(vispsprite_t &spr) const;

void advanceTime(de::TimeDelta const &elapsed);
void advanceTime(de::TimeSpan const &elapsed);

private:
DENG2_PRIVATE(d)
Expand Down
2 changes: 1 addition & 1 deletion doomsday/apps/client/include/render/stateanimator.h
View file
Expand Up @@ -85,7 +85,7 @@ class StateAnimator : public de::ModelDrawable::Animator,
de::ModelDrawable::Appearance const &appearance() const;

// ModelDrawable::Animator
void advanceTime(de::TimeDelta const &elapsed) override;
void advanceTime(de::TimeSpan const &elapsed) override;
de::ddouble currentTime(int index) const override;
de::Vector4f extraRotationForNode(de::String const &nodeName) const override;

Expand Down
6 changes: 3 additions & 3 deletions doomsday/apps/client/include/ui/clientwindow.h
View file
Expand Up @@ -144,11 +144,11 @@ class ClientWindow : public de::BaseWindow

enum FadeDirection { FadeFromBlack, FadeToBlack };

void fadeContent(FadeDirection fadeDirection, de::TimeDelta const &duration);
void fadeContent(FadeDirection fadeDirection, de::TimeSpan const &duration);
de::FadeToBlackWidget *contentFade();

void fadeInTaskBarBlur(de::TimeDelta span);
void fadeOutTaskBarBlur(de::TimeDelta span);
void fadeInTaskBarBlur(de::TimeSpan span);
void fadeOutTaskBarBlur(de::TimeSpan span);

void updateRootSize();

Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/include/ui/home/homewidget.h
View file
Expand Up @@ -40,8 +40,8 @@ class HomeWidget : public de::GuiWidget, public de::IPersistent
bool dispatchEvent(de::Event const &event,
bool (de::Widget::*memberFunc)(de::Event const &)) override;

void moveOnscreen(de::TimeDelta span = 1.5);
void moveOffscreen(de::TimeDelta span = 1.5);
void moveOnscreen(de::TimeSpan span = 1.5);
void moveOffscreen(de::TimeSpan span = 1.5);

// Events.
void update() override;
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/include/ui/postprocessing.h
View file
Expand Up @@ -50,9 +50,9 @@ class PostProcessing
* @param fxPostShader Name of the shader under "fx.post".
* @param span Duration of the fade in animation.
*/
void fadeInShader(de::String const &fxPostShader, de::TimeDelta const &span);
void fadeInShader(de::String const &fxPostShader, de::TimeSpan const &span);

void fadeOut(de::TimeDelta const &span);
void fadeOut(de::TimeSpan const &span);

/**
* Sets a constant opacity factor that is applied in addition to the fade.
Expand Down
10 changes: 5 additions & 5 deletions doomsday/apps/client/src/network/serverlink.cpp
View file
Expand Up @@ -77,7 +77,7 @@ DENG2_PIMPL(ServerLink)
Servers discovered;
Servers fromMaster;
QElapsedTimer pingTimer;
QList<TimeDelta> pings;
QList<TimeSpan> pings;
int pingCounter;
std::unique_ptr<GameProfile> serverProfile; ///< Profile used when joining.
std::function<void (GameProfile const *)> profileResultCallback;
Expand Down Expand Up @@ -537,7 +537,7 @@ void ServerLink::ping(Address const &address)
}
}

void ServerLink::connectDomain(String const &domain, TimeDelta const &timeout)
void ServerLink::connectDomain(String const &domain, TimeSpan const &timeout)
{
LOG_AS("ServerLink::connectDomain");

Expand Down Expand Up @@ -752,7 +752,7 @@ void ServerLink::handleIncomingPackets()
if (packetData.size() == 4 && packetData == "Pong" &&
d->pingCounter-- > 0)
{
d->pings.append(TimeDelta::fromMilliSeconds(d->pingTimer.elapsed()));
d->pings.append(TimeSpan::fromMilliSeconds(d->pingTimer.elapsed()));
*this << ByteRefArray("Ping?", 5);
d->pingTimer.restart();
}
Expand All @@ -765,8 +765,8 @@ void ServerLink::handleIncomingPackets()
// Notify about the average ping time.
if (d->pings.count())
{
TimeDelta average = 0;
for (TimeDelta i : d->pings) average += i;
TimeSpan average = 0;
for (TimeSpan i : d->pings) average += i;
average /= d->pings.count();

DENG2_FOR_AUDIENCE2(PingResponse, i)
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/src/render/playerweaponanimator.cpp
View file
Expand Up @@ -127,14 +127,14 @@ void PlayerWeaponAnimator::setupVisPSprite(vispsprite_t &spr) const
/* yaw: */ bob[0] * weaponOffsetScale,
/* pitch: */ (32 - bob[1]) * weaponOffsetScale * weaponOffsetScaleY / 1000.0f);

TimeDelta const span = 1.0 / Timer_TicksPerSecond();
TimeSpan const span = 1.0 / Timer_TicksPerSecond();
d->angleOffset.setValueIfDifferentTarget(angles, span);

spr.data.model2.yawAngleOffset = d->angleOffset.x;
spr.data.model2.pitchAngleOffset = d->angleOffset.y;
}

void PlayerWeaponAnimator::advanceTime(TimeDelta const &elapsed)
void PlayerWeaponAnimator::advanceTime(TimeSpan const &elapsed)
{
if (clientPaused) return;

Expand Down
6 changes: 3 additions & 3 deletions doomsday/apps/client/src/render/stateanimator.cpp
View file
Expand Up @@ -82,7 +82,7 @@ DENG2_PIMPL(StateAnimator)
int priority = ANIM_DEFAULT_PRIORITY;
Timeline const *timeline = nullptr; // owned by ModelRenderer::AnimSequence
std::unique_ptr<Timeline::Clock> clock;
TimeDelta overrideDuration = -1.0;
TimeSpan overrideDuration = -1.0;

Sequence() {}

Expand Down Expand Up @@ -750,7 +750,7 @@ int StateAnimator::animationId(String const &name) const
return d->animationId(name);
}

void StateAnimator::advanceTime(TimeDelta const &elapsed)
void StateAnimator::advanceTime(TimeSpan const &elapsed)
{
ModelDrawable::Animator::advanceTime(elapsed);

Expand All @@ -777,7 +777,7 @@ void StateAnimator::advanceTime(TimeDelta const &elapsed)
// TODO: Determine actual time factor.

// Advance the sequence.
TimeDelta animElapsed = factor * elapsed;
TimeSpan animElapsed = factor * elapsed;
anim.time += animElapsed;

if (anim.looping == Sequence::NotLooping)
Expand Down
12 changes: 6 additions & 6 deletions doomsday/apps/client/src/ui/clientwindow.cpp
View file
Expand Up @@ -529,7 +529,7 @@ DENG2_PIMPL(ClientWindow)

void showOrHideQuitButton()
{
TimeDelta const SPAN = 0.6;
TimeSpan const SPAN = 0.6;
if (self().isFullScreen() && !DoomsdayApp::isGameLoaded())
{
quitX->set(-quitButton->rule().width() - Style::get().rules().rule("gap"), SPAN);
Expand Down Expand Up @@ -716,7 +716,7 @@ DENG2_PIMPL(ClientWindow)

void minimizeGame(bool mini)
{
TimeDelta const SPAN = 1.0;
TimeSpan const SPAN = 1.0;

if (mini && !isGameMini)
{
Expand Down Expand Up @@ -769,7 +769,7 @@ DENG2_PIMPL(ClientWindow)
#endif
}

void setupFade(FadeDirection fadeDir, TimeDelta const &span)
void setupFade(FadeDirection fadeDir, TimeSpan const &span)
{
if (!fader)
{
Expand Down Expand Up @@ -1013,14 +1013,14 @@ void ClientWindow::grab(image_t &img, bool halfSized) const
DENG_ASSERT(img.pixelSize != 0);
}

void ClientWindow::fadeInTaskBarBlur(TimeDelta span)
void ClientWindow::fadeInTaskBarBlur(TimeSpan span)
{
d->taskBarBlur->setAttribute(GuiWidget::DontDrawContent, UnsetFlags);
d->taskBarBlur->setOpacity(0);
d->taskBarBlur->setOpacity(1, span);
}

void ClientWindow::fadeOutTaskBarBlur(TimeDelta span)
void ClientWindow::fadeOutTaskBarBlur(TimeSpan span)
{
d->taskBarBlur->setOpacity(0, span);
QTimer::singleShot(span.asMilliSeconds(), this, SLOT(hideTaskBarBlur()));
Expand Down Expand Up @@ -1102,7 +1102,7 @@ bool ClientWindow::handleFallbackEvent(Event const &event)
return d->handleFallbackEvent(event);
}

void ClientWindow::fadeContent(FadeDirection fadeDirection, TimeDelta const &duration)
void ClientWindow::fadeContent(FadeDirection fadeDirection, TimeSpan const &duration)
{
d->setupFade(fadeDirection, duration);
}
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp
View file
Expand Up @@ -54,7 +54,7 @@ DENG_GUI_PIMPL(ServerInfoDialog)
String domainName;
GameProfile profile;
shell::ServerInfo serverInfo;
TimeDelta ping = -1;
TimeSpan ping = -1;

// Network queries.
ServerLink link; // querying details from the server
Expand Down Expand Up @@ -436,7 +436,7 @@ DENG_GUI_PIMPL(ServerInfoDialog)
startQuery(QueryPing);
}

void pingResponse(Address const &, TimeDelta pingTime)
void pingResponse(Address const &, TimeSpan pingTime)
{
ping = pingTime;
updateContent();
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp
View file
Expand Up @@ -454,7 +454,7 @@ DENG_GUI_PIMPL(GameColumnWidget)
{
popup->detachAnchor();
// Animate the widget to fade it away.
TimeDelta const SPAN = 0.2;
TimeSpan const SPAN = 0.2;
button->setOpacity(0, SPAN);
Loop::get().timer(SPAN, [profileItem] ()
{
Expand Down Expand Up @@ -499,7 +499,7 @@ DENG_GUI_PIMPL(GameColumnWidget)

void buttonStateChanged(ButtonWidget &button, ButtonWidget::State state)
{
TimeDelta const SPAN = 0.25;
TimeSpan const SPAN = 0.25;
switch (state)
{
case ButtonWidget::Up:
Expand Down
18 changes: 9 additions & 9 deletions doomsday/apps/client/src/ui/home/homewidget.cpp
View file
Expand Up @@ -45,8 +45,8 @@

using namespace de;

static TimeDelta const SCROLL_SPAN = .5;
static TimeDelta const DISMISS_SPAN = 1.5;
static TimeSpan const SCROLL_SPAN = .5;
static TimeSpan const DISMISS_SPAN = 1.5;

DENG_GUI_PIMPL(HomeWidget)
, DENG2_OBSERVES(App, StartupComplete)
Expand Down Expand Up @@ -301,7 +301,7 @@ DENG_GUI_PIMPL(HomeWidget)
}
else
{
TimeDelta span = DISMISS_SPAN;
TimeSpan span = DISMISS_SPAN;
auto &win = self().root().window().as<ClientWindow>();
if (win.isGameMinimized())
{
Expand All @@ -327,7 +327,7 @@ DENG_GUI_PIMPL(HomeWidget)
updateVisibleTabsAndLayout();
}

void moveOffscreen(TimeDelta span = DISMISS_SPAN)
void moveOffscreen(TimeSpan span = DISMISS_SPAN)
{
self().disable();
self().setBehavior(DisableEventDispatchToChildren);
Expand All @@ -344,7 +344,7 @@ DENG_GUI_PIMPL(HomeWidget)
}
}

void moveOnscreen(TimeDelta span = DISMISS_SPAN)
void moveOnscreen(TimeSpan span = DISMISS_SPAN)
{
if (!fequal(dismissOffset->animation().target(), 0.f))
{
Expand Down Expand Up @@ -455,7 +455,7 @@ DENG_GUI_PIMPL(HomeWidget)
* @param pos Column/tab index.
* @param span Animation duration.
*/
void scrollToTab(int pos, TimeDelta span)
void scrollToTab(int pos, TimeSpan span)
{
pos = de::clamp(0, pos, columns.size() - 1);

Expand All @@ -481,7 +481,7 @@ DENG_GUI_PIMPL(HomeWidget)
setScrollOffset(currentOffsetTab, span);
}

void setScrollOffset(int tab, TimeDelta const &span)
void setScrollOffset(int tab, TimeSpan const &span)
{
scrollOffset->set(*columnWidth * tab, span);
}
Expand Down Expand Up @@ -639,12 +639,12 @@ bool HomeWidget::handleEvent(Event const &event)
return false;
}

void HomeWidget::moveOnscreen(TimeDelta span)
void HomeWidget::moveOnscreen(TimeSpan span)
{
d->moveOnscreen(span);
}

void HomeWidget::moveOffscreen(TimeDelta span)
void HomeWidget::moveOffscreen(TimeSpan span)
{
d->moveOffscreen(span);
}
Expand Down
10 changes: 7 additions & 3 deletions doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "ui/widgets/packageswidget.h"
#include "ui/dialogs/packageinfodialog.h"
#include "ui/dialogs/datafilesettingsdialog.h"
#include "ui/dialogs/repositorybrowserdialog.h"
#include "ui/widgets/homeitemwidget.h"
#include "ui/widgets/homemenuwidget.h"

Expand Down Expand Up @@ -109,8 +110,9 @@ DENG_GUI_PIMPL(PackagesColumnWidget)
menu->items()
<< new ui::ActionItem(tr("Install Mods..."),
new CallbackAction([this] () { openRepositoryBrowser(); }))
//<< new ui::Item(ui::Item::Separator)
<< new ui::ActionItem(tr("Refresh"),
<< new ui::SubwidgetItem(tr("Settings"), ui::Left, makePopup<DataFileSettingsDialog>)
<< new ui::Item(ui::Item::Separator)
<< new ui::ActionItem(tr("Refresh List"),
new CallbackAction([this] () { packages->refreshPackages(); }));
return menu;
}, ui::Down);
Expand All @@ -123,7 +125,9 @@ DENG_GUI_PIMPL(PackagesColumnWidget)

void openRepositoryBrowser()
{

auto *dlg = new RepositoryBrowserDialog;
dlg->setDeleteAfterDismissed(true);
dlg->exec(root());
}
};

Expand Down
10 changes: 5 additions & 5 deletions doomsday/apps/client/src/ui/postprocessing.cpp
View file
Expand Up @@ -49,9 +49,9 @@ DENG2_PIMPL(PostProcessing)
struct QueueEntry {
String shaderName;
float fade;
TimeDelta span;
TimeSpan span;

QueueEntry(String const &name, float f, TimeDelta const &s)
QueueEntry(String const &name, float f, TimeSpan const &s)
: shaderName(name), fade(f), span(s) {}
};
typedef QList<QueueEntry> Queue;
Expand Down Expand Up @@ -163,12 +163,12 @@ bool PostProcessing::isActive() const
return d->isActive();
}

void PostProcessing::fadeInShader(String const &fxPostShader, TimeDelta const &span)
void PostProcessing::fadeInShader(String const &fxPostShader, TimeSpan const &span)
{
d->queue.append(Impl::QueueEntry(fxPostShader, 1, span));
}

void PostProcessing::fadeOut(TimeDelta const &span)
void PostProcessing::fadeOut(TimeSpan const &span)
{
d->queue.append(Impl::QueueEntry("", 0, span));
}
Expand Down Expand Up @@ -224,7 +224,7 @@ D_CMD(PostFx)

int console = String(argv[1]).toInt();
String const shader = argv[2];
TimeDelta const span = (argc == 4? String(argv[3]).toDouble() : 0);
TimeSpan const span = (argc == 4? String(argv[3]).toDouble() : 0);

if (console < 0 || console >= DDMAXPLAYERS)
{
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/client/src/ui/progress.cpp
View file
Expand Up @@ -27,7 +27,7 @@
using namespace de;

// Time for the progress to reach the new target (seconds).
static de::TimeDelta const PROGRESS_DELTA_TIME = 0.5;
static de::TimeSpan const PROGRESS_DELTA_TIME = 0.5;

static ProgressWidget &progress()
{
Expand All @@ -53,5 +53,5 @@ dd_bool Con_IsProgressAnimationCompleted(void)
void Con_SetProgress(int progressValue)
{
progress().setProgress(progressValue, progressValue < progress().range().end?
PROGRESS_DELTA_TIME : TimeDelta(PROGRESS_DELTA_TIME / 2));
PROGRESS_DELTA_TIME : TimeSpan(PROGRESS_DELTA_TIME / 2));
}

0 comments on commit c2763bb

Please sign in to comment.