Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed implicit double to float casting and incorrect header author attribution

Browse source
This commit is contained in:
ericrius1 2015-08-10 10:57:53 -07:00
parent 4fbd6f6337
commit c299d77c92
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -75,12 +75,12 @@ void RenderablePolyLineEntityItem::updateGeometry() {
_verticesBuffer.reset(new gpu::Buffer()); _verticesBuffer.reset(new gpu::Buffer());
int vertexIndex = 0; int vertexIndex = 0;
vec2 uv; vec2 uv;
float tailStart = 0.0; float tailStart = 0.0f;
float tailEnd = 0.25; float tailEnd = 0.25f;
float tailLength = tailEnd - tailStart; float tailLength = tailEnd - tailStart;
float headStart = 0.76; float headStart = 0.76f;
float headEnd = 1.0; float headEnd = 1.0f;
float headLength = headEnd - headStart; float headLength = headEnd - headStart;
float uCoord, vCoord; float uCoord, vCoord;
@ -88,8 +88,8 @@ void RenderablePolyLineEntityItem::updateGeometry() {
int numHeadStrips = 10; int numHeadStrips = 10;
int startHeadIndex = _normals.size() - numHeadStrips; int startHeadIndex = _normals.size() - numHeadStrips;
for (int i = 0; i < _normals.size(); i++) { for (int i = 0; i < _normals.size(); i++) {
uCoord = 0.26; uCoord = 0.26f;
vCoord = 0; vCoord = 0.0f;
//tail //tail
if(i < numTailStrips) { if(i < numTailStrips) {
uCoord = float(i)/numTailStrips * tailLength + tailStart; uCoord = float(i)/numTailStrips * tailLength + tailStart;
@ -108,7 +108,7 @@ void RenderablePolyLineEntityItem::updateGeometry() {
_verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv); _verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv);
vertexIndex++; 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*)&_vertices.at(vertexIndex));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i)); _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
_verticesBuffer->append(sizeof(int), (gpu::Byte*)_color); _verticesBuffer->append(sizeof(int), (gpu::Byte*)_color);

4
libraries/entities-renderer/src/paintStroke.slf
View file

@ -5,8 +5,8 @@
// paintStroke.frag // paintStroke.frag
// fragment shader // fragment shader
// //
// Created by Andrzej Kapolka on 9/15/14. // Created by Eric Levin on 8/10/2015
// Copyright 2014 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

1
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -1,3 +1,4 @@
// //
// ParticleEffectEntityItem.cpp // ParticleEffectEntityItem.cpp
// libraries/entities/src // libraries/entities/src