-
X
-
Y
-
Z
+
X
+
Y
+
Z
@@ -1566,33 +1567,33 @@
Atmosphere Scattering Wavelenghts
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index a144661f8b..0eeb7222b6 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -51,7 +51,6 @@ void Hand::renderHandTargets(RenderArgs* renderArgs, bool isMine) {
const glm::vec3 greenColor(0.0f, 1.0f, 0.0f); // Color the hand targets red to be different than skin
const glm::vec3 blueColor(0.0f, 0.0f, 1.0f); // Color the hand targets red to be different than skin
const glm::vec3 grayColor(0.5f);
- const int NUM_FACETS = 8;
const float SPHERE_RADIUS = 0.03f * avatarScale;
gpu::Batch& batch = *renderArgs->_batch;
diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp
index 52b4dce68d..b6f2aa8718 100755
--- a/interface/src/devices/3DConnexionClient.cpp
+++ b/interface/src/devices/3DConnexionClient.cpp
@@ -425,6 +425,7 @@ bool ConnexionClient::InitializeRawInput(HWND hwndTarget) {
return false;
}
+ // FIXME - http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
// Get OS version.
OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO), 0 };
::GetVersionEx(&osvi);
diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 588a5077b4..44d8b6861a 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -89,7 +89,6 @@ void Circle3DOverlay::render(RenderArgs* args) {
const float SLICES = 180.0f; // The amount of segment to create the circle
const float SLICE_ANGLE = FULL_CIRCLE / SLICES;
- //const int slices = 15;
xColor colorX = getColor();
const float MAX_COLOR = 255.0f;
glm::vec4 color(colorX.red / MAX_COLOR, colorX.green / MAX_COLOR, colorX.blue / MAX_COLOR, alpha);
diff --git a/interface/src/ui/overlays/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp
index 0df09d25f6..7caff3ea04 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.cpp
+++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp
@@ -32,7 +32,6 @@ void Sphere3DOverlay::render(RenderArgs* args) {
return; // do nothing if we're not visible
}
- const int SLICES = 15;
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255.0f;
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index f14fcf4dc0..73e83fa097 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -29,11 +29,7 @@
#include
-// #include "Application.h"
-// #include "GeometryUtil.h"
-
static const float DPI = 30.47f;
-static const float METERS_TO_INCHES = 39.3701f;
static const float INCHES_TO_METERS = 1.0f / 39.3701f;
QString const Web3DOverlay::TYPE = "web3d";
diff --git a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
index a13ed5b06d..f103aaed4c 100644
--- a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
@@ -25,8 +25,8 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, Render
gpu::Batch& batch = *args->_batch;
auto shapeTransform = entity->getTransformToCenter();
- if (puffedOut != 0.0) {
- shapeTransform.postScale(1.0 + puffedOut);
+ if (puffedOut != 0.0f) {
+ shapeTransform.postScale(1.0f + puffedOut);
}
batch.setModelTransform(Transform()); // we want to include the scale as well
DependencyManager::get()->renderWireCubeInstance(batch, shapeTransform, color);
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index d1798df397..da240e826a 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -934,8 +934,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
_textureContent.insert(filename, content);
}
} else if (object.name == "Material") {
- FBXMaterial material = { glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(), glm::vec2(0.f, 1.0f), 96.0f, 1.0f,
- QString("")};
+ FBXMaterial material(glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f), glm::vec3(), glm::vec2(0.f, 1.0f), 96.0f, 1.0f);
foreach (const FBXNode& subobject, object.children) {
bool properties = false;
QByteArray propertyName;
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index 3027eb52cc..5cfff9826f 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -136,6 +136,16 @@ public:
class FBXMaterial {
public:
+ FBXMaterial() {};
+ FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
+ const glm::vec2& emissiveParams, float shininess, float opacity) :
+ diffuseColor(diffuseColor),
+ specularColor(specularColor),
+ emissiveColor(emissiveColor),
+ emissiveParams(emissiveParams),
+ shininess(shininess),
+ opacity(opacity) {}
+
glm::vec3 diffuseColor;
glm::vec3 specularColor;
glm::vec3 emissiveColor;
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index c2cd77e5bc..619aa901bb 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -487,11 +487,10 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
groupMaterialName = SMART_DEFAULT_MATERIAL_NAME;
}
if (!groupMaterialName.isEmpty()) {
- OBJMaterial* material = &materials[groupMaterialName];
-
// TODO Fix this once the transision is understood
/*// The code behind this is in transition. Some things are set directly in the FXBMeshPart...
+ OBJMaterial* material = &materials[groupMaterialName];
meshPart.materialID = groupMaterialName;
meshPart.diffuseTexture.filename = material->diffuseTextureFilename;
meshPart.specularTexture.filename = material->specularTextureFilename;
diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp
index 62508f273c..ab8c90a2c8 100644
--- a/libraries/gpu/src/gpu/GLBackend.cpp
+++ b/libraries/gpu/src/gpu/GLBackend.cpp
@@ -337,6 +337,8 @@ void GLBackend::do_drawIndexedInstanced(Batch& batch, uint32 paramOffset) {
glDrawElementsInstanced(mode, numIndices, glType, reinterpret_cast(startIndex + _input._indexBufferOffset), numInstances);
(void)CHECK_GL_ERROR();
+
+ Q_UNUSED(startInstance);
}
void GLBackend::do_resetStages(Batch& batch, uint32 paramOffset) {
diff --git a/libraries/gpu/src/gpu/Stream.cpp b/libraries/gpu/src/gpu/Stream.cpp
index 98d23ac266..61150ab90e 100644
--- a/libraries/gpu/src/gpu/Stream.cpp
+++ b/libraries/gpu/src/gpu/Stream.cpp
@@ -18,7 +18,7 @@ using namespace gpu;
using ElementArray = std::array;
const ElementArray& getDefaultElements() {
- static ElementArray defaultElements{
+ static ElementArray defaultElements{{
//POSITION = 0,
Element::VEC3F_XYZ,
//NORMAL = 1,
@@ -42,7 +42,7 @@ const ElementArray& getDefaultElements() {
//INSTANCE_XFM = 10,
// FIXME make a matrix element
Element::VEC4F_XYZW
- };
+ }};
return defaultElements;
}
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index a66fda624d..780cf83649 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -270,7 +270,7 @@ static NetworkMesh* buildNetworkMesh(const FBXMesh& mesh, const QUrl& textureBas
NetworkMesh* networkMesh = new NetworkMesh();
int totalIndices = 0;
- bool checkForTexcoordLightmap = false;
+ //bool checkForTexcoordLightmap = false;
@@ -393,8 +393,7 @@ static NetworkMaterial* buildNetworkMaterial(const FBXMaterial& material, const
auto textureCache = DependencyManager::get();
NetworkMaterial* networkMaterial = new NetworkMaterial();
- int totalIndices = 0;
- bool checkForTexcoordLightmap = false;
+ //bool checkForTexcoordLightmap = false;
networkMaterial->_material = material._material;
@@ -430,7 +429,7 @@ static NetworkMaterial* buildNetworkMaterial(const FBXMaterial& material, const
networkMaterial->emissiveTexture = textureCache->getTexture(textureBaseUrl.resolved(QUrl(material.emissiveTexture.filename)), EMISSIVE_TEXTURE, material.emissiveTexture.content);
networkMaterial->emissiveTextureName = material.emissiveTexture.name;
- checkForTexcoordLightmap = true;
+ //checkForTexcoordLightmap = true;
auto lightmapMap = model::TextureMapPointer(new model::TextureMap());
lightmapMap->setTextureSource(networkMaterial->emissiveTexture->_textureSource);
@@ -492,9 +491,9 @@ void NetworkGeometry::modelParseError(int error, QString str) {
const NetworkMaterial* NetworkGeometry::getShapeMaterial(int shapeID) {
- if ((shapeID >= 0) && (shapeID < _shapes.size())) {
+ if ((shapeID >= 0) && (shapeID < (int)_shapes.size())) {
int materialID = _shapes[shapeID]->_materialID;
- if ((materialID >= 0) && (materialID < _materials.size())) {
+ if ((materialID >= 0) && ((unsigned int)materialID < _materials.size())) {
return _materials[materialID].get();
} else {
return 0;
diff --git a/libraries/model/src/model/TextureMap.cpp b/libraries/model/src/model/TextureMap.cpp
index c2551d276d..e3031e2b4d 100755
--- a/libraries/model/src/model/TextureMap.cpp
+++ b/libraries/model/src/model/TextureMap.cpp
@@ -59,7 +59,7 @@ gpu::Texture* TextureUsage::create2DTextureFromImage(const QImage& srcImage, con
int opaquePixels = 0;
int translucentPixels = 0;
- bool isTransparent = false;
+ //bool isTransparent = false;
int redTotal = 0, greenTotal = 0, blueTotal = 0, alphaTotal = 0;
const int EIGHT_BIT_MAXIMUM = 255;
QColor averageColor(EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM);
@@ -112,7 +112,7 @@ gpu::Texture* TextureUsage::create2DTextureFromImage(const QImage& srcImage, con
averageColor = QColor(redTotal / imageArea,
greenTotal / imageArea, blueTotal / imageArea, alphaTotal / imageArea);
- isTransparent = (translucentPixels >= imageArea / 2);
+ //isTransparent = (translucentPixels >= imageArea / 2);
}
gpu::Texture* theTexture = nullptr;
@@ -269,7 +269,7 @@ gpu::Texture* TextureUsage::createCubeTextureFromImage(const QImage& srcImage, c
int opaquePixels = 0;
int translucentPixels = 0;
- bool isTransparent = false;
+ //bool isTransparent = false;
int redTotal = 0, greenTotal = 0, blueTotal = 0, alphaTotal = 0;
const int EIGHT_BIT_MAXIMUM = 255;
QColor averageColor(EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM);
@@ -322,7 +322,7 @@ gpu::Texture* TextureUsage::createCubeTextureFromImage(const QImage& srcImage, c
averageColor = QColor(redTotal / imageArea,
greenTotal / imageArea, blueTotal / imageArea, alphaTotal / imageArea);
- isTransparent = (translucentPixels >= imageArea / 2);
+ //isTransparent = (translucentPixels >= imageArea / 2);
}
gpu::Texture* theTexture = nullptr;
diff --git a/libraries/networking/src/udt/ConnectionStats.cpp b/libraries/networking/src/udt/ConnectionStats.cpp
index 4cc9b17e64..e7efe3d5af 100644
--- a/libraries/networking/src/udt/ConnectionStats.cpp
+++ b/libraries/networking/src/udt/ConnectionStats.cpp
@@ -85,30 +85,30 @@ static const double EWMA_PREVIOUS_SAMPLES_WEIGHT = 1.0 - EWMA_CURRENT_SAMPLE_WEI
void ConnectionStats::recordSendRate(int sample) {
_currentSample.sendRate = sample;
- _total.sendRate = (_total.sendRate * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.sendRate = (int)((_total.sendRate * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
void ConnectionStats::recordReceiveRate(int sample) {
_currentSample.receiveRate = sample;
- _total.receiveRate = (_total.receiveRate * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.receiveRate = (int)((_total.receiveRate * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
void ConnectionStats::recordEstimatedBandwidth(int sample) {
_currentSample.estimatedBandwith = sample;
- _total.estimatedBandwith = (_total.estimatedBandwith * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.estimatedBandwith = (int)((_total.estimatedBandwith * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
void ConnectionStats::recordRTT(int sample) {
_currentSample.rtt = sample;
- _total.rtt = (_total.rtt * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.rtt = (int)((_total.rtt * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
void ConnectionStats::recordCongestionWindowSize(int sample) {
_currentSample.congestionWindowSize = sample;
- _total.congestionWindowSize = (_total.congestionWindowSize * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.congestionWindowSize = (int)((_total.congestionWindowSize * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
void ConnectionStats::recordPacketSendPeriod(int sample) {
_currentSample.packetSendPeriod = sample;
- _total.packetSendPeriod = (_total.packetSendPeriod * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT);
+ _total.packetSendPeriod = (int)((_total.packetSendPeriod * EWMA_PREVIOUS_SAMPLES_WEIGHT) + (sample * EWMA_CURRENT_SAMPLE_WEIGHT));
}
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index b120bb8a57..d23d60cf49 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -435,7 +435,7 @@ void DeferredLightingEffect::render(RenderArgs* args) {
args->_context->getStereoProjections(projMats);
args->_context->getStereoViews(eyeViews);
- float halfWidth = 0.5 * sWidth;
+ float halfWidth = 0.5f * sWidth;
for (int i = 0; i < numPasses; i++) {
// In stereo, the 2 sides are layout side by side in the mono viewport and their width is half
diff --git a/libraries/render-utils/src/GLEscrow.cpp b/libraries/render-utils/src/GLEscrow.cpp
deleted file mode 100644
index 253af35d92..0000000000
--- a/libraries/render-utils/src/GLEscrow.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Created by Bradley Austin Davis on 2015/08/06.
-// Copyright 2015 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "GLEscrow.h"
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 093434f079..d117b5f729 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -36,17 +36,18 @@
const int GeometryCache::UNKNOWN_ID = -1;
-static const uint FLOATS_PER_VERTEX = 3;
-static const uint VERTICES_PER_TRIANGLE = 3;
-static const uint TRIANGLES_PER_QUAD = 2;
-static const uint CUBE_FACES = 6;
-static const uint CUBE_VERTICES_PER_FACE = 4;
-static const uint CUBE_VERTICES = CUBE_FACES * CUBE_VERTICES_PER_FACE;
-static const uint CUBE_VERTEX_POINTS = CUBE_VERTICES * FLOATS_PER_VERTEX;
-static const uint CUBE_INDICES = CUBE_FACES * TRIANGLES_PER_QUAD * VERTICES_PER_TRIANGLE;
-static const uint SPHERE_LATITUDES = 24;
-static const uint SPHERE_MERIDIANS = SPHERE_LATITUDES * 2;
-static const uint SPHERE_INDICES = SPHERE_MERIDIANS * (SPHERE_LATITUDES - 1) * TRIANGLES_PER_QUAD * VERTICES_PER_TRIANGLE;
+static const int VERTICES_PER_TRIANGLE = 3;
+
+//static const uint FLOATS_PER_VERTEX = 3;
+//static const uint TRIANGLES_PER_QUAD = 2;
+//static const uint CUBE_FACES = 6;
+//static const uint CUBE_VERTICES_PER_FACE = 4;
+//static const uint CUBE_VERTICES = CUBE_FACES * CUBE_VERTICES_PER_FACE;
+//static const uint CUBE_VERTEX_POINTS = CUBE_VERTICES * FLOATS_PER_VERTEX;
+//static const uint CUBE_INDICES = CUBE_FACES * TRIANGLES_PER_QUAD * VERTICES_PER_TRIANGLE;
+//static const uint SPHERE_LATITUDES = 24;
+//static const uint SPHERE_MERIDIANS = SPHERE_LATITUDES * 2;
+//static const uint SPHERE_INDICES = SPHERE_MERIDIANS * (SPHERE_LATITUDES - 1) * TRIANGLES_PER_QUAD * VERTICES_PER_TRIANGLE;
static const gpu::Element POSITION_ELEMENT{ gpu::VEC3, gpu::FLOAT, gpu::XYZ };
static const gpu::Element NORMAL_ELEMENT{ gpu::VEC3, gpu::FLOAT, gpu::XYZ };
@@ -122,9 +123,9 @@ void GeometryCache::ShapeData::drawWireInstances(gpu::Batch& batch, size_t count
}
const VertexVector& icosahedronVertices() {
- static const float phi = (1.0 + sqrt(5.0)) / 2.0;
- static const float a = 0.5;
- static const float b = 1.0 / (2.0 * phi);
+ static const float phi = (1.0f + sqrtf(5.0f)) / 2.0f;
+ static const float a = 0.5f;
+ static const float b = 1.0f / (2.0f * phi);
static const VertexVector vertices{ //
vec3(0, b, -a), vec3(-b, a, 0), vec3(b, a, 0), //
@@ -152,7 +153,7 @@ const VertexVector& icosahedronVertices() {
}
const VertexVector& tetrahedronVertices() {
- static const float a = 1.0f / sqrt(2.0f);
+ static const float a = 1.0f / sqrtf(2.0f);
static const auto A = vec3(0, 1, a);
static const auto B = vec3(0, -1, a);
static const auto C = vec3(1, 0, -a);
@@ -294,7 +295,6 @@ void GeometryCache::buildShapes() {
static const size_t VERTEX_FORMAT_SIZE = 2;
static const size_t VERTEX_OFFSET = 0;
- static const size_t NORMAL_OFFSET = 1;
for (size_t i = 0; i < vertices.size(); ++i) {
auto vertexIndex = i;
@@ -323,7 +323,7 @@ void GeometryCache::buildShapes() {
20, 21, 21, 22, 22, 23, 23, 20, // back
0, 23, 1, 22, 2, 21, 3, 20 // sides
};
- for (int i = 0; i < wireIndices.size(); ++i) {
+ for (unsigned int i = 0; i < wireIndices.size(); ++i) {
indices[i] += startingIndex;
}
@@ -374,7 +374,7 @@ void GeometryCache::buildShapes() {
0, 3, 1, 3, 2, 3,
};
- for (int i = 0; i < wireIndices.size(); ++i) {
+ for (unsigned int i = 0; i < wireIndices.size(); ++i) {
wireIndices[i] += startingIndex;
}
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 08c42d90a7..de760dc793 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -192,8 +192,8 @@ public:
void setCauterizeBoneSet(const std::unordered_set& boneSet) { _cauterizeBoneSet = boneSet; }
int getBlendshapeCoefficientsNum() const { return _blendshapeCoefficients.size(); }
- float getBlendshapeCoefficient(unsigned int index) const {
- return index >= (unsigned int)_blendshapeCoefficients.size() ? 0.0f : _blendshapeCoefficients.at(index);
+ float getBlendshapeCoefficient(int index) const {
+ return ((index < 0) && (index >= _blendshapeCoefficients.size())) ? 0.0f : _blendshapeCoefficients.at(index);
}
protected:
diff --git a/libraries/render-utils/src/OglplusHelpers.h b/libraries/render-utils/src/OglplusHelpers.h
index 99232b97cb..4734b8b213 100644
--- a/libraries/render-utils/src/OglplusHelpers.h
+++ b/libraries/render-utils/src/OglplusHelpers.h
@@ -24,6 +24,11 @@
#define OGLPLUS_NO_SITE_CONFIG 1
#define OGLPLUS_LOW_PROFILE 1
+// NOTE: oglplus does some naked "#pragma GCC" without proper platform wrapping, so we need to disable this warning.
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning( disable : 4068 )
+#endif
#include
#include
@@ -34,6 +39,10 @@
#include
#include
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
+
#include "NumericalConstants.h"
using FramebufferPtr = std::shared_ptr;
diff --git a/libraries/shared/src/MatrixStack.cpp b/libraries/shared/src/MatrixStack.cpp
deleted file mode 100644
index 2a2817a413..0000000000
--- a/libraries/shared/src/MatrixStack.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Created by Bradley Austin Davis
-// Copyright 2013 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "MatrixStack.h"
diff --git a/libraries/shared/src/shared/ReadWriteLockable.cpp b/libraries/shared/src/shared/ReadWriteLockable.cpp
deleted file mode 100644
index 04b71cf64f..0000000000
--- a/libraries/shared/src/shared/ReadWriteLockable.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Created by Bradley Austin Davis on 2015/09/10
-// Copyright 2013-2015 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "ReadWriteLockable.h"
-
diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp
index 8eac7e931f..1b150ee3f5 100644
--- a/tests/entities/src/main.cpp
+++ b/tests/entities/src/main.cpp
@@ -93,10 +93,6 @@ template
void testByteCountCoded() {
testByteCountCodedStable(0);
testByteCountCodedStable(1);
- // These two can't possibly be right. TODO: figure out what was being tested, here
- // testByteCountCodedStable(1 << 8*sizeof(T));
- // testByteCountCodedStable(std::numeric_limits::max() >> 8*sizeof(T));
- testByteCountCodedStable(std::numeric_limits::max() >> 8);
testByteCountCodedStable(std::numeric_limits::max() >> 1);
testByteCountCodedStable(std::numeric_limits::max());
}
diff --git a/tests/gpu-test/src/main.cpp b/tests/gpu-test/src/main.cpp
index ad9ed9bb4a..f8eb361cb9 100644
--- a/tests/gpu-test/src/main.cpp
+++ b/tests/gpu-test/src/main.cpp
@@ -175,8 +175,6 @@ public:
}
void draw() {
- static auto startTime = usecTimestampNow();
-
if (!isVisible()) {
return;
}
@@ -192,7 +190,7 @@ public:
glm::vec3 unitscale { 1.0f };
glm::vec3 up { 0.0f, 1.0f, 0.0f };
- glm::vec3 camera_position { 1.5f * sinf(t), 0.0f, 1.5f * cos(t) };
+ glm::vec3 camera_position { 1.5f * sinf(t), 0.0f, 1.5f * cosf(t) };
static const vec3 camera_focus(0);
static const vec3 camera_up(0, 1, 0);
@@ -251,9 +249,9 @@ public:
static auto startUsecs = usecTimestampNow();
float seconds = getSeconds(startUsecs);
- seconds /= 4.0;
+ seconds /= 4.0f;
int shapeIndex = ((int)seconds) % 4;
- bool wire = seconds - floor(seconds) > 0.5f;
+ bool wire = seconds - (float)floor(seconds) > 0.5f;
batch.setModelTransform(Transform());
batch._glColor4f(0.8f, 0.25f, 0.25f, 1.0f);