History

Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities

ZappoMan committed 12 years ago

Commit 1eb472c2 parents 2baac96 12f8cfb41 files · +2724 −375Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+9−4
@@ -32,10 +32,13 @@ · 31 unmodified lines
3232 #include <VoxelDetail.h>
3333
3434 #include "AnimationObject.h"
35+#include "ArrayBufferViewClass.h"
36+#include "DataViewClass.h"
3537 #include "MenuItemProperties.h"
3638 #include "MIDIEvent.h"
3739 #include "LocalVoxels.h"
3840 #include "ScriptEngine.h"
41+#include "TypedArrays.h"
3942 #include "XMLHttpRequestClass.h"
4043
4144 VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
@@ -90,7 +93,8 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 48 unmodified lines
9093 _quatLibrary(),
9194 _vec3Library(),
9295 _uuidLibrary(),
93− _animationCache(this)
96+ _animationCache(this),
97+ _arrayBufferClass(new ArrayBufferClass(this))
9498 {
9599 }
96100
@@ -115,13 +119,14 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 18 unmodified lines
115119 _quatLibrary(),
116120 _vec3Library(),
117121 _uuidLibrary(),
118− _animationCache(this)
122+ _animationCache(this),
123+ _arrayBufferClass(new ArrayBufferClass(this))
119124 {
120125 QString scriptURLString = scriptURL.toString();
121126 _fileNameString = scriptURLString;
122127
123128 QUrl url(scriptURL);
124−
129+
125130 // if the scheme length is one or lower, maybe they typed in a file, let's try
126131 const int WINDOWS_DRIVE_LETTER_SIZE = 1;
127132 if (url.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {
@@ -210,7 +215,7 @@ void ScriptEngine::init() { · 82 unmodified lines
210215 if (_isInitialized) {
211216 return; // only initialize once
212217 }
213−
218+
214219 _isInitialized = true;
215220
216221 _voxelsScriptingInterface.init();