Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 09:16:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix misspelling

Browse source
This commit is contained in:
AlessandroSigna 2015-12-16 10:02:47 -08:00
parent 8e7a2ac536
commit 08f7591787
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/ui/overlays/Image3DOverlay.cpp
View file

@ -27,7 +27,7 @@ QString const Image3DOverlay::TYPE = "image3d";
Image3DOverlay::Image3DOverlay() {
_isLoaded = false;
_emmisive = false;
_emissive = false;
}
Image3DOverlay::Image3DOverlay(const Image3DOverlay* image3DOverlay) :
@ -35,7 +35,7 @@ Image3DOverlay::Image3DOverlay(const Image3DOverlay* image3DOverlay) :
_url(image3DOverlay->_url),
_texture(image3DOverlay->_texture),
_fromImage(image3DOverlay->_fromImage),
_emmisive(image3DOverlay->_emmisive)
_emissive(image3DOverlay->_emissive)
{
}
@ -96,7 +96,7 @@ void Image3DOverlay::render(RenderArgs* args) {
batch->setModelTransform(transform);
batch->setResourceTexture(0, _texture->getGPUTexture());
DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(*batch, true, false, _emmisive, true);
DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(*batch, true, false, _emissive, true);
DependencyManager::get<GeometryCache>()->renderQuad(
*batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight,
glm::vec4(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha)
@ -147,9 +147,9 @@ void Image3DOverlay::setProperties(const QScriptValue &properties) {
}
}
QScriptValue emmisiveValue = properties.property("emmisive");
if (emmisiveValue.isValid()) {
_emmisive = emmisiveValue.toBool();
QScriptValue emissiveValue = properties.property("emissive");
if (emissiveValue.isValid()) {
_emissive = emissiveValue.toBool();
}
}
@ -163,8 +163,8 @@ QScriptValue Image3DOverlay::getProperty(const QString& property) {
if (property == "offsetPosition") {
return vec3toScriptValue(_scriptEngine, getOffsetPosition());
}
if (property == "emmisive") {
return _emmisive;
if (property == "emissive") {
return _emissive;
}
return Billboard3DOverlay::getProperty(property);

2
interface/src/ui/overlays/Image3DOverlay.h
View file

@ -46,7 +46,7 @@ public:
private:
QString _url;
NetworkTexturePointer _texture;
bool _emmisive;
bool _emissive;
QRect _fromImage; // where from in the image to sample
};

4
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -169,8 +169,8 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) {
gpu::PipelinePointer DeferredLightingEffect::bindSimpleProgram(gpu::Batch& batch, bool textured, bool culled,
bool emmisive, bool depthBias) {
SimpleProgramKey config{textured, culled, emmisive, depthBias};
bool emissive, bool depthBias) {
SimpleProgramKey config{textured, culled, emissive, depthBias};
gpu::PipelinePointer pipeline = getPipeline(config);
batch.setPipeline(pipeline);

2
libraries/render-utils/src/DeferredLightingEffect.h
View file

@ -38,7 +38,7 @@ public:
/// Sets up the state necessary to render static untextured geometry with the simple program.
gpu::PipelinePointer bindSimpleProgram(gpu::Batch& batch, bool textured = false, bool culled = true,
bool emmisive = false, bool depthBias = false);
bool emissive = false, bool depthBias = false);
void renderSolidSphereInstance(gpu::Batch& batch, const Transform& xfm, const glm::vec4& color);
void renderSolidSphereInstance(gpu::Batch& batch, const Transform& xfm, const glm::vec3& color) {