History

more code review using github compiler runs

Heather Anderson committed 5 years ago

Commit 227e8991 parent 16c2d7618 files · +100 −36Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 18 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+0−3
@@ -57,7 +57,6 @@ · 56 unmodified lines
57 57
58#include <Profile.h>58#include <Profile.h>
59 59
60#include "../../midi/src/Midi.h" // FIXME why won't a simpler include work?
61#include "MIDIEvent.h"60#include "MIDIEvent.h"
62 61
63#include "SettingHandle.h"62#include "SettingHandle.h"
@@ -675,8 +674,6 @@ void ScriptManager::init() { · 611 unmodified lines
675 scriptRegisterMetaType(scriptEngine, externalResourceBucketToScriptValue, externalResourceBucketFromScriptValue);674 scriptRegisterMetaType(scriptEngine, externalResourceBucketToScriptValue, externalResourceBucketFromScriptValue);
676 scriptEngine->registerEnum("Script.ExternalPaths", QMetaEnum::fromType<ExternalResource::Bucket>());675 scriptEngine->registerEnum("Script.ExternalPaths", QMetaEnum::fromType<ExternalResource::Bucket>());
677 676
678 scriptEngine->registerGlobalObject("Midi", DependencyManager::get<Midi>().data());
679
680 scriptEngine->registerGlobalObject("Quat", &_quatLibrary);677 scriptEngine->registerGlobalObject("Quat", &_quatLibrary);
681 scriptEngine->registerGlobalObject("Vec3", &_vec3Library);678 scriptEngine->registerGlobalObject("Vec3", &_vec3Library);
682 scriptEngine->registerGlobalObject("Mat4", &_mat4Library);679 scriptEngine->registerGlobalObject("Mat4", &_mat4Library);