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

fixing the ui script and trying to get shadow

Browse source
This commit is contained in:
Sam Gateau 2018-08-08 09:22:31 -07:00
parent f286e3370b
commit 9295007d99
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/workload/GameWorkloadRenderer.cpp
View file

@ -97,7 +97,7 @@ namespace render {
} }
} }
GameWorkloadRenderItem::GameWorkloadRenderItem() : _key(render::ItemKey::Builder::opaqueShape().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1)) { GameWorkloadRenderItem::GameWorkloadRenderItem() : _key(render::ItemKey::Builder::opaqueShape().withShadowCaster().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1)) {
} }
render::ItemKey GameWorkloadRenderItem::getKey() const { render::ItemKey GameWorkloadRenderItem::getKey() const {

8
libraries/render-utils/src/WorkloadResource.slh
View file

@ -26,7 +26,7 @@ struct WorkloadProxy {
}; };
#if defined(GPU_GL410) #if defined(GPU_GL410)
uniform samplerBuffer workloadProxiesBuffer; layout(binding=0) uniform samplerBuffer workloadProxiesBuffer;
WorkloadProxy getWorkloadProxy(int i) { WorkloadProxy getWorkloadProxy(int i) {
int offset = 2 * i; int offset = 2 * i;
WorkloadProxy proxy; WorkloadProxy proxy;
@ -35,7 +35,7 @@ WorkloadProxy getWorkloadProxy(int i) {
return proxy; return proxy;
} }
#else #else
layout(std140) buffer workloadProxiesBuffer { layout(std140, binding=0) buffer workloadProxiesBuffer {
WorkloadProxy _proxies[]; WorkloadProxy _proxies[];
}; };
WorkloadProxy getWorkloadProxy(int i) { WorkloadProxy getWorkloadProxy(int i) {
@ -58,7 +58,7 @@ struct WorkloadView {
}; };
#if defined(GPU_GL410) #if defined(GPU_GL410)
uniform samplerBuffer workloadViewsBuffer; layout(binding=1) uniform samplerBuffer workloadViewsBuffer;
WorkloadView getWorkloadView(int i) { WorkloadView getWorkloadView(int i) {
int offset = 2 * i; int offset = 2 * i;
WorkloadView view; WorkloadView view;
@ -67,7 +67,7 @@ WorkloadView getWorkloadView(int i) {
return view; return view;
} }
#else #else
layout(std140) buffer workloadViewsBuffer { layout(std140, binding=1) buffer workloadViewsBuffer {
WorkloadView _views[]; WorkloadView _views[];
}; };
WorkloadView getWorkloadView(int i) { WorkloadView getWorkloadView(int i) {

7
scripts/developer/utilities/workload/workload.js
View file

@ -56,7 +56,7 @@
presentationMode: Desktop.PresentationMode.NATIVE, presentationMode: Desktop.PresentationMode.NATIVE,
size: {x: 400, y: 600} size: {x: 400, y: 600}
}); });
window.setPosition(200, 50); // window.setPosition(200, 50);
window.closed.connect(killWindow); window.closed.connect(killWindow);
window.fromQml.connect(fromQml); window.fromQml.connect(fromQml);
onScreen = true onScreen = true
@ -107,9 +107,7 @@
} }
} }
function fromQml(message) {
}
button.clicked.connect(onClicked); button.clicked.connect(onClicked);
tablet.screenChanged.connect(onScreenChanged); tablet.screenChanged.connect(onScreenChanged);
@ -127,6 +125,7 @@
Script.include("./test_physics_scene.js") Script.include("./test_physics_scene.js")
function fromQml(message) { function fromQml(message) {
print("fromQml: " + JSON.stringify(message))
switch (message.method) { switch (message.method) {
case "createScene": case "createScene":
createScene(); createScene();