History

switch usec timestamps to uint64_t

Stephen Birarda committed 13 years ago

Commit ca8f2591 parent 9ba3bfc20 files · +58 −57Browse files

Showing the changes to interface/src/Application.cpp (1 of 20 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -903,7 +903,7 @@ void Application::wheelEvent(QWheelEvent* event) { · 902 unmodified lines
903void Application::sendPingPackets() {903void Application::sendPingPackets() {
904 904
905 char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER};905 char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER};
906 long long currentTime = usecTimestampNow();906 uint64_t currentTime = usecTimestampNow();
907 unsigned char pingPacket[1 + sizeof(currentTime)];907 unsigned char pingPacket[1 + sizeof(currentTime)];
908 pingPacket[0] = PACKET_HEADER_PING;908 pingPacket[0] = PACKET_HEADER_PING;
909 909
@@ -2429,7 +2429,7 @@ void Application::displayOverlay() { · 1519 unmodified lines
2429 // Show on-screen msec timer2429 // Show on-screen msec timer
2430 if (_renderFrameTimerOn->isChecked()) {2430 if (_renderFrameTimerOn->isChecked()) {
2431 char frameTimer[10];2431 char frameTimer[10];
2432 long long mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);2432 uint64_t mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);
2433 sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));2433 sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));
2434 drawtext(_glWidget->width() - 100, _glWidget->height() - 20, 0.30, 0, 1.0, 0, frameTimer, 0, 0, 0);2434 drawtext(_glWidget->width() - 100, _glWidget->height() - 20, 0.30, 0, 1.0, 0, frameTimer, 0, 0, 0);
2435 drawtext(_glWidget->width() - 102, _glWidget->height() - 22, 0.30, 0, 1.0, 0, frameTimer, 1, 1, 1);2435 drawtext(_glWidget->width() - 102, _glWidget->height() - 22, 0.30, 0, 1.0, 0, frameTimer, 1, 1, 1);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t