coderofsalvation
/
xrfragment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regressionbugfix: loop-mediafragment

This commit is contained in:
Leon van Kammen 2024-03-19 10:06:08 +00:00
parent 9c6047d836
commit e3b4583185
10 changed files with 23 additions and 87288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/xrfragment.aframe.all.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Tue Mar 19 09:13:06 AM UTC 2024
* v0.5.1 generated at Tue Mar 19 10:04:25 AM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -1096,7 +1096,7 @@ xrfragment_Parser.parse = function(key,value,store,index) {
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.METADATA | xrfragment_XRF.NAVIGATOR;
Frag_h["t"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.METADATA;
Frag_h["s"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW;
Frag_h["uv"] = xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["namespace"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
Frag_h["SPDX"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
@ -1219,7 +1219,7 @@ xrfragment_XRF.prototype = {
,validate: function(value) {
this.guessType(this,value);
var ok = true;
if(value.length == 0) {
if(value.length == 0 && !this.is(xrfragment_XRF.T_PREDEFINED_VIEW)) {
ok = false;
}
if(!this.is(xrfragment_XRF.T_FLOAT) && this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {

6
dist/xrfragment.aframe.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Tue Mar 19 09:13:06 AM UTC 2024
* v0.5.1 generated at Tue Mar 19 10:04:25 AM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -1094,7 +1094,7 @@ xrfragment_Parser.parse = function(key,value,store,index) {
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.METADATA | xrfragment_XRF.NAVIGATOR;
Frag_h["t"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.METADATA;
Frag_h["s"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW;
Frag_h["uv"] = xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["namespace"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
Frag_h["SPDX"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
@ -1217,7 +1217,7 @@ xrfragment_XRF.prototype = {
,validate: function(value) {
this.guessType(this,value);
var ok = true;
if(value.length == 0) {
if(value.length == 0 && !this.is(xrfragment_XRF.T_PREDEFINED_VIEW)) {
ok = false;
}
if(!this.is(xrfragment_XRF.T_FLOAT) && this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {

4
dist/xrfragment.js vendored
View File

@ -1089,7 +1089,7 @@ xrfragment_Parser.parse = function(key,value,store,index) {
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.METADATA | xrfragment_XRF.NAVIGATOR;
Frag_h["t"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.METADATA;
Frag_h["s"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW;
Frag_h["uv"] = xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["namespace"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
Frag_h["SPDX"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
@ -1212,7 +1212,7 @@ xrfragment_XRF.prototype = {
,validate: function(value) {
this.guessType(this,value);
var ok = true;
if(value.length == 0) {
if(value.length == 0 && !this.is(xrfragment_XRF.T_PREDEFINED_VIEW)) {
ok = false;
}
if(!this.is(xrfragment_XRF.T_FLOAT) && this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {

4
dist/xrfragment.lua vendored
View File

@ -2820,7 +2820,7 @@ __xrfragment_Parser.parse = function(key,value,store,index)
else
Frag_h.s = value1;
end;
local value1 = __xrfragment_XRF.PV_OVERRIDE;
local value1 = _hx_bit.bor(__xrfragment_XRF.PV_OVERRIDE,__xrfragment_XRF.T_PREDEFINED_VIEW);
if (value1 == nil) then
Frag_h.loop = __haxe_ds_StringMap.tnull;
else
@ -3094,7 +3094,7 @@ end
__xrfragment_XRF.prototype.validate = function(self,value)
self:guessType(self, value);
local ok = true;
if (__lua_lib_luautf8_Utf8.len(value) == 0) then
if ((__lua_lib_luautf8_Utf8.len(value) == 0) and not self:is(__xrfragment_XRF.T_PREDEFINED_VIEW)) then
ok = false;
end;
if ((not self:is(__xrfragment_XRF.T_FLOAT) and self:is(__xrfragment_XRF.T_VECTOR2)) and not (__lua_Boot.__instanceof(self.x, Float) and __lua_Boot.__instanceof(self.y, Float))) then

87271
dist/xrfragment.module.js vendored
View File

File diff suppressed because it is too large Load Diff

4
dist/xrfragment.py vendored
View File

@ -2261,7 +2261,7 @@ class xrfragment_Parser:
Frag.h["rot"] = ((((xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE) | xrfragment_XRF.T_VECTOR3) | xrfragment_XRF.METADATA) | xrfragment_XRF.NAVIGATOR)
Frag.h["t"] = ((((xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT) | xrfragment_XRF.T_VECTOR2) | xrfragment_XRF.NAVIGATOR) | xrfragment_XRF.METADATA)
Frag.h["s"] = (xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG)
Frag.h["loop"] = xrfragment_XRF.PV_OVERRIDE
Frag.h["loop"] = (xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW)
Frag.h["uv"] = (xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG)
Frag.h["namespace"] = (xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING)
Frag.h["SPDX"] = (xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING)
@ -2398,7 +2398,7 @@ class xrfragment_XRF:
def validate(self,value):
self.guessType(self,value)
ok = True
if (len(value) == 0):
if ((len(value) == 0) and (not self._hx_is(xrfragment_XRF.T_PREDEFINED_VIEW))):
ok = False
if (((not self._hx_is(xrfragment_XRF.T_FLOAT)) and self._hx_is(xrfragment_XRF.T_VECTOR2)) and (not ((Std.isOfType(self.x,Float) and Std.isOfType(self.y,Float))))):
ok = False

6
dist/xrfragment.three.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Tue Mar 19 09:13:06 AM UTC 2024
* v0.5.1 generated at Tue Mar 19 10:04:25 AM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -1094,7 +1094,7 @@ xrfragment_Parser.parse = function(key,value,store,index) {
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.METADATA | xrfragment_XRF.NAVIGATOR;
Frag_h["t"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.METADATA;
Frag_h["s"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW;
Frag_h["uv"] = xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["namespace"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
Frag_h["SPDX"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
@ -1217,7 +1217,7 @@ xrfragment_XRF.prototype = {
,validate: function(value) {
this.guessType(this,value);
var ok = true;
if(value.length == 0) {
if(value.length == 0 && !this.is(xrfragment_XRF.T_PREDEFINED_VIEW)) {
ok = false;
}
if(!this.is(xrfragment_XRF.T_FLOAT) && this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {

6
dist/xrfragment.three.module.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Tue Mar 19 09:13:06 AM UTC 2024
* v0.5.1 generated at Tue Mar 19 10:04:25 AM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -1094,7 +1094,7 @@ xrfragment_Parser.parse = function(key,value,store,index) {
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.METADATA | xrfragment_XRF.NAVIGATOR;
Frag_h["t"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_FLOAT | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.METADATA;
Frag_h["s"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE;
Frag_h["loop"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_PREDEFINED_VIEW;
Frag_h["uv"] = xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.T_MEDIAFRAG;
Frag_h["namespace"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
Frag_h["SPDX"] = xrfragment_XRF.IMMUTABLE | xrfragment_XRF.T_STRING;
@ -1217,7 +1217,7 @@ xrfragment_XRF.prototype = {
,validate: function(value) {
this.guessType(this,value);
var ok = true;
if(value.length == 0) {
if(value.length == 0 && !this.is(xrfragment_XRF.T_PREDEFINED_VIEW)) {
ok = false;
}
if(!this.is(xrfragment_XRF.T_FLOAT) && this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {

2
src/xrfragment/Parser.hx
View File

@ -27,7 +27,7 @@ class Parser {
// category: media fragments
Frag.set("t", XRF.PV_OVERRIDE | XRF.T_FLOAT | XRF.T_VECTOR2 | XRF.NAVIGATOR | XRF.METADATA);
Frag.set("s", XRF.PV_OVERRIDE | XRF.T_MEDIAFRAG );
Frag.set("loop", XRF.PV_OVERRIDE );
Frag.set("loop", XRF.PV_OVERRIDE | XRF.T_PREDEFINED_VIEW );
Frag.set("uv", XRF.T_VECTOR2 | XRF.T_MEDIAFRAG );
// category: author / metadata

2
src/xrfragment/XRF.hx
View File

@ -95,7 +95,7 @@ class XRF {
guessType(this, value); // 1. extract the type
// validate
var ok:Bool = true;
if( value.length == 0 ) ok = false;
if( value.length == 0 && !is(T_PREDEFINED_VIEW) ) ok = false;
if( !is(T_FLOAT) && is(T_VECTOR2) && !(Std.isOfType(x,Float) && Std.isOfType(y,Float)) ) ok = false;
if( !(is(T_VECTOR2) || is(T_STRING)) && is(T_VECTOR3) && !(Std.isOfType(x,Float) && Std.isOfType(y,Float) && Std.isOfType(z,Float)) ) ok = false;
return ok;