Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 4 files). Show all
Unified · Split
| @@ -6,8 +6,6 @@ · 5 unmodified lines | |||
| 6 | // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. | 6 | // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. |
| 7 | // | 7 | // |
| 8 | 8 | ||
| 9 | #include <QFile> | ||
| 10 | #include <QTextStream> | ||
| 11 | #include <QtDebug> | 9 | #include <QtDebug> |
| 12 | 10 | ||
| 13 | #include <SharedUtil.h> | 11 | #include <SharedUtil.h> |
| @@ -40,14 +38,6 @@ void MetavoxelSystem::init() { · 26 unmodified lines | |||
| 40 | connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer))); | 38 | connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer))); |
| 41 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer))); | 39 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer))); |
| 42 | 40 | ||
| 43 | AttributeRegistry::getInstance()->configureScriptEngine(&_scriptEngine); | ||
| 44 | |||
| 45 | QFile scriptFile("resources/scripts/sphere.js"); | ||
| 46 | scriptFile.open(QIODevice::ReadOnly); | ||
| 47 | QScriptValue guideFunction = _scriptEngine.evaluate(QTextStream(&scriptFile).readAll()); | ||
| 48 | _data.setAttributeValue(MetavoxelPath(), AttributeValue(AttributeRegistry::getInstance()->getGuideAttribute(), | ||
| 49 | encodeInline(PolymorphicDataPointer(new ScriptedMetavoxelGuide(guideFunction))))); | ||
| 50 | |||
| 51 | _buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw); | 41 | _buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw); |
| 52 | _buffer.create(); | 42 | _buffer.create(); |
| 53 | } | 43 | } |