Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 12 files). Show all
Unified · Split
| @@ -630,7 +630,6 @@ ScriptValue stylusPointerPropertiesToScriptValue(ScriptEngine* engine, const Sty · 629 unmodified lines | |||
| 630 | return engine->newVariant(QVariant(in.properties)); | 630 | return engine->newVariant(QVariant(in.properties)); |
| 631 | } | 631 | } |
| 632 | 632 | ||
| 633 | //V8TODO: adapt render states to what parabola expects | ||
| 634 | bool stylusPointerPropertiesFromScriptValue(const ScriptValue& value, StylusPointerProperties& out) { | 633 | bool stylusPointerPropertiesFromScriptValue(const ScriptValue& value, StylusPointerProperties& out) { |
| 635 | // This copies properties from script value, but also converts entity properties of entities used in render states | 634 | // This copies properties from script value, but also converts entity properties of entities used in render states |
| 636 | // from JS objects into EntityItemProperties | 635 | // from JS objects into EntityItemProperties |
| @@ -670,7 +669,6 @@ bool stylusPointerPropertiesFromScriptValue(const ScriptValue& value, StylusPoin · 33 unmodified lines | |||
| 670 | stateMap.insert("endPropertyIndex", QVariant(out.entityProperties.length())); | 669 | stateMap.insert("endPropertyIndex", QVariant(out.entityProperties.length())); |
| 671 | out.entityProperties.append(endProperties); | 670 | out.entityProperties.append(endProperties); |
| 672 | } | 671 | } |
| 673 | // V8TODO: Check if path is a polyline and if values are valid | ||
| 674 | renderStates[i].setValue(stateMap); | 672 | renderStates[i].setValue(stateMap); |
| 675 | } | 673 | } |
| 676 | } | 674 | } |
| @@ -727,7 +725,6 @@ bool parabolaPointerPropertiesFromScriptValue(const ScriptValue& value, Parabola · 50 unmodified lines | |||
| 727 | out.entityProperties.append(endProperties); | 725 | out.entityProperties.append(endProperties); |
| 728 | qDebug() << "parabolaPointerPropertiesFromScriptValue : added end entity"; | 726 | qDebug() << "parabolaPointerPropertiesFromScriptValue : added end entity"; |
| 729 | } | 727 | } |
| 730 | // V8TODO: Check if path is a polyline and if values are valid | ||
| 731 | renderStates[i].setValue(stateMap); | 728 | renderStates[i].setValue(stateMap); |
| 732 | } | 729 | } |
| 733 | } | 730 | } |