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

fix float defines from CR feedback

Browse source
This commit is contained in:
ZappoMan 2014-10-03 09:43:46 -07:00
parent 23f584d9da
commit 515789927b
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/entities/RenderableBoxEntityItem.cpp
View file

@ -39,7 +39,7 @@ void RenderableBoxEntityItem::render(RenderArgs* args) {
glm::quat rotation = getRotation();
const bool useGlutCube = true;
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
if (useGlutCube) {
glColor4f(getColor()[RED_INDEX] / MAX_COLOR, getColor()[GREEN_INDEX] / MAX_COLOR,

2
interface/src/entities/RenderableSphereEntityItem.cpp
View file

@ -36,7 +36,7 @@ void RenderableSphereEntityItem::render(RenderArgs* args) {
glm::vec3 dimensions = getDimensions() * (float)TREE_SCALE;
glm::quat rotation = getRotation();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(getColor()[RED_INDEX] / MAX_COLOR, getColor()[GREEN_INDEX] / MAX_COLOR,
getColor()[BLUE_INDEX] / MAX_COLOR, getLocalRenderAlpha());

2
interface/src/ui/overlays/BillboardOverlay.cpp
View file

@ -73,7 +73,7 @@ void BillboardOverlay::render() {
float x = _fromImage.width() / (2.0f * maxSize);
float y = -_fromImage.height() / (2.0f * maxSize);
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
xColor color = getColor();
float alpha = getAlpha();
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);

2
interface/src/ui/overlays/Circle3DOverlay.cpp
View file

@ -41,7 +41,7 @@ void Circle3DOverlay::render() {
//const int slices = 15;
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);

2
interface/src/ui/overlays/Cube3DOverlay.cpp
View file

@ -39,7 +39,7 @@ void Cube3DOverlay::render() {
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
//glDisable(GL_LIGHTING);

2
interface/src/ui/overlays/ImageOverlay.cpp
View file

@ -65,7 +65,7 @@ void ImageOverlay::render() {
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, _textureID);
}
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
xColor color = getColor();
float alpha = getAlpha();
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);

2
interface/src/ui/overlays/Line3DOverlay.cpp
View file

@ -37,7 +37,7 @@ void Line3DOverlay::render() {
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
if (getIsDashedLine()) {

2
interface/src/ui/overlays/Rectangle3DOverlay.cpp
View file

@ -30,7 +30,7 @@ void Rectangle3DOverlay::render() {
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
glDisable(GL_LIGHTING);

2
interface/src/ui/overlays/Sphere3DOverlay.cpp
View file

@ -31,7 +31,7 @@ void Sphere3DOverlay::render() {
const int slices = 15;
float alpha = getAlpha();
xColor color = getColor();
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);

2
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -54,7 +54,7 @@ void TextOverlay::render() {
}
const float MAX_COLOR = 255;
const float MAX_COLOR = 255.0f;
xColor backgroundColor = getBackgroundColor();
float alpha = getAlpha();
glColor4f(backgroundColor.red / MAX_COLOR, backgroundColor.green / MAX_COLOR, backgroundColor.blue / MAX_COLOR, alpha);