From c299d77c9207eff67cd448611b13d96af537551e Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 10 Aug 2015 10:57:53 -0700 Subject: [PATCH] fixed implicit double to float casting and incorrect header author attribution --- .../src/RenderablePolyLineEntityItem.cpp | 14 +++++++------- libraries/entities-renderer/src/paintStroke.slf | 4 ++-- .../entities/src/ParticleEffectEntityItem.cpp | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index 39938b4708..0d88f128aa 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -75,12 +75,12 @@ void RenderablePolyLineEntityItem::updateGeometry() { _verticesBuffer.reset(new gpu::Buffer()); int vertexIndex = 0; vec2 uv; - float tailStart = 0.0; - float tailEnd = 0.25; + float tailStart = 0.0f; + float tailEnd = 0.25f; float tailLength = tailEnd - tailStart; - float headStart = 0.76; - float headEnd = 1.0; + float headStart = 0.76f; + float headEnd = 1.0f; float headLength = headEnd - headStart; float uCoord, vCoord; @@ -88,8 +88,8 @@ void RenderablePolyLineEntityItem::updateGeometry() { int numHeadStrips = 10; int startHeadIndex = _normals.size() - numHeadStrips; for (int i = 0; i < _normals.size(); i++) { - uCoord = 0.26; - vCoord = 0; + uCoord = 0.26f; + vCoord = 0.0f; //tail if(i < numTailStrips) { uCoord = float(i)/numTailStrips * tailLength + tailStart; @@ -108,7 +108,7 @@ void RenderablePolyLineEntityItem::updateGeometry() { _verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv); vertexIndex++; - uv.y = 1.0; + uv.y = 1.0f; _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex)); _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i)); _verticesBuffer->append(sizeof(int), (gpu::Byte*)_color); diff --git a/libraries/entities-renderer/src/paintStroke.slf b/libraries/entities-renderer/src/paintStroke.slf index 70ddb41b4c..4e2bc8d097 100644 --- a/libraries/entities-renderer/src/paintStroke.slf +++ b/libraries/entities-renderer/src/paintStroke.slf @@ -5,8 +5,8 @@ // paintStroke.frag // fragment shader // -// Created by Andrzej Kapolka on 9/15/14. -// Copyright 2014 High Fidelity, Inc. +// Created by Eric Levin on 8/10/2015 +// 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 diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp index dc5bbb85ed..349e0c4d46 100644 --- a/libraries/entities/src/ParticleEffectEntityItem.cpp +++ b/libraries/entities/src/ParticleEffectEntityItem.cpp @@ -1,3 +1,4 @@ + // // ParticleEffectEntityItem.cpp // libraries/entities/src