Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't need convertScriptValue(QScriptEngine* e, QDateTime v)

Browse source
This commit is contained in:
Seth Alves 2015-05-29 09:33:29 -07:00
parent 0cf9afd8ec
commit 9f4fff3588
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItemProperties.cpp
View file

@ -179,7 +179,6 @@ QString EntityItemProperties::getAnimationSettings() const {
void EntityItemProperties::setCreated(QDateTime v) { void EntityItemProperties::setCreated(QDateTime v) {
QDateTime utcV = v; QDateTime utcV = v;
// utcV.setTimeSpec(Qt::OffsetFromUTC);
_created = utcV.toMSecsSinceEpoch() * 1000; // usec per msec _created = utcV.toMSecsSinceEpoch() * 1000; // usec per msec
qDebug() << "EntityItemProperties::setCreated QDateTime" << v << _created; qDebug() << "EntityItemProperties::setCreated QDateTime" << v << _created;
} }
@ -384,7 +383,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
auto created = QDateTime::fromMSecsSinceEpoch(getCreated() / 1000.0f, Qt::UTC); // usec per msec auto created = QDateTime::fromMSecsSinceEpoch(getCreated() / 1000.0f, Qt::UTC); // usec per msec
created.setTimeSpec(Qt::OffsetFromUTC); created.setTimeSpec(Qt::OffsetFromUTC);
COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(created, created); COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(created, created.toString(Qt::ISODate));
COPY_PROPERTY_TO_QSCRIPTVALUE(script); COPY_PROPERTY_TO_QSCRIPTVALUE(script);
COPY_PROPERTY_TO_QSCRIPTVALUE(registrationPoint); COPY_PROPERTY_TO_QSCRIPTVALUE(registrationPoint);

10
libraries/entities/src/EntityItemPropertiesMacros.h
View file

@ -98,21 +98,11 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const xColor& v) { retu
inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::quat& v) { return quatToScriptValue(e, v); } inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::quat& v) { return quatToScriptValue(e, v); }
inline QScriptValue convertScriptValue(QScriptEngine* e, const QScriptValue& v) { return v; } inline QScriptValue convertScriptValue(QScriptEngine* e, const QScriptValue& v) { return v; }
inline QScriptValue convertScriptValue(QScriptEngine* e, QDateTime v) {
auto utcV = v;
utcV.setTimeSpec(Qt::OffsetFromUTC);
auto result = QScriptValue(utcV.toString(Qt::ISODate));
return result;
}
inline QScriptValue convertScriptValue(QScriptEngine* e, const QByteArray& v) { inline QScriptValue convertScriptValue(QScriptEngine* e, const QByteArray& v) {
QByteArray b64 = v.toBase64(); QByteArray b64 = v.toBase64();
return QScriptValue(QString(b64)); return QScriptValue(QString(b64));
} }
#define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \
if (!skipDefaults || defaultEntityProperties.get##G().get##P() != get##P()) { \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != get##P()) { \
QScriptValue groupProperties = properties.property(#g); \ QScriptValue groupProperties = properties.property(#g); \