Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 20:35:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8251 from samcake/skin

Browse source 
Fix the mac build and lightingMOdel checkbox initial value
This commit is contained in:
samcake 2016-07-14 16:47:38 -07:00 committed by GitHub
commit 2d61880bc9
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -612,7 +612,7 @@ void RenderDeferredLocals::run(const render::SceneContextPointer& sceneContext,
for (auto lightID : deferredLightingEffect->_spotLights) { for (auto lightID : deferredLightingEffect->_spotLights) {
auto light = deferredLightingEffect->_allocatedLights[lightID]; auto light = deferredLightingEffect->_allocatedLights[lightID];
// IN DEBUG: // IN DEBUG:
light->setShowContour(true); // light->setShowContour(true);
batch.setUniformBuffer(deferredLightingEffect->_spotLightLocations->lightBufferUnit, light->getSchemaBuffer()); batch.setUniformBuffer(deferredLightingEffect->_spotLightLocations->lightBufferUnit, light->getSchemaBuffer());
auto eyeLightPos = eyePoint - light->getPosition(); auto eyeLightPos = eyePoint - light->getPosition();

3
libraries/render-utils/src/model_translucent_unlit.slf
View file

@ -16,6 +16,7 @@
<@include MaterialTextures.slh@> <@include MaterialTextures.slh@>
<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$> <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
<@include LightingModel.slh@>
in vec2 _texCoord0; in vec2 _texCoord0;
in vec3 _color; in vec3 _color;
@ -35,5 +36,5 @@ void main(void) {
<$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>; <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
albedo *= _color; albedo *= _color;
_fragColor = vec4(albedo, opacity); _fragColor = vec4(albedo * isUnlitEnabled(), opacity);
} }

2
libraries/render/src/render/Task.h
View file

@ -520,7 +520,7 @@ public:
Model(const Varying& input, A&&... args) : Model(const Varying& input, A&&... args) :
Concept(nullptr), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) { Concept(nullptr), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) {
// Recreate the Config to use the templated type // Recreate the Config to use the templated type
_data.createConfiguration<C>(); _data.template createConfiguration<C>();
_config = _data.getConfiguration(); _config = _data.getConfiguration();
applyConfiguration(); applyConfiguration();
} }

10
scripts/developer/utilities/render/deferredLighting.qml
View file

@ -28,7 +28,7 @@ Column {
] ]
CheckBox { CheckBox {
text: modelData.split(":")[0] text: modelData.split(":")[0]
checked: Render.getConfig(modelData.split(":")[1]) checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
} }
} }
@ -46,7 +46,7 @@ Column {
] ]
CheckBox { CheckBox {
text: modelData.split(":")[0] text: modelData.split(":")[0]
checked: Render.getConfig(modelData.split(":")[1]) checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
} }
} }
@ -63,7 +63,7 @@ Column {
] ]
CheckBox { CheckBox {
text: modelData.split(":")[0] text: modelData.split(":")[0]
checked: Render.getConfig(modelData.split(":")[1]) checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
} }
} }
@ -76,7 +76,7 @@ Column {
] ]
CheckBox { CheckBox {
text: modelData.split(":")[0] text: modelData.split(":")[0]
checked: Render.getConfig(modelData.split(":")[1]) checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
} }
} }
@ -104,6 +104,7 @@ Column {
} }
ComboBox { ComboBox {
anchors.right: root.right
currentIndex: 1 currentIndex: 1
model: ListModel { model: ListModel {
id: cbItems id: cbItems
@ -133,6 +134,7 @@ Column {
} }
ComboBox { ComboBox {
anchors.right: root.right
currentIndex: 0 currentIndex: 0
model: ListModel { model: ListModel {
id: cbItemsFramebuffer id: cbItemsFramebuffer