Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed location JS API

Browse source
This commit is contained in:
ksuprynowicz 2023-01-22 00:44:23 +01:00
parent 4f4c8931a9
commit cb4dc4c7e8
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -7506,9 +7506,8 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage
scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
LocationScriptingInterface::locationSetter, "Window"); LocationScriptingInterface::locationSetter, "Window");
// register `location` on the global object. // register `location` on the global object.
//V8TODO causes a crash scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
//scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, LocationScriptingInterface::locationSetter);
// LocationScriptingInterface::locationSetter);
scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor); scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML) #if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)

4
libraries/script-engine/src/v8/ScriptEngineV8.cpp
View file

@ -727,8 +727,8 @@ void ScriptEngineV8::registerGetterSetter(const QString& name, ScriptEngine::Fun
ScriptValue setterFunction = newFunction(setter, 1); ScriptValue setterFunction = newFunction(setter, 1);
ScriptValue getterFunction = newFunction(getter); ScriptValue getterFunction = newFunction(getter);
V8ScriptValue unwrappedGetter = ScriptValueV8Wrapper::fullUnwrap(this, setterFunction); V8ScriptValue unwrappedGetter = ScriptValueV8Wrapper::fullUnwrap(this, getterFunction);
V8ScriptValue unwrappedSetter = ScriptValueV8Wrapper::fullUnwrap(this, getterFunction); V8ScriptValue unwrappedSetter = ScriptValueV8Wrapper::fullUnwrap(this, setterFunction);
v8::PropertyDescriptor propertyDescriptor(unwrappedGetter.get(), unwrappedSetter.get()); v8::PropertyDescriptor propertyDescriptor(unwrappedGetter.get(), unwrappedSetter.get());
//V8TODO: Getters/setters are probably done in a different way in V8. Maybe object template is needed? //V8TODO: Getters/setters are probably done in a different way in V8. Maybe object template is needed?

6
libraries/shared/src/SettingHelpers.cpp
View file

@ -133,11 +133,12 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) {
} }
switch (variantType) { switch (variantType) {
case QVariant::Hash: { // V8TODO: why was this here? It seems that it supported
/*case QVariant::Hash: {
qCritical() << "Unsupported variant type" << variant.typeName() << ";" << key << variant; qCritical() << "Unsupported variant type" << variant.typeName() << ";" << key << variant;
Q_ASSERT(false); Q_ASSERT(false);
break; break;
} }*/
case QVariant::Invalid: case QVariant::Invalid:
object.insert(key, QJsonValue()); object.insert(key, QJsonValue());
@ -149,6 +150,7 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) {
case QVariant::Bool: case QVariant::Bool:
case QVariant::Double: case QVariant::Double:
case QVariant::Map: case QVariant::Map:
case QVariant::Hash:
case QVariant::List: case QVariant::List:
object.insert(key, QJsonValue::fromVariant(variant)); object.insert(key, QJsonValue::fromVariant(variant));
break; break;

1
scripts/system/places/places.html
View file

@ -264,6 +264,7 @@
} }
document.getElementById("listInfo").innerHTML = metaverseCounter + metaversePageInfo + " of " + metaverseList.length + "."; document.getElementById("listInfo").innerHTML = metaverseCounter + metaversePageInfo + " of " + metaverseList.length + ".";
} else { } else {
console.log(JSON.stringify(placeList));
var placeRecords = placeList.slice(); var placeRecords = placeList.slice();
if (currentListFormat === "DOMAINS") { if (currentListFormat === "DOMAINS") {

12
scripts/system/places/places.js
View file

@ -504,13 +504,13 @@
} }
//####### seed random library ################ //####### seed random library ################
Math.seed = 75; var seed = 75;
Math.seededRandom = function(max, min) { var seededRandom = function(max, min) {
max = max || 1; max = max || 1;
min = min || 0; min = min || 0;
Math.seed = (Math.seed * 9301 + 49297) % 233280; seed = (seed * 9301 + 49297) % 233280;
var rnd = Math.seed / 233280; var rnd = seed / 233280;
return min + rnd * (max - min); return min + rnd * (max - min);
} }
@ -527,8 +527,8 @@
var d = new Date(); var d = new Date();
var n = d.getTime(); var n = d.getTime();
var currentSeed = Math.floor(n / PERSISTENCE_ORDERING_CYCLE); var currentSeed = Math.floor(n / PERSISTENCE_ORDERING_CYCLE);
Math.seed = score * currentSeed; seed = score * currentSeed;
return zeroPad(Math.floor(Math.seededRandom() * 100000),5); return zeroPad(Math.floor(seededRandom() * 100000),5);
} }
//####### END of seed random library ################ //####### END of seed random library ################