Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more windows fixes

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-12 23:08:01 -08:00
parent d92d043e8f
commit a3022f538d
5 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/devices/OculusManager.cpp
View file

@ -6,6 +6,11 @@
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
//
#ifdef WIN32
#define WANT_TIMEVAL
#include <Systime.h>
#endif
#include <QOpenGLFramebufferObject>
#include <glm/glm.hpp>

10
interface/src/devices/TV3DManager.cpp
View file

@ -6,12 +6,20 @@
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#include <QOpenGLFramebufferObject>
#include <glm/glm.hpp>
#include "Application.h"
#include "InterfaceConfig.h"
#ifdef WIN32
#define WANT_TIMEVAL
#include <Systime.h>
#endif
#include "Application.h"
#include "TV3DManager.h"
#include "Menu.h"

5
interface/src/renderer/GeometryCache.cpp
View file

@ -9,11 +9,6 @@
#include <QNetworkReply>
#ifdef WIN32
#define WANT_TIMEVAL
#include <Systime.h>
#endif
#include "Application.h"
#include "GeometryCache.h"
#include "world.h"

4
interface/src/starfield/Generator.cpp
View file

@ -15,7 +15,7 @@
using namespace starfield;
const float Generator::STAR_COLORIZATION = 0.1;
const float Generator::STAR_COLORIZATION = 0.1f;
void Generator::computeStarPositions(InputVertices& destination, unsigned limit, unsigned seed) {
InputVertices* vertices = & destination;
@ -31,7 +31,7 @@ void Generator::computeStarPositions(InputVertices& destination, unsigned limit,
const unsigned MILKY_WAY_WIDTH = 12.0; // width in degrees of one half of the Milky Way
const float MILKY_WAY_INCLINATION = 0.0f; // angle of Milky Way from horizontal in degrees
const float MILKY_WAY_RATIO = 0.4;
const float MILKY_WAY_RATIO = 0.4f;
const unsigned NUM_DEGREES = 360;
for(int star = 0; star < floor(limit * (1 - MILKY_WAY_RATIO)); ++star) {

2
interface/src/windowshacks.h
View file

@ -30,6 +30,8 @@ inline double roundf(double value) {
}
#define round roundf
#endif // WIN32