Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 10:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed bug in debugOutline script

Browse source
This commit is contained in:
Olivier Prat 2017-10-20 12:04:20 +02:00
parent 732fe3b8db
commit 2d49cc1a75
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/developer/utilities/render/debugOutline.js
View file

@ -56,8 +56,10 @@ var end2 = {
var outlineGroupIndex = 0 var outlineGroupIndex = 0
var isSelectionAddEnabled = false var isSelectionAddEnabled = false
var isSelectionEnabled = false
var renderStates = [{name: "test", end: end}]; var renderStates = [{name: "test", end: end}];
var defaultRenderStates = [{name: "test", distance: 20.0, end: end2}]; var defaultRenderStates = [{name: "test", distance: 20.0, end: end2}];
var time = 0
var ray = LaserPointers.createLaserPointer({ var ray = LaserPointers.createLaserPointer({
joint: "Mouse", joint: "Mouse",
@ -83,13 +85,14 @@ function fromQml(message) {
outlineGroupIndex = parseInt(tokens[1]) outlineGroupIndex = parseInt(tokens[1])
print("Switching to outline group "+outlineGroupIndex) print("Switching to outline group "+outlineGroupIndex)
} else if (tokens[0]=="pick") { } else if (tokens[0]=="pick") {
var isPickingEnabled = tokens[1]=='true' isSelectionEnabled = tokens[1]=='true'
print("Ray picking set to "+isPickingEnabled.toString()) print("Ray picking set to "+isSelectionEnabled.toString())
if (isPickingEnabled) { if (isSelectionEnabled) {
LaserPointers.enableLaserPointer(ray) LaserPointers.enableLaserPointer(ray)
} else { } else {
LaserPointers.disableLaserPointer(ray) LaserPointers.disableLaserPointer(ray)
} }
time = 0
} else if (tokens[0]=="add") { } else if (tokens[0]=="add") {
isSelectionAddEnabled = tokens[1]=='true' isSelectionAddEnabled = tokens[1]=='true'
print("Add to selection set to "+isSelectionAddEnabled.toString()) print("Add to selection set to "+isSelectionAddEnabled.toString())
@ -110,7 +113,6 @@ var prevID = 0
var prevType = "" var prevType = ""
var selectedID = 0 var selectedID = 0
var selectedType = "" var selectedType = ""
var time = 0
function update(deltaTime) { function update(deltaTime) {
// you have to do this repeatedly because there's a bug but I'll fix it // you have to do this repeatedly because there's a bug but I'll fix it
@ -119,7 +121,7 @@ function update(deltaTime) {
var result = LaserPointers.getPrevRayPickResult(ray); var result = LaserPointers.getPrevRayPickResult(ray);
var selectionName = getSelectionName() var selectionName = getSelectionName()
if (result.type != RayPick.INTERSECTED_NONE) { if (isSelectionEnabled && result.type != RayPick.INTERSECTED_NONE) {
time += deltaTime time += deltaTime
if (result.objectID != prevID) { if (result.objectID != prevID) {
var typeName = "" var typeName = ""

2
scripts/developer/utilities/render/outlinePage/OutlinePage.qml
View file

@ -25,7 +25,7 @@ Item {
text: "Glow" text: "Glow"
checked: root.drawConfig["glow"] checked: root.drawConfig["glow"]
onCheckedChanged: { onCheckedChanged: {
paramWidgets.drawConfig["glow"] = checked; root.drawConfig["glow"] = checked;
} }
} }
ConfigSlider { ConfigSlider {