Explicit downcasting to float.
parent
a0667c0422
commit
7962cd2e20
|
@ -748,11 +748,11 @@ void GLRenderer::blitQuad(bool flipVertically) {
|
||||||
glTexCoord2f(0.0f, flipVertically ? 1.0f : 0.0f);
|
glTexCoord2f(0.0f, flipVertically ? 1.0f : 0.0f);
|
||||||
glVertex3f(0.0f, 0.0f, zDepth);
|
glVertex3f(0.0f, 0.0f, zDepth);
|
||||||
glTexCoord2f(1.0f, flipVertically ? 1.0f : 0.0f);
|
glTexCoord2f(1.0f, flipVertically ? 1.0f : 0.0f);
|
||||||
glVertex3f(scrSize.x, 0.0f, zDepth);
|
glVertex3f((GLfloat) scrSize.x, 0.0f, zDepth);
|
||||||
glTexCoord2f(1.0f, flipVertically ? 0.0f : 1.0f);
|
glTexCoord2f(1.0f, flipVertically ? 0.0f : 1.0f);
|
||||||
glVertex3f(scrSize.x, scrSize.y, zDepth);
|
glVertex3f((GLfloat) scrSize.x, (GLfloat) scrSize.y, zDepth);
|
||||||
glTexCoord2f(0.0f, flipVertically ? 0.0f : 1.0f);
|
glTexCoord2f(0.0f, flipVertically ? 0.0f : 1.0f);
|
||||||
glVertex3f(0.0f, scrSize.y, zDepth);
|
glVertex3f(0.0f, (GLfloat) scrSize.y, zDepth);
|
||||||
glEnd();
|
glEnd();
|
||||||
glPopMatrix();
|
glPopMatrix();
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
|
@ -817,7 +817,7 @@ void GLRenderer::drawText(const Point2i &_pos,
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::setPointSize(Float size) {
|
void GLRenderer::setPointSize(Float size) {
|
||||||
glPointSize(size);
|
glPointSize((GLfloat) size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::drawPoint(const Point &p) {
|
void GLRenderer::drawPoint(const Point &p) {
|
||||||
|
@ -898,18 +898,18 @@ void GLRenderer::drawFilledRectangle(const Point2i &a, const Point2i &b) {
|
||||||
void GLRenderer::drawEllipse(const Point ¢er,
|
void GLRenderer::drawEllipse(const Point ¢er,
|
||||||
const Vector &axis1, const Vector &axis2) {
|
const Vector &axis1, const Vector &axis2) {
|
||||||
const int nSteps = 100;
|
const int nSteps = 100;
|
||||||
const float stepSize = 2*M_PI/nSteps;
|
const float stepSize = (float) (2*M_PI/nSteps);
|
||||||
glBegin(GL_LINE_LOOP);
|
glBegin(GL_LINE_LOOP);
|
||||||
for (int i=0; i<100; ++i) {
|
for (int i=0; i<100; ++i) {
|
||||||
Point p = center + axis1 * std::cos(i*stepSize)
|
Point p = center + axis1 * std::cos(i*stepSize)
|
||||||
+ axis2 * std::sin(i*stepSize);
|
+ axis2 * std::sin(i*stepSize);
|
||||||
glVertex3f(p.x, p.y, p.z);
|
glVertex3f((GLfloat) p.x, (GLfloat) p.y, (GLfloat) p.z);
|
||||||
}
|
}
|
||||||
glEnd();
|
glEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::drawAABB(const AABB &aabb) {
|
void GLRenderer::drawAABB(const AABB &aabb) {
|
||||||
#define V(a,b,c) glVertex3f(aabb.a.x, aabb.b.y, aabb.c.z)
|
#define V(a,b,c) glVertex3f((GLfloat) aabb.a.x, (GLfloat) aabb.b.y, (GLfloat) aabb.c.z)
|
||||||
glBegin(GL_LINE_LOOP); V(max,min,max); V(max,min,min); V(max,max,min); V(max,max,max); glEnd();
|
glBegin(GL_LINE_LOOP); V(max,min,max); V(max,min,min); V(max,max,min); V(max,max,max); glEnd();
|
||||||
glBegin(GL_LINE_LOOP); V(max,max,max); V(max,max,min); V(min,max,min); V(min,max,max); glEnd();
|
glBegin(GL_LINE_LOOP); V(max,max,max); V(max,max,min); V(min,max,min); V(min,max,max); glEnd();
|
||||||
glBegin(GL_LINE_LOOP); V(max,max,max); V(min,max,max); V(min,min,max); V(max,min,max); glEnd();
|
glBegin(GL_LINE_LOOP); V(max,max,max); V(min,max,max); V(min,min,max); V(max,min,max); glEnd();
|
||||||
|
@ -982,13 +982,13 @@ void GLRenderer::finish() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::setColor(const Color3 &col, Float alpha) {
|
void GLRenderer::setColor(const Color3 &col, Float alpha) {
|
||||||
glColor4f((GLfloat) col[0], (GLfloat) col[1], (GLfloat) col[2], alpha);
|
glColor4f((GLfloat) col[0], (GLfloat) col[1], (GLfloat) col[2], (GLfloat) alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::setColor(const Spectrum &spec, Float alpha) {
|
void GLRenderer::setColor(const Spectrum &spec, Float alpha) {
|
||||||
Float r, g, b;
|
Float r, g, b;
|
||||||
spec.toLinearRGB(r, g, b);
|
spec.toLinearRGB(r, g, b);
|
||||||
glColor4f((GLfloat) r, (GLfloat) g, (GLfloat) b, alpha);
|
glColor4f((GLfloat) r, (GLfloat) g, (GLfloat) b, (GLfloat) alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLRenderer::setClearDepth(Float depth) {
|
void GLRenderer::setClearDepth(Float depth) {
|
||||||
|
|
|
@ -195,7 +195,7 @@ void ShadowMapGenerator::render(Renderer *renderer, GPUTexture *shadowMap,
|
||||||
Log(EError, "Cannot render shadow map (the "
|
Log(EError, "Cannot render shadow map (the "
|
||||||
"graphics card has insufficient capabilities)");
|
"graphics card has insufficient capabilities)");
|
||||||
|
|
||||||
float invDepthRange = 1.0f / (maxDepth - minDepth);
|
float invDepthRange = (float) (1.0f / (maxDepth - minDepth));
|
||||||
shadowMap->activateTarget();
|
shadowMap->activateTarget();
|
||||||
renderer->setDepthTest(true);
|
renderer->setDepthTest(true);
|
||||||
prog->bind();
|
prog->bind();
|
||||||
|
|
|
@ -68,9 +68,9 @@ public:
|
||||||
half *bData = bBitmap->getFloat16Data();
|
half *bData = bBitmap->getFloat16Data();
|
||||||
half *outData = outBitmap->getFloat16Data();
|
half *outData = outBitmap->getFloat16Data();
|
||||||
for (size_t i=0; i<nEntries; ++i)
|
for (size_t i=0; i<nEntries; ++i)
|
||||||
*outData++ = (half) std::max((Float) 0,
|
*outData++ = (half) ((float) std::max((Float) 0,
|
||||||
weight1 * (Float) (*aData++) +
|
weight1 * (Float) (*aData++) +
|
||||||
weight2 * (Float) (*bData++));
|
weight2 * (Float) (*bData++)));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -300,7 +300,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
inline float3 operator*(Float v) const {
|
inline float3 operator*(Float v) const {
|
||||||
return float3(value[0]*v, value[1]*v, value[2]*v);
|
return float3((float) (value[0]*v), (float) (value[1]*v), (float) (value[2]*v));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline float3 operator+(const float3 &f2) const {
|
inline float3 operator+(const float3 &f2) const {
|
||||||
|
|
Loading…
Reference in New Issue