added aframe example
This commit is contained in:
parent
35da2df17e
commit
af6a694cc3
14 changed files with 1877 additions and 279 deletions
820
dist/xrfragment.aframe.js
vendored
Normal file
820
dist/xrfragment.aframe.js
vendored
Normal file
|
|
@ -0,0 +1,820 @@
|
|||
var $hx_exports = typeof exports != "undefined" ? exports : typeof window != "undefined" ? window : typeof self != "undefined" ? self : this;
|
||||
(function ($global) { "use strict";
|
||||
$hx_exports["xrfragment"] = $hx_exports["xrfragment"] || {};
|
||||
var EReg = function(r,opt) {
|
||||
this.r = new RegExp(r,opt.split("u").join(""));
|
||||
};
|
||||
EReg.__name__ = true;
|
||||
EReg.prototype = {
|
||||
match: function(s) {
|
||||
if(this.r.global) {
|
||||
this.r.lastIndex = 0;
|
||||
}
|
||||
this.r.m = this.r.exec(s);
|
||||
this.r.s = s;
|
||||
return this.r.m != null;
|
||||
}
|
||||
,split: function(s) {
|
||||
var d = "#__delim__#";
|
||||
return s.replace(this.r,d).split(d);
|
||||
}
|
||||
};
|
||||
var HxOverrides = function() { };
|
||||
HxOverrides.__name__ = true;
|
||||
HxOverrides.cca = function(s,index) {
|
||||
var x = s.charCodeAt(index);
|
||||
if(x != x) {
|
||||
return undefined;
|
||||
}
|
||||
return x;
|
||||
};
|
||||
HxOverrides.substr = function(s,pos,len) {
|
||||
if(len == null) {
|
||||
len = s.length;
|
||||
} else if(len < 0) {
|
||||
if(pos == 0) {
|
||||
len = s.length + len;
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
return s.substr(pos,len);
|
||||
};
|
||||
HxOverrides.now = function() {
|
||||
return Date.now();
|
||||
};
|
||||
Math.__name__ = true;
|
||||
var Reflect = function() { };
|
||||
Reflect.__name__ = true;
|
||||
Reflect.field = function(o,field) {
|
||||
try {
|
||||
return o[field];
|
||||
} catch( _g ) {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
Reflect.fields = function(o) {
|
||||
var a = [];
|
||||
if(o != null) {
|
||||
var hasOwnProperty = Object.prototype.hasOwnProperty;
|
||||
for( var f in o ) {
|
||||
if(f != "__id__" && f != "hx__closures__" && hasOwnProperty.call(o,f)) {
|
||||
a.push(f);
|
||||
}
|
||||
}
|
||||
}
|
||||
return a;
|
||||
};
|
||||
Reflect.deleteField = function(o,field) {
|
||||
if(!Object.prototype.hasOwnProperty.call(o,field)) {
|
||||
return false;
|
||||
}
|
||||
delete(o[field]);
|
||||
return true;
|
||||
};
|
||||
var Std = function() { };
|
||||
Std.__name__ = true;
|
||||
Std.string = function(s) {
|
||||
return js_Boot.__string_rec(s,"");
|
||||
};
|
||||
Std.parseInt = function(x) {
|
||||
if(x != null) {
|
||||
var _g = 0;
|
||||
var _g1 = x.length;
|
||||
while(_g < _g1) {
|
||||
var i = _g++;
|
||||
var c = x.charCodeAt(i);
|
||||
if(c <= 8 || c >= 14 && c != 32 && c != 45) {
|
||||
var nc = x.charCodeAt(i + 1);
|
||||
var v = parseInt(x,nc == 120 || nc == 88 ? 16 : 10);
|
||||
if(isNaN(v)) {
|
||||
return null;
|
||||
} else {
|
||||
return v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
var StringTools = function() { };
|
||||
StringTools.__name__ = true;
|
||||
StringTools.isSpace = function(s,pos) {
|
||||
var c = HxOverrides.cca(s,pos);
|
||||
if(!(c > 8 && c < 14)) {
|
||||
return c == 32;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
StringTools.ltrim = function(s) {
|
||||
var l = s.length;
|
||||
var r = 0;
|
||||
while(r < l && StringTools.isSpace(s,r)) ++r;
|
||||
if(r > 0) {
|
||||
return HxOverrides.substr(s,r,l - r);
|
||||
} else {
|
||||
return s;
|
||||
}
|
||||
};
|
||||
StringTools.rtrim = function(s) {
|
||||
var l = s.length;
|
||||
var r = 0;
|
||||
while(r < l && StringTools.isSpace(s,l - r - 1)) ++r;
|
||||
if(r > 0) {
|
||||
return HxOverrides.substr(s,0,l - r);
|
||||
} else {
|
||||
return s;
|
||||
}
|
||||
};
|
||||
StringTools.trim = function(s) {
|
||||
return StringTools.ltrim(StringTools.rtrim(s));
|
||||
};
|
||||
StringTools.replace = function(s,sub,by) {
|
||||
return s.split(sub).join(by);
|
||||
};
|
||||
var haxe_iterators_ArrayIterator = function(array) {
|
||||
this.current = 0;
|
||||
this.array = array;
|
||||
};
|
||||
haxe_iterators_ArrayIterator.__name__ = true;
|
||||
haxe_iterators_ArrayIterator.prototype = {
|
||||
hasNext: function() {
|
||||
return this.current < this.array.length;
|
||||
}
|
||||
,next: function() {
|
||||
return this.array[this.current++];
|
||||
}
|
||||
};
|
||||
var js_Boot = function() { };
|
||||
js_Boot.__name__ = true;
|
||||
js_Boot.__string_rec = function(o,s) {
|
||||
if(o == null) {
|
||||
return "null";
|
||||
}
|
||||
if(s.length >= 5) {
|
||||
return "<...>";
|
||||
}
|
||||
var t = typeof(o);
|
||||
if(t == "function" && (o.__name__ || o.__ename__)) {
|
||||
t = "object";
|
||||
}
|
||||
switch(t) {
|
||||
case "function":
|
||||
return "<function>";
|
||||
case "object":
|
||||
if(((o) instanceof Array)) {
|
||||
var str = "[";
|
||||
s += "\t";
|
||||
var _g = 0;
|
||||
var _g1 = o.length;
|
||||
while(_g < _g1) {
|
||||
var i = _g++;
|
||||
str += (i > 0 ? "," : "") + js_Boot.__string_rec(o[i],s);
|
||||
}
|
||||
str += "]";
|
||||
return str;
|
||||
}
|
||||
var tostr;
|
||||
try {
|
||||
tostr = o.toString;
|
||||
} catch( _g ) {
|
||||
return "???";
|
||||
}
|
||||
if(tostr != null && tostr != Object.toString && typeof(tostr) == "function") {
|
||||
var s2 = o.toString();
|
||||
if(s2 != "[object Object]") {
|
||||
return s2;
|
||||
}
|
||||
}
|
||||
var str = "{\n";
|
||||
s += "\t";
|
||||
var hasp = o.hasOwnProperty != null;
|
||||
var k = null;
|
||||
for( k in o ) {
|
||||
if(hasp && !o.hasOwnProperty(k)) {
|
||||
continue;
|
||||
}
|
||||
if(k == "prototype" || k == "__class__" || k == "__super__" || k == "__interfaces__" || k == "__properties__") {
|
||||
continue;
|
||||
}
|
||||
if(str.length != 2) {
|
||||
str += ", \n";
|
||||
}
|
||||
str += s + k + " : " + js_Boot.__string_rec(o[k],s);
|
||||
}
|
||||
s = s.substring(1);
|
||||
str += "\n" + s + "}";
|
||||
return str;
|
||||
case "string":
|
||||
return o;
|
||||
default:
|
||||
return String(o);
|
||||
}
|
||||
};
|
||||
var xrfragment_Parser = $hx_exports["xrfragment"]["Parser"] = function() { };
|
||||
xrfragment_Parser.__name__ = true;
|
||||
xrfragment_Parser.parse = function(key,value,resultMap) {
|
||||
var Frag_h = Object.create(null);
|
||||
Frag_h["prio"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_INT;
|
||||
Frag_h["#"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_PREDEFINED_VIEW;
|
||||
Frag_h["class"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_STRING;
|
||||
Frag_h["src"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_URL;
|
||||
Frag_h["pos"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.T_STRING_OBJ | xrfragment_XRF.EMBEDDED | xrfragment_XRF.NAVIGATOR;
|
||||
Frag_h["href"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_URL | xrfragment_XRF.T_PREDEFINED_VIEW;
|
||||
Frag_h["q"] = xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_STRING | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["scale"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["rot"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.EMBEDDED | xrfragment_XRF.NAVIGATOR;
|
||||
Frag_h["translate"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["visible"] = xrfragment_XRF.QUERY_OPERATOR | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_INT | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["env"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_STRING | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["t"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.ROUNDROBIN | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["gravity"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["physics"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR3 | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["fov"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_INT | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["clip"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_VECTOR2 | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["fog"] = xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_STRING | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.EMBEDDED;
|
||||
Frag_h["namespace"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_STRING;
|
||||
Frag_h["SPDX"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_STRING;
|
||||
Frag_h["unit"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_STRING;
|
||||
Frag_h["description"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_STRING;
|
||||
Frag_h["session"] = xrfragment_XRF.ASSET | xrfragment_XRF.T_URL | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.NAVIGATOR | xrfragment_XRF.EMBEDDED | xrfragment_XRF.PROMPT;
|
||||
if(value.length == 0 && !Object.prototype.hasOwnProperty.call(Frag_h,key)) {
|
||||
resultMap[key] = new xrfragment_XRF(key,xrfragment_XRF.PV_EXECUTE | xrfragment_XRF.NAVIGATOR);
|
||||
return true;
|
||||
}
|
||||
if(key.split(".").length > 1 && value.split(".").length > 1) {
|
||||
resultMap[key] = new xrfragment_XRF(key,xrfragment_XRF.ASSET | xrfragment_XRF.PV_OVERRIDE | xrfragment_XRF.T_STRING | xrfragment_XRF.PROP_BIND);
|
||||
return true;
|
||||
}
|
||||
if(Object.prototype.hasOwnProperty.call(Frag_h,key)) {
|
||||
var v = new xrfragment_XRF(key,Frag_h[key]);
|
||||
if(!v.validate(value)) {
|
||||
console.log("src/xrfragment/Parser.hx:75:","⚠ fragment '" + key + "' has incompatible value (" + value + ")");
|
||||
return false;
|
||||
}
|
||||
if(xrfragment_Parser.debug) {
|
||||
console.log("src/xrfragment/Parser.hx:78:","✔ " + key + ": " + v.string);
|
||||
}
|
||||
resultMap[key] = v;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
var xrfragment_Query = $hx_exports["xrfragment"]["Query"] = function(str) {
|
||||
this.isNumber = new EReg("^[0-9\\.]+$","");
|
||||
this.isClass = new EReg("^[-]?class$","");
|
||||
this.isExclude = new EReg("^-","");
|
||||
this.isProp = new EReg("^.*:[><=!]?","");
|
||||
this.q = { };
|
||||
this.str = "";
|
||||
if(str != null) {
|
||||
this.parse(str);
|
||||
}
|
||||
};
|
||||
xrfragment_Query.__name__ = true;
|
||||
xrfragment_Query.prototype = {
|
||||
toObject: function() {
|
||||
return this.q;
|
||||
}
|
||||
,expandAliases: function(token) {
|
||||
var classAlias = new EReg("^(-)?\\.","");
|
||||
if(classAlias.match(token)) {
|
||||
return StringTools.replace(token,".","class:");
|
||||
} else {
|
||||
return token;
|
||||
}
|
||||
}
|
||||
,get: function() {
|
||||
return this.q;
|
||||
}
|
||||
,parse: function(str,recurse) {
|
||||
if(recurse == null) {
|
||||
recurse = false;
|
||||
}
|
||||
var _gthis = this;
|
||||
var token = str.split(" ");
|
||||
var q = { };
|
||||
var process = function(str,prefix) {
|
||||
if(prefix == null) {
|
||||
prefix = "";
|
||||
}
|
||||
str = StringTools.trim(str);
|
||||
var k = str.split(":")[0];
|
||||
var v = str.split(":")[1];
|
||||
var filter = { };
|
||||
if(q[prefix + k]) {
|
||||
filter = q[prefix + k];
|
||||
}
|
||||
filter["rules"] = filter["rules"] != null ? filter["rules"] : [];
|
||||
if(_gthis.isProp.match(str)) {
|
||||
var oper = "";
|
||||
if(str.indexOf("*") != -1) {
|
||||
oper = "*";
|
||||
}
|
||||
if(str.indexOf(">") != -1) {
|
||||
oper = ">";
|
||||
}
|
||||
if(str.indexOf("<") != -1) {
|
||||
oper = "<";
|
||||
}
|
||||
if(str.indexOf(">=") != -1) {
|
||||
oper = ">=";
|
||||
}
|
||||
if(str.indexOf("<=") != -1) {
|
||||
oper = "<=";
|
||||
}
|
||||
if(_gthis.isExclude.match(k)) {
|
||||
oper = "!=";
|
||||
k = HxOverrides.substr(k,1,null);
|
||||
} else {
|
||||
v = HxOverrides.substr(v,oper.length,null);
|
||||
}
|
||||
if(oper.length == 0) {
|
||||
oper = "=";
|
||||
}
|
||||
if(_gthis.isClass.match(k)) {
|
||||
filter[prefix + k] = oper != "!=";
|
||||
q[v] = filter;
|
||||
} else {
|
||||
var rule = { };
|
||||
if(_gthis.isNumber.match(v)) {
|
||||
rule[oper] = parseFloat(v);
|
||||
} else {
|
||||
rule[oper] = v;
|
||||
}
|
||||
filter["rules"].push(rule);
|
||||
q[k] = filter;
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
filter["id"] = _gthis.isExclude.match(str) ? false : true;
|
||||
var key = _gthis.isExclude.match(str) ? HxOverrides.substr(str,1,null) : str;
|
||||
q[key] = filter;
|
||||
}
|
||||
};
|
||||
var _g = 0;
|
||||
var _g1 = token.length;
|
||||
while(_g < _g1) {
|
||||
var i = _g++;
|
||||
process(this.expandAliases(token[i]));
|
||||
}
|
||||
return this.q = q;
|
||||
}
|
||||
,test: function(obj) {
|
||||
var qualify = false;
|
||||
var _g = 0;
|
||||
var _g1 = Reflect.fields(obj);
|
||||
while(_g < _g1.length) {
|
||||
var k = _g1[_g];
|
||||
++_g;
|
||||
var v = Std.string(Reflect.field(obj,k));
|
||||
if(this.testProperty(k,v)) {
|
||||
qualify = true;
|
||||
}
|
||||
}
|
||||
var _g = 0;
|
||||
var _g1 = Reflect.fields(obj);
|
||||
while(_g < _g1.length) {
|
||||
var k = _g1[_g];
|
||||
++_g;
|
||||
var v = Std.string(Reflect.field(obj,k));
|
||||
if(this.testProperty(k,v,true)) {
|
||||
qualify = false;
|
||||
}
|
||||
}
|
||||
return qualify;
|
||||
}
|
||||
,testProperty: function(property,value,exclude) {
|
||||
var conds = 0;
|
||||
var fails = 0;
|
||||
var qualify = 0;
|
||||
var testprop = function(expr) {
|
||||
conds += 1;
|
||||
fails += expr ? 0 : 1;
|
||||
return expr;
|
||||
};
|
||||
if(this.q[value] != null) {
|
||||
var v = this.q[value];
|
||||
if(v[property] != null) {
|
||||
return v[property];
|
||||
}
|
||||
}
|
||||
var _g = 0;
|
||||
var _g1 = Reflect.fields(this.q);
|
||||
while(_g < _g1.length) {
|
||||
var k = _g1[_g];
|
||||
++_g;
|
||||
var filter = Reflect.field(this.q,k);
|
||||
if(filter.rules == null) {
|
||||
continue;
|
||||
}
|
||||
var rules = filter.rules;
|
||||
var _g2 = 0;
|
||||
while(_g2 < rules.length) {
|
||||
var rule = rules[_g2];
|
||||
++_g2;
|
||||
if(exclude) {
|
||||
if(Reflect.field(rule,"!=") != null && testprop((value == null ? "null" : "" + value) == Std.string(Reflect.field(rule,"!="))) && exclude) {
|
||||
++qualify;
|
||||
}
|
||||
} else {
|
||||
if(Reflect.field(rule,"*") != null && testprop(parseFloat(value) != null)) {
|
||||
++qualify;
|
||||
}
|
||||
if(Reflect.field(rule,">") != null && testprop(parseFloat(value) > parseFloat(Reflect.field(rule,">")))) {
|
||||
++qualify;
|
||||
}
|
||||
if(Reflect.field(rule,"<") != null && testprop(parseFloat(value) < parseFloat(Reflect.field(rule,"<")))) {
|
||||
++qualify;
|
||||
}
|
||||
if(Reflect.field(rule,">=") != null && testprop(parseFloat(value) >= parseFloat(Reflect.field(rule,">=")))) {
|
||||
++qualify;
|
||||
}
|
||||
if(Reflect.field(rule,"<=") != null && testprop(parseFloat(value) <= parseFloat(Reflect.field(rule,"<=")))) {
|
||||
++qualify;
|
||||
}
|
||||
if(Reflect.field(rule,"=") != null && (testprop(value == Reflect.field(rule,"=")) || testprop(parseFloat(value) == parseFloat(Reflect.field(rule,"="))))) {
|
||||
++qualify;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return qualify > 0;
|
||||
}
|
||||
};
|
||||
var xrfragment_URI = $hx_exports["xrfragment"]["URI"] = function() { };
|
||||
xrfragment_URI.__name__ = true;
|
||||
xrfragment_URI.parse = function(url,filter) {
|
||||
var store = { };
|
||||
if(url.indexOf("#") == -1) {
|
||||
return store;
|
||||
}
|
||||
var fragment = url.split("#");
|
||||
var splitArray = fragment[1].split("&");
|
||||
var _g = 0;
|
||||
var _g1 = splitArray.length;
|
||||
while(_g < _g1) {
|
||||
var i = _g++;
|
||||
var splitByEqual = splitArray[i].split("=");
|
||||
var regexPlus = new EReg("\\+","g");
|
||||
var key = splitByEqual[0];
|
||||
var value = "";
|
||||
if(splitByEqual.length > 1) {
|
||||
var s = regexPlus.split(splitByEqual[1]).join(" ");
|
||||
value = decodeURIComponent(s.split("+").join(" "));
|
||||
}
|
||||
var ok = xrfragment_Parser.parse(key,value,store);
|
||||
}
|
||||
if(filter != null && filter != 0) {
|
||||
var _g = 0;
|
||||
var _g1 = Reflect.fields(store);
|
||||
while(_g < _g1.length) {
|
||||
var key = _g1[_g];
|
||||
++_g;
|
||||
var xrf = store[key];
|
||||
if(!xrf.is(filter)) {
|
||||
Reflect.deleteField(store,key);
|
||||
}
|
||||
}
|
||||
}
|
||||
return store;
|
||||
};
|
||||
var xrfragment_XRF = $hx_exports["xrfragment"]["XRF"] = function(_fragment,_flags) {
|
||||
this.fragment = _fragment;
|
||||
this.flags = _flags;
|
||||
};
|
||||
xrfragment_XRF.__name__ = true;
|
||||
xrfragment_XRF.set = function(flag,flags) {
|
||||
return flags | flag;
|
||||
};
|
||||
xrfragment_XRF.unset = function(flag,flags) {
|
||||
return flags & ~flag;
|
||||
};
|
||||
xrfragment_XRF.prototype = {
|
||||
is: function(flag) {
|
||||
return (this.flags & flag) != 0;
|
||||
}
|
||||
,validate: function(value) {
|
||||
this.guessType(this,value);
|
||||
if(value.split("|").length > 1) {
|
||||
this.args = [];
|
||||
var args = value.split("|");
|
||||
var _g = 0;
|
||||
var _g1 = args.length;
|
||||
while(_g < _g1) {
|
||||
var i = _g++;
|
||||
var x = new xrfragment_XRF(this.fragment,this.flags);
|
||||
this.guessType(x,args[i]);
|
||||
this.args.push(x);
|
||||
}
|
||||
}
|
||||
if(this.fragment == "q") {
|
||||
this.query = new xrfragment_Query(value).get();
|
||||
}
|
||||
var ok = true;
|
||||
if(!((this.args) instanceof Array)) {
|
||||
if(this.is(xrfragment_XRF.T_VECTOR3) && !(typeof(this.x) == "number" && typeof(this.y) == "number" && typeof(this.z) == "number")) {
|
||||
ok = false;
|
||||
}
|
||||
if(this.is(xrfragment_XRF.T_VECTOR2) && !(typeof(this.x) == "number" && typeof(this.y) == "number")) {
|
||||
ok = false;
|
||||
}
|
||||
var tmp;
|
||||
if(this.is(xrfragment_XRF.T_INT)) {
|
||||
var v = this.int;
|
||||
tmp = !(typeof(v) == "number" && ((v | 0) === v));
|
||||
} else {
|
||||
tmp = false;
|
||||
}
|
||||
if(tmp) {
|
||||
ok = false;
|
||||
}
|
||||
}
|
||||
return ok;
|
||||
}
|
||||
,guessType: function(v,str) {
|
||||
v.string = str;
|
||||
if(str.split(",").length > 1) {
|
||||
var xyz = str.split(",");
|
||||
if(xyz.length > 0) {
|
||||
v.x = parseFloat(xyz[0]);
|
||||
}
|
||||
if(xyz.length > 1) {
|
||||
v.y = parseFloat(xyz[1]);
|
||||
}
|
||||
if(xyz.length > 2) {
|
||||
v.z = parseFloat(xyz[2]);
|
||||
}
|
||||
}
|
||||
if(xrfragment_XRF.isColor.match(str)) {
|
||||
v.color = str;
|
||||
}
|
||||
if(xrfragment_XRF.isFloat.match(str)) {
|
||||
v.float = parseFloat(str);
|
||||
}
|
||||
if(xrfragment_XRF.isInt.match(str)) {
|
||||
v.int = Std.parseInt(str);
|
||||
}
|
||||
}
|
||||
};
|
||||
if(typeof(performance) != "undefined" ? typeof(performance.now) == "function" : false) {
|
||||
HxOverrides.now = performance.now.bind(performance);
|
||||
}
|
||||
String.__name__ = true;
|
||||
Array.__name__ = true;
|
||||
js_Boot.__toStr = ({ }).toString;
|
||||
xrfragment_Parser.error = "";
|
||||
xrfragment_Parser.debug = false;
|
||||
xrfragment_XRF.ASSET = 1;
|
||||
xrfragment_XRF.PROP_BIND = 2;
|
||||
xrfragment_XRF.QUERY_OPERATOR = 4;
|
||||
xrfragment_XRF.PROMPT = 8;
|
||||
xrfragment_XRF.ROUNDROBIN = 16;
|
||||
xrfragment_XRF.NAVIGATOR = 32;
|
||||
xrfragment_XRF.EMBEDDED = 64;
|
||||
xrfragment_XRF.PV_OVERRIDE = 128;
|
||||
xrfragment_XRF.PV_EXECUTE = 256;
|
||||
xrfragment_XRF.T_COLOR = 8192;
|
||||
xrfragment_XRF.T_INT = 16384;
|
||||
xrfragment_XRF.T_FLOAT = 32768;
|
||||
xrfragment_XRF.T_VECTOR2 = 65536;
|
||||
xrfragment_XRF.T_VECTOR3 = 131072;
|
||||
xrfragment_XRF.T_URL = 262144;
|
||||
xrfragment_XRF.T_PREDEFINED_VIEW = 524288;
|
||||
xrfragment_XRF.T_STRING = 1048576;
|
||||
xrfragment_XRF.T_STRING_OBJ = 2097152;
|
||||
xrfragment_XRF.T_STRING_OBJ_PROP = 4194304;
|
||||
xrfragment_XRF.isColor = new EReg("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$","");
|
||||
xrfragment_XRF.isInt = new EReg("^[0-9]+$","");
|
||||
xrfragment_XRF.isFloat = new EReg("^[0-9]+\\.[0-9]+$","");
|
||||
xrfragment_XRF.isVector = new EReg("([,]+|\\w)","");
|
||||
xrfragment_XRF.isUrl = new EReg("(://)?\\..*","");
|
||||
xrfragment_XRF.isUrlOrPretypedView = new EReg("(^#|://)?\\..*","");
|
||||
xrfragment_XRF.isString = new EReg(".*","");
|
||||
})({});
|
||||
var xrfragment = $hx_exports["xrfragment"];
|
||||
xrfragment.xrf = {}
|
||||
xrfragment.model = {}
|
||||
|
||||
xrfragment.init = function(opts){
|
||||
opts = opts || {}
|
||||
let XRF = function(){
|
||||
alert("queries are not implemented (yet)")
|
||||
}
|
||||
for ( let i in opts ) xrfragment[i] = opts[i]
|
||||
for ( let i in xrfragment.XRF ) xrfragment.XRF[i] // shortcuts to constants (NAVIGATOR e.g.)
|
||||
xrfragment.Parser.debug = xrfragment.debug
|
||||
if( opts.loaders ) opts.loaders.map( xrfragment.patchLoader )
|
||||
return xrfragment
|
||||
}
|
||||
|
||||
xrfragment.patchLoader = function(loader){
|
||||
loader.prototype.load = ((load) => function(url, onLoad, onProgress, onError){
|
||||
load.call( this,
|
||||
url,
|
||||
(model) => { onLoad(model); xrfragment.parseModel(model,url) },
|
||||
onProgress,
|
||||
onError)
|
||||
})(loader.prototype.load)
|
||||
}
|
||||
|
||||
xrfragment.getFile = (url) => url.split("/").pop().replace(/#.*/,'')
|
||||
|
||||
xrfragment.parseModel = function(model,url){
|
||||
let file = xrfragment.getFile(url)
|
||||
model.file = file
|
||||
model.render = function(){}
|
||||
xrfragment.model[file] = model
|
||||
console.log("scanning "+file)
|
||||
|
||||
model.scene.traverse( (mesh) => {
|
||||
console.log("◎ "+mesh.name)
|
||||
if( mesh.userData ){
|
||||
let frag = {}
|
||||
for( let k in mesh.userData ) xrfragment.Parser.parse( k, mesh.userData[k], frag )
|
||||
for( let k in frag ){
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
xrfragment.evalFragment = (k, opts ) => {
|
||||
// call native function (xrf/env.js e.g.), or pass it to user decorator
|
||||
let func = xrfragment.xrf[k] || function(){}
|
||||
if( xrfragment[k] ) xrfragment[k]( func, opts.frag[k], opts)
|
||||
else func( opts.frag[k], opts)
|
||||
}
|
||||
|
||||
xrfragment.getLastModel = () => Object.values(xrfragment.model)[ Object.values(xrfragment.model).length-1 ]
|
||||
|
||||
xrfragment.eval = function( url, model ){
|
||||
let notice = false
|
||||
model = model || xrfragment.getLastModel()
|
||||
let { THREE, camera } = xrfragment
|
||||
let frag = xrfragment.URI.parse( url, xrfragment.XRF.NAVIGATOR )
|
||||
let meshes = frag.q ? [] : [camera]
|
||||
|
||||
for ( let i in meshes ) {
|
||||
for ( let k in frag ){
|
||||
let mesh = meshes[i]
|
||||
if( !String(k).match(/(pos|rot)/) ) notice = true
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
if( notice ) alert("only 'pos' and 'rot' XRF.NAVIGATOR-flagged XR fragments are supported (for now)")
|
||||
}
|
||||
xrfragment.xrf.env = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
let env = mesh.getObjectByName(v.string)
|
||||
env.material.map.mapping = THREE.EquirectangularReflectionMapping;
|
||||
scene.environment = env.material.map
|
||||
scene.texture = env.material.map
|
||||
renderer.toneMapping = THREE.ACESFilmicToneMapping;
|
||||
renderer.toneMappingExposure = 1;
|
||||
console.log(` └ applied image '${v.string}' as environment map`)
|
||||
}
|
||||
xrfragment.xrf.href = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
return
|
||||
|
||||
// Create a shader material that treats the texture as an equirectangular map
|
||||
mesh.texture = mesh.material.map // backup texture
|
||||
const equirectShader = THREE.ShaderLib[ 'equirect' ];
|
||||
const equirectMaterial = new THREE.ShaderMaterial( {
|
||||
uniforms: THREE.UniformsUtils.merge([
|
||||
THREE.UniformsLib.equirect,
|
||||
equirectShader.uniforms,
|
||||
]),
|
||||
vertexShader: equirectShader.vertexShader,
|
||||
fragmentShader: equirectShader.fragmentShader,
|
||||
side: THREE.DoubleSide //THREE.FrontSide //THREE.DoubleSide //THREE.BackSide
|
||||
} );
|
||||
equirectMaterial.uniforms[ 'tEquirect' ].value = mesh.texture
|
||||
// Define the tEquirectInvProjection uniform
|
||||
equirectMaterial.uniforms.tEquirectInvProjection = {
|
||||
value: new THREE.Matrix4(),
|
||||
};
|
||||
// Assign the new material to the mesh
|
||||
mesh.material = equirectMaterial;
|
||||
console.dir(mesh.material)
|
||||
mesh.texture.wrapS = THREE.RepeatWrapping;
|
||||
|
||||
// patch custom model renderloop
|
||||
model.render = ((render) => (scene,camera) => {
|
||||
|
||||
// Store the original projection matrix of the camera
|
||||
const originalProjectionMatrix = camera.projectionMatrix.clone();
|
||||
// Calculate the current camera view matrix
|
||||
const aspectRatio = mesh.texture.image.width / mesh.texture.image.height;
|
||||
camera.projectionMatrix.makePerspective(camera.fov, aspectRatio, camera.near, camera.far);
|
||||
|
||||
const viewMatrix = camera.matrixWorldInverse;
|
||||
const worldMatrix = mesh.matrixWorld;
|
||||
|
||||
const equirectInvProjection = new THREE.Matrix4();
|
||||
equirectInvProjection.copy(camera.projectionMatrix).multiply(viewMatrix).invert();
|
||||
|
||||
// Update the equirectangular material's tEquirect uniform
|
||||
equirectMaterial.uniforms.tEquirect.value = mesh.texture;
|
||||
equirectMaterial.uniforms.tEquirectInvProjection.value.copy(
|
||||
equirectInvProjection
|
||||
);
|
||||
|
||||
// Reset the camera projection matrix
|
||||
camera.projectionMatrix.copy(originalProjectionMatrix);
|
||||
|
||||
|
||||
render(scene,camera)
|
||||
|
||||
})(model.render)
|
||||
|
||||
console.dir(mesh)
|
||||
}
|
||||
xrfragment.xrf.pos = function(v, opts){
|
||||
let { frag, mesh, model, camera, scene, renderer, THREE} = opts
|
||||
console.log(" └ setting camera position to "+v.string)
|
||||
camera.position.x = v.x
|
||||
camera.position.y = v.y
|
||||
camera.position.z = v.z
|
||||
}
|
||||
xrfragment.xrf.rot = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
camera.rotation.x = v.x * Math.PI / 180;
|
||||
camera.rotation.y = v.y * Math.PI / 180;
|
||||
camera.rotation.z = v.z * Math.PI / 180;
|
||||
}
|
||||
xrfragment.xrf.src = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
if( v.string[0] == "#" ){ // local
|
||||
console.log(" └ instancing src")
|
||||
let args = xrfragment.URI.parse(v.string)
|
||||
// Get an instance of the original model
|
||||
const modelInstance = new THREE.Group();
|
||||
modelInstance.add(model.scene.clone());
|
||||
modelInstance.position.z = mesh.position.z
|
||||
modelInstance.position.y = mesh.position.y
|
||||
modelInstance.position.x = mesh.position.x
|
||||
modelInstance.scale.z = mesh.scale.x
|
||||
modelInstance.scale.y = mesh.scale.y
|
||||
modelInstance.scale.x = mesh.scale.z
|
||||
// now apply XR Fragments overrides from URI
|
||||
// *TODO* move to a central location (pull-up)
|
||||
for( var i in args ){
|
||||
if( i == "scale" ){
|
||||
console.log(" └ setting scale")
|
||||
modelInstance.scale.x = args[i].x
|
||||
modelInstance.scale.y = args[i].y
|
||||
modelInstance.scale.z = args[i].z
|
||||
}
|
||||
}
|
||||
// Add the instance to the scene
|
||||
scene.add(modelInstance);
|
||||
console.dir(model)
|
||||
console.dir(modelInstance)
|
||||
}
|
||||
}
|
||||
window.AFRAME.registerComponent('xrf', {
|
||||
schema: {
|
||||
rig: {type: 'selector'}
|
||||
},
|
||||
init: function () {
|
||||
if( !AFRAME.XRF ) this.initXRFragments()
|
||||
if( !this.rig && this.el.querySelector('[camera]') )
|
||||
AFRAME.XRF.rig = this.el
|
||||
},
|
||||
initXRFragments: function(){
|
||||
let aScene = document.querySelector('a-scene')
|
||||
// enable XR fragments
|
||||
let XRF = AFRAME.XRF = xrfragment.init({
|
||||
THREE,
|
||||
camera: aScene.camera,
|
||||
scene: aScene.object3D,
|
||||
renderer: aScene.renderer,
|
||||
debug: true,
|
||||
loaders: [ THREE.GLTFLoader ], // which 3D assets to check for XR fragments?
|
||||
})
|
||||
|
||||
// override the 'pos' XR Fragment so we can translate the camera rig (not the camera itself)
|
||||
XRF.pos = (xrf,v,opts) => {
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
console.log("!pos")
|
||||
camera.parent.parent.position.x = v.x
|
||||
camera.parent.parent.position.y = v.y
|
||||
camera.parent.parent.position.z = v.z
|
||||
// xrf(v,opts) // skip threejs handler
|
||||
}
|
||||
|
||||
// override the 'rot' XR Fragment so we can translate the camera rig (not the camera itself)
|
||||
XRF.rot = (xrf,v,opts) => {
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
camera.parent.parent.rotation.x = v.x * Math.PI / 180;
|
||||
camera.parent.parent.rotation.y = v.y * Math.PI / 180;
|
||||
camera.parent.parent.rotation.z = v.z * Math.PI / 180;
|
||||
// xrf(v,opts) // skip threejs handler
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
64
dist/xrfragment.three.js
vendored
64
dist/xrfragment.three.js
vendored
|
|
@ -601,12 +601,11 @@ xrfragment.init = function(opts){
|
|||
let XRF = function(){
|
||||
alert("queries are not implemented (yet)")
|
||||
}
|
||||
for ( let i in opts ) XRF[i] = xrfragment[i] = opts[i]
|
||||
for ( let i in xrfragment ) XRF[i] = xrfragment[i]
|
||||
for ( let i in xrfragment.XRF ) XRF[i] = xrfragment.XRF[i] // shortcuts to constants (NAVIGATOR e.g.)
|
||||
for ( let i in opts ) xrfragment[i] = opts[i]
|
||||
for ( let i in xrfragment.XRF ) xrfragment.XRF[i] // shortcuts to constants (NAVIGATOR e.g.)
|
||||
xrfragment.Parser.debug = xrfragment.debug
|
||||
if( opts.loaders ) opts.loaders.map( xrfragment.patchLoader )
|
||||
return XRF
|
||||
return xrfragment
|
||||
}
|
||||
|
||||
xrfragment.patchLoader = function(loader){
|
||||
|
|
@ -629,43 +628,43 @@ xrfragment.parseModel = function(model,url){
|
|||
console.log("scanning "+file)
|
||||
|
||||
model.scene.traverse( (mesh) => {
|
||||
console.log(mesh.name)
|
||||
console.log("◎ "+mesh.name)
|
||||
if( mesh.userData ){
|
||||
let frag = {}
|
||||
for( let k in mesh.userData ){
|
||||
xrfragment.Parser.parse( k, mesh.userData[k], frag )
|
||||
// call native function (xrf/env.js e.g.), or pass it to user decorator
|
||||
let func = xrfragment.xrf[k] || function(){}
|
||||
let opts = {mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
if( xrfragment[k] ) xrfragment[k]( func, frag[k], opts)
|
||||
else func( frag[k], opts)
|
||||
for( let k in mesh.userData ) xrfragment.Parser.parse( k, mesh.userData[k], frag )
|
||||
for( let k in frag ){
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
xrfragment.evalFragment = (k, opts ) => {
|
||||
// call native function (xrf/env.js e.g.), or pass it to user decorator
|
||||
let func = xrfragment.xrf[k] || function(){}
|
||||
if( xrfragment[k] ) xrfragment[k]( func, opts.frag[k], opts)
|
||||
else func( opts.frag[k], opts)
|
||||
}
|
||||
|
||||
xrfragment.getLastModel = () => Object.values(xrfragment.model)[ Object.values(xrfragment.model).length-1 ]
|
||||
|
||||
xrfragment.eval = function( url, model ){
|
||||
let notice = false
|
||||
model = model || xrfragment.getLastModel()
|
||||
let { THREE, camera } = xrfragment
|
||||
let frag = xrfragment.URI.parse( url, XRF.NAVIGATOR )
|
||||
let frag = xrfragment.URI.parse( url, xrfragment.XRF.NAVIGATOR )
|
||||
let meshes = frag.q ? [] : [camera]
|
||||
|
||||
for ( let i in frag ) {
|
||||
if( !String(i).match(/(pos|rot)/) ) notice = true
|
||||
if( i == "pos" ){
|
||||
camera.position.x = frag.pos.x
|
||||
camera.position.y = frag.pos.y
|
||||
camera.position.z = frag.pos.z
|
||||
}
|
||||
if( i == "rot" ){
|
||||
camera.rotation.x = THREE.MathUtils.degToRad( frag.pos.x )
|
||||
camera.rotation.y = THREE.MathUtils.degToRad( frag.pos.y )
|
||||
camera.rotation.z = THREE.MathUtils.degToRad( frag.pos.z )
|
||||
for ( let i in meshes ) {
|
||||
for ( let k in frag ){
|
||||
let mesh = meshes[i]
|
||||
if( !String(k).match(/(pos|rot)/) ) notice = true
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
if( notice ) alert("only 'pos' and 'rot' XRF.NAVIGATOR-flagged XR fragments are supported (for now)")
|
||||
console.dir({url,model,frag})
|
||||
}
|
||||
xrfragment.xrf.env = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
|
|
@ -675,7 +674,7 @@ xrfragment.xrf.env = function(v, opts){
|
|||
scene.texture = env.material.map
|
||||
renderer.toneMapping = THREE.ACESFilmicToneMapping;
|
||||
renderer.toneMappingExposure = 1;
|
||||
console.log(` └ applied image '${v.string}' as environtment map`)
|
||||
console.log(` └ applied image '${v.string}' as environment map`)
|
||||
}
|
||||
xrfragment.xrf.href = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
|
|
@ -735,24 +734,29 @@ xrfragment.xrf.href = function(v, opts){
|
|||
console.dir(mesh)
|
||||
}
|
||||
xrfragment.xrf.pos = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
let { frag, mesh, model, camera, scene, renderer, THREE} = opts
|
||||
console.log(" └ setting camera position to "+v.string)
|
||||
camera.position.x = v.x
|
||||
camera.position.y = v.y
|
||||
camera.position.z = v.z
|
||||
}
|
||||
xrfragment.xrf.rot = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
camera.rotation.x = v.x * Math.PI / 180;
|
||||
camera.rotation.y = v.y * Math.PI / 180;
|
||||
camera.rotation.z = v.z * Math.PI / 180;
|
||||
}
|
||||
xrfragment.xrf.src = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
|
||||
if( v.string[0] == "#" ){ // local
|
||||
console.log(" └ instancing src")
|
||||
let args = xrfragment.URI.parse(v.string)
|
||||
// Get an instance of the original model
|
||||
const modelInstance = new THREE.Group();
|
||||
modelInstance.add(model.scene.clone());
|
||||
modelInstance.position.z = mesh.position.x
|
||||
modelInstance.position.z = mesh.position.z
|
||||
modelInstance.position.y = mesh.position.y
|
||||
modelInstance.position.x = mesh.position.z
|
||||
modelInstance.position.x = mesh.position.x
|
||||
modelInstance.scale.z = mesh.scale.x
|
||||
modelInstance.scale.y = mesh.scale.y
|
||||
modelInstance.scale.x = mesh.scale.z
|
||||
|
|
|
|||
53
example/aframe/sandbox/index.html
Normal file
53
example/aframe/sandbox/index.html
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>AFRAME - xrfragment sandbox</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
||||
<link rel="stylesheet" href="./../../assets/axist.min.css" />
|
||||
<link type="text/css" rel="stylesheet" href="main.css">
|
||||
<link type="text/css" rel="stylesheet" href="./../../assets/style.css"/>
|
||||
<script async src="./../../assets/alpine.min.js"></script>
|
||||
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
|
||||
<script src="./../../../dist/xrfragment.aframe.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="overlay" x-data="{ urls: ['#pos=0,4,15&rot=0,360,0'] }">
|
||||
<img src="./../../assets/logo.png" class="logo"/>
|
||||
<input type="submit" value="load 3D asset"></input>
|
||||
<input type="text" id="uri" list="urls" value="#pos=0,4,15&rot=0,360,0" x-on:change="document.location.hash = $('#uri').value"/>
|
||||
<datalist id="urls" >
|
||||
<template x-for="url in urls">
|
||||
<option x-bind:value="url" selected></option>
|
||||
</template>
|
||||
</datalist>
|
||||
</div>
|
||||
<a id="source" target="_blank" href="https://github.com/coderofsalvation/xrfragment/blob/main/example/aframe/sandbox/index.html">sourcecode</a>
|
||||
<a id="model" target="_blank" href="">⬇️ model</a>
|
||||
<textarea style="display:none"></textarea>
|
||||
<a-scene>
|
||||
<a-entity xrf gltf-model="./../../assets/example3.gltf"/>
|
||||
<a-entity xrf position="0 4 15">
|
||||
<a-entity camera look-controls wasd-controls></a-entity>
|
||||
</a-entity>
|
||||
</a-scene>
|
||||
|
||||
<script type="module">
|
||||
import { loadFile, setupConsole } from './../../assets/utils.js';
|
||||
window.$ = (s) => document.querySelector(s)
|
||||
|
||||
if( document.location.search.length > 2 )
|
||||
$('[gltf-model]').setAttribute('gltf-model', document.location.search.substr(1) )
|
||||
|
||||
$('a-scene').addEventListener('loaded', () => {
|
||||
setupConsole( $('textarea') )
|
||||
|
||||
// init navigator url
|
||||
document.location.hash = $('#uri').value
|
||||
window.addEventListener('hashchange', () => {
|
||||
window.AFRAME.XRF.eval( $('#uri').value = document.location.hash )
|
||||
})
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because one or more lines are too long
730
example/assets/example3.gltf
Normal file
730
example/assets/example3.gltf
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -34,13 +34,14 @@ input[type="submit"] {
|
|||
|
||||
#overlay{
|
||||
background: #FFF;
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 48px;
|
||||
box-shadow: 0px 0px 10px #0004;
|
||||
opacity: 0.9;
|
||||
z-index:2000;
|
||||
}
|
||||
|
||||
#overlay .logo{
|
||||
|
|
@ -93,6 +94,11 @@ a#model{
|
|||
z-index:2000;
|
||||
}
|
||||
|
||||
html.a-fullscreen a#model,
|
||||
html.a-fullscreen a#source{
|
||||
margin-right:200px;
|
||||
}
|
||||
|
||||
.render {
|
||||
position:absolute;
|
||||
top:0;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>three.js vr - sandbox</title>
|
||||
<title>THREE.js - xrfragment sandbox</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
||||
<link rel="stylesheet" href="./../../assets/axist.min.css" />
|
||||
|
|
@ -9,10 +9,10 @@
|
|||
<link type="text/css" rel="stylesheet" href="./../../assets/style.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<div id="overlay" x-data="{ urls: ['#pos=-1,1.6,10','#pos=-1,1.6,2'] }">
|
||||
<div id="overlay" x-data="{ urls: ['#pos=0,4,15','#pos=0,4,15&rot=0,360,0'] }">
|
||||
<img src="./../../assets/logo.png" class="logo"/>
|
||||
<input type="submit" value="load 3D asset"></input>
|
||||
<input type="text" id="uri" list="urls" value="#pos=-1,1.6,10" x-on:change="XRF.eval( $('#uri').value, XRF.getLastModel() )"/>
|
||||
<input type="text" id="uri" list="urls" value="#pos=0,4,15&rot=0,360,0" x-on:change="document.location.hash = $('#uri').value"/>
|
||||
<datalist id="urls" >
|
||||
<template x-for="url in urls">
|
||||
<option x-bind:value="url" selected></option>
|
||||
|
|
@ -99,6 +99,12 @@
|
|||
loaders: [ GLTFLoader, FBXLoader ], // which 3D assets to check for XR fragments?
|
||||
})
|
||||
|
||||
// init navigator url
|
||||
document.location.hash = $('#uri').value
|
||||
window.addEventListener('hashchange', () => {
|
||||
window.XRF.eval( $('#uri').value = document.location.hash )
|
||||
})
|
||||
|
||||
// optional: react/extend/hook into XR fragment
|
||||
XRF.env = (xrf,v,opts) => {
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
|
|
@ -111,6 +117,7 @@
|
|||
console.log("hello custom property 'foobar'")
|
||||
}
|
||||
|
||||
|
||||
// *TODO* lowhanging fruit: during XR fragments-query milestone, target objects using XR fragment queries
|
||||
// to provide jquery-ish interface for three.js)
|
||||
//
|
||||
|
|
@ -128,10 +135,6 @@
|
|||
scene.remove(model)
|
||||
//model.dispose()
|
||||
}
|
||||
gltf.scene.position.y = 1.5
|
||||
gltf.scene.position.z = -4
|
||||
gltf.scene.rotation.y = -0.5
|
||||
gltf.scene.scale.x = gltf.scene.scale.y = gltf.scene.scale.z = 1;
|
||||
|
||||
const maxAnisotropy = renderer.capabilities.getMaxAnisotropy();
|
||||
function recursivelySetChildrenUnlit(mesh,cb) {
|
||||
|
|
@ -149,7 +152,8 @@
|
|||
|
||||
};
|
||||
|
||||
let file = 'example2.gltf'
|
||||
let file = document.location.search.length > 2 ? document.location.search.substr(1) : 'example2.gltf'
|
||||
|
||||
$('#model').setAttribute("href","./../../asset/"+file)
|
||||
loader.load( file, loadGLTF );
|
||||
|
||||
|
|
@ -167,7 +171,7 @@
|
|||
//controls.maxPolarAngle = Math.PI / 2;
|
||||
//controls.target = new THREE.Vector3(0,1.6,0)
|
||||
|
||||
camera.position.set( -1, 1.6, 10 );
|
||||
camera.position.set( 0, 4, 15 );
|
||||
//controls.update()
|
||||
|
||||
const geometry = new THREE.BufferGeometry();
|
||||
|
|
|
|||
42
src/3rd/aframe/index.js
Normal file
42
src/3rd/aframe/index.js
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
window.AFRAME.registerComponent('xrf', {
|
||||
schema: {
|
||||
rig: {type: 'selector'}
|
||||
},
|
||||
init: function () {
|
||||
if( !AFRAME.XRF ) this.initXRFragments()
|
||||
if( !this.rig && this.el.querySelector('[camera]') )
|
||||
AFRAME.XRF.rig = this.el
|
||||
},
|
||||
initXRFragments: function(){
|
||||
let aScene = document.querySelector('a-scene')
|
||||
// enable XR fragments
|
||||
let XRF = AFRAME.XRF = xrfragment.init({
|
||||
THREE,
|
||||
camera: aScene.camera,
|
||||
scene: aScene.object3D,
|
||||
renderer: aScene.renderer,
|
||||
debug: true,
|
||||
loaders: [ THREE.GLTFLoader ], // which 3D assets to check for XR fragments?
|
||||
})
|
||||
|
||||
// override the 'pos' XR Fragment so we can translate the camera rig (not the camera itself)
|
||||
XRF.pos = (xrf,v,opts) => {
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
console.log("!pos")
|
||||
camera.parent.parent.position.x = v.x
|
||||
camera.parent.parent.position.y = v.y
|
||||
camera.parent.parent.position.z = v.z
|
||||
// xrf(v,opts) // skip threejs handler
|
||||
}
|
||||
|
||||
// override the 'rot' XR Fragment so we can translate the camera rig (not the camera itself)
|
||||
XRF.rot = (xrf,v,opts) => {
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
camera.parent.parent.rotation.x = v.x * Math.PI / 180;
|
||||
camera.parent.parent.rotation.y = v.y * Math.PI / 180;
|
||||
camera.parent.parent.rotation.z = v.z * Math.PI / 180;
|
||||
// xrf(v,opts) // skip threejs handler
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -6,12 +6,11 @@ xrfragment.init = function(opts){
|
|||
let XRF = function(){
|
||||
alert("queries are not implemented (yet)")
|
||||
}
|
||||
for ( let i in opts ) XRF[i] = xrfragment[i] = opts[i]
|
||||
for ( let i in xrfragment ) XRF[i] = xrfragment[i]
|
||||
for ( let i in xrfragment.XRF ) XRF[i] = xrfragment.XRF[i] // shortcuts to constants (NAVIGATOR e.g.)
|
||||
for ( let i in opts ) xrfragment[i] = opts[i]
|
||||
for ( let i in xrfragment.XRF ) xrfragment.XRF[i] // shortcuts to constants (NAVIGATOR e.g.)
|
||||
xrfragment.Parser.debug = xrfragment.debug
|
||||
if( opts.loaders ) opts.loaders.map( xrfragment.patchLoader )
|
||||
return XRF
|
||||
return xrfragment
|
||||
}
|
||||
|
||||
xrfragment.patchLoader = function(loader){
|
||||
|
|
@ -34,41 +33,41 @@ xrfragment.parseModel = function(model,url){
|
|||
console.log("scanning "+file)
|
||||
|
||||
model.scene.traverse( (mesh) => {
|
||||
console.log(mesh.name)
|
||||
console.log("◎ "+mesh.name)
|
||||
if( mesh.userData ){
|
||||
let frag = {}
|
||||
for( let k in mesh.userData ){
|
||||
xrfragment.Parser.parse( k, mesh.userData[k], frag )
|
||||
// call native function (xrf/env.js e.g.), or pass it to user decorator
|
||||
let func = xrfragment.xrf[k] || function(){}
|
||||
let opts = {mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
if( xrfragment[k] ) xrfragment[k]( func, frag[k], opts)
|
||||
else func( frag[k], opts)
|
||||
for( let k in mesh.userData ) xrfragment.Parser.parse( k, mesh.userData[k], frag )
|
||||
for( let k in frag ){
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
xrfragment.evalFragment = (k, opts ) => {
|
||||
// call native function (xrf/env.js e.g.), or pass it to user decorator
|
||||
let func = xrfragment.xrf[k] || function(){}
|
||||
if( xrfragment[k] ) xrfragment[k]( func, opts.frag[k], opts)
|
||||
else func( opts.frag[k], opts)
|
||||
}
|
||||
|
||||
xrfragment.getLastModel = () => Object.values(xrfragment.model)[ Object.values(xrfragment.model).length-1 ]
|
||||
|
||||
xrfragment.eval = function( url, model ){
|
||||
let notice = false
|
||||
model = model || xrfragment.getLastModel()
|
||||
let { THREE, camera } = xrfragment
|
||||
let frag = xrfragment.URI.parse( url, XRF.NAVIGATOR )
|
||||
let frag = xrfragment.URI.parse( url, xrfragment.XRF.NAVIGATOR )
|
||||
let meshes = frag.q ? [] : [camera]
|
||||
|
||||
for ( let i in frag ) {
|
||||
if( !String(i).match(/(pos|rot)/) ) notice = true
|
||||
if( i == "pos" ){
|
||||
camera.position.x = frag.pos.x
|
||||
camera.position.y = frag.pos.y
|
||||
camera.position.z = frag.pos.z
|
||||
}
|
||||
if( i == "rot" ){
|
||||
camera.rotation.x = THREE.MathUtils.degToRad( frag.pos.x )
|
||||
camera.rotation.y = THREE.MathUtils.degToRad( frag.pos.y )
|
||||
camera.rotation.z = THREE.MathUtils.degToRad( frag.pos.z )
|
||||
for ( let i in meshes ) {
|
||||
for ( let k in frag ){
|
||||
let mesh = meshes[i]
|
||||
if( !String(k).match(/(pos|rot)/) ) notice = true
|
||||
let opts = {frag, mesh, model, camera: xrfragment.camera, scene: xrfragment.scene, renderer: xrfragment.renderer, THREE: xrfragment.THREE }
|
||||
xrfragment.evalFragment(k,opts)
|
||||
}
|
||||
}
|
||||
if( notice ) alert("only 'pos' and 'rot' XRF.NAVIGATOR-flagged XR fragments are supported (for now)")
|
||||
console.dir({url,model,frag})
|
||||
}
|
||||
|
|
@ -6,5 +6,5 @@ xrfragment.xrf.env = function(v, opts){
|
|||
scene.texture = env.material.map
|
||||
renderer.toneMapping = THREE.ACESFilmicToneMapping;
|
||||
renderer.toneMappingExposure = 1;
|
||||
console.log(` └ applied image '${v.string}' as environtment map`)
|
||||
console.log(` └ applied image '${v.string}' as environment map`)
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
xrfragment.xrf.pos = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
let { frag, mesh, model, camera, scene, renderer, THREE} = opts
|
||||
console.log(" └ setting camera position to "+v.string)
|
||||
camera.position.x = v.x
|
||||
camera.position.y = v.y
|
||||
6
src/3rd/three/xrf/rot.js
Normal file
6
src/3rd/three/xrf/rot.js
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
xrfragment.xrf.rot = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
camera.rotation.x = v.x * Math.PI / 180;
|
||||
camera.rotation.y = v.y * Math.PI / 180;
|
||||
camera.rotation.z = v.z * Math.PI / 180;
|
||||
}
|
||||
|
|
@ -1,15 +1,14 @@
|
|||
xrfragment.xrf.src = function(v, opts){
|
||||
let { mesh, model, camera, scene, renderer, THREE} = opts
|
||||
|
||||
if( v.string[0] == "#" ){ // local
|
||||
console.log(" └ instancing src")
|
||||
let args = xrfragment.URI.parse(v.string)
|
||||
// Get an instance of the original model
|
||||
const modelInstance = new THREE.Group();
|
||||
modelInstance.add(model.scene.clone());
|
||||
modelInstance.position.z = mesh.position.x
|
||||
modelInstance.position.z = mesh.position.z
|
||||
modelInstance.position.y = mesh.position.y
|
||||
modelInstance.position.x = mesh.position.z
|
||||
modelInstance.position.x = mesh.position.x
|
||||
modelInstance.scale.z = mesh.scale.x
|
||||
modelInstance.scale.y = mesh.scale.y
|
||||
modelInstance.scale.x = mesh.scale.z
|
||||
Loading…
Add table
Reference in a new issue