Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts merging with huffman/baseball

Browse source
This commit is contained in:
Stephen Birarda 2015-11-02 14:18:39 -08:00 committed by Atlante45
parent 8cd41b9383
commit 57a68edaa3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/ScriptEngine.h
View file

@ -141,10 +141,10 @@ public:
// NOTE - this is used by the TypedArray implemetation. we need to review this for thread safety // NOTE - this is used by the TypedArray implemetation. we need to review this for thread safety
ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; } ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; }
public slots: public slots:
void callAnimationStateHandler(QScriptValue callback, AnimVariantMap parameters, QStringList names, bool useNames, AnimVariantResultHandler resultHandler); void callAnimationStateHandler(QScriptValue callback, AnimVariantMap parameters, QStringList names, bool useNames, AnimVariantResultHandler resultHandler);
signals: signals:
void scriptLoaded(const QString& scriptFilename); void scriptLoaded(const QString& scriptFilename);
void errorLoadingScript(const QString& scriptFilename); void errorLoadingScript(const QString& scriptFilename);
@ -184,7 +184,7 @@ private:
QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot); QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
void stopTimer(QTimer* timer); void stopTimer(QTimer* timer);
QString _fileNameString; QString _fileNameString;
Quat _quatLibrary; Quat _quatLibrary;
Vec3 _vec3Library; Vec3 _vec3Library;