Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some refactoring

Browse source
This commit is contained in:
Atlante45 2014-07-10 10:09:49 -07:00
parent b2b1701965
commit b4eb6a2eb7
2 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
libraries/script-engine/src/TypedArrays.cpp
View file

@ -19,6 +19,22 @@ TypedArray::TypedArray(ScriptEngine* scriptEngine, QString name) : ArrayBufferVi
_bytesPerElementName = engine()->toStringHandle(BYTES_PER_ELEMENT_PROPERTY_NAME.toLatin1()); _bytesPerElementName = engine()->toStringHandle(BYTES_PER_ELEMENT_PROPERTY_NAME.toLatin1());
_lengthName = engine()->toStringHandle(LENGTH_PROPERTY_NAME.toLatin1()); _lengthName = engine()->toStringHandle(LENGTH_PROPERTY_NAME.toLatin1());
_name = engine()->toStringHandle(name.toLatin1()); _name = engine()->toStringHandle(name.toLatin1());
QScriptValue global = engine()->globalObject();
// build prototype TODO
// _proto = engine->newQObject(new DataViewPrototype(this),
// QScriptEngine::QtOwnership,
// QScriptEngine::SkipMethodsInEnumeration |
// QScriptEngine::ExcludeSuperClassMethods |
// QScriptEngine::ExcludeSuperClassProperties);
_proto.setPrototype(global.property("Object").property("prototype"));
_ctor = engine()->newFunction(construct, _proto);
_ctor.setData(engine()->toScriptValue(this));
engine()->globalObject().setProperty(_name, _ctor);
} }
QScriptValue TypedArray::construct(QScriptContext *context, QScriptEngine *engine) { QScriptValue TypedArray::construct(QScriptContext *context, QScriptEngine *engine) {
@ -93,6 +109,18 @@ QScriptClass::QueryFlags TypedArray::queryProperty(const QScriptValue& object,
if (name == _bytesPerElementName || name == _lengthName) { if (name == _bytesPerElementName || name == _lengthName) {
return flags &= HandlesReadAccess; // Only keep read access flags return flags &= HandlesReadAccess; // Only keep read access flags
} }
quint32 byteOffset = object.data().property(_byteOffsetName).toInt32();
quint32 length = object.data().property(_lengthName).toInt32();
bool ok = false;
int pos = name.toArrayIndex(&ok);
// Check that name is a valid index and arrayBuffer exists
if (ok && pos >= 0 && pos < length) {
*id = byteOffset + pos * _bytesPerElement; // save pos to avoid recomputation
return HandlesReadAccess | HandlesWriteAccess; // Read/Write access
}
return ArrayBufferViewClass::queryProperty(object, name, flags, id); return ArrayBufferViewClass::queryProperty(object, name, flags, id);
} }
@ -121,23 +149,7 @@ QScriptValue TypedArray::prototype() const {
} }
Int8ArrayClass::Int8ArrayClass(ScriptEngine* scriptEngine) : TypedArray(scriptEngine, INT_8_ARRAY_CLASS_NAME) { Int8ArrayClass::Int8ArrayClass(ScriptEngine* scriptEngine) : TypedArray(scriptEngine, INT_8_ARRAY_CLASS_NAME) {
QScriptValue global = engine()->globalObject();
_bytesPerElement = sizeof(qint8); _bytesPerElement = sizeof(qint8);
// build prototype
// _proto = engine->newQObject(new DataViewPrototype(this),
// QScriptEngine::QtOwnership,
// QScriptEngine::SkipMethodsInEnumeration |
// QScriptEngine::ExcludeSuperClassMethods |
// QScriptEngine::ExcludeSuperClassProperties);
_proto.setPrototype(global.property("Object").property("prototype"));
_ctor = engine()->newFunction(construct, _proto);
_ctor.setData(engine()->toScriptValue(this));
engine()->globalObject().setProperty(name(), _ctor);
} }
QScriptValue Int8ArrayClass::newInstance(quint32 length) { QScriptValue Int8ArrayClass::newInstance(quint32 length) {
@ -180,23 +192,6 @@ QScriptValue Int8ArrayClass::newInstance(QScriptValue buffer, quint32 byteOffset
return engine()->newObject(this, data); return engine()->newObject(this, data);
} }
QScriptClass::QueryFlags Int8ArrayClass::queryProperty(const QScriptValue& object,
const QScriptString& name,
QueryFlags flags, uint* id) {
quint32 byteOffset = object.data().property(_byteOffsetName).toInt32();
quint32 length = object.data().property(_lengthName).toInt32();
bool ok = false;
int pos = name.toArrayIndex(&ok);
// Check that name is a valid index and arrayBuffer exists
if (ok && pos >= 0 && pos < length) {
*id = byteOffset + pos * _bytesPerElement; // save pos to avoid recomputation
return HandlesReadAccess | HandlesWriteAccess; // Read/Write access
}
return TypedArray::queryProperty(object, name, flags, id);
}
QScriptValue Int8ArrayClass::property(const QScriptValue &object, QScriptValue Int8ArrayClass::property(const QScriptValue &object,
const QScriptString &name, uint id) { const QScriptString &name, uint id) {
QByteArray* arrayBuffer = qscriptvalue_cast<QByteArray*>(object.data().property(_bufferName).data()); QByteArray* arrayBuffer = qscriptvalue_cast<QByteArray*>(object.data().property(_bufferName).data());
@ -218,13 +213,11 @@ QScriptValue Int8ArrayClass::property(const QScriptValue &object,
void Int8ArrayClass::setProperty(QScriptValue &object, void Int8ArrayClass::setProperty(QScriptValue &object,
const QScriptString &name, const QScriptString &name,
uint id, const QScriptValue &value) { uint id, const QScriptValue &value) {
qDebug() << "ID: " << id << ", Value: " << value.toInt32();
QByteArray *ba = qscriptvalue_cast<QByteArray*>(object.data().property(_bufferName).data()); QByteArray *ba = qscriptvalue_cast<QByteArray*>(object.data().property(_bufferName).data());
if (ba && value.isNumber()) { if (ba && value.isNumber()) {
QDataStream stream(ba, QIODevice::ReadWrite); QDataStream stream(ba, QIODevice::ReadWrite);
stream.skipRawData(id); stream.skipRawData(id);
qDebug() << "Adding: " << (qint8)value.toInt32();
stream << (qint8)value.toInt32(); stream << (qint8)value.toInt32();
} }
} }

3
libraries/script-engine/src/TypedArrays.h
View file

@ -59,9 +59,6 @@ public:
QScriptValue newInstance(QScriptValue array, bool isTypedArray); QScriptValue newInstance(QScriptValue array, bool isTypedArray);
QScriptValue newInstance(QScriptValue buffer, quint32 byteOffset, quint32 length); QScriptValue newInstance(QScriptValue buffer, quint32 byteOffset, quint32 length);
QueryFlags queryProperty(const QScriptValue& object,
const QScriptString& name,
QueryFlags flags, uint* id);
QScriptValue property(const QScriptValue &object, QScriptValue property(const QScriptValue &object,
const QScriptString &name, uint id); const QScriptString &name, uint id);
void setProperty(QScriptValue &object, void setProperty(QScriptValue &object,