Skip to content

Commit

Permalink
Merge branch 'Alpha-2-VR'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tparisi
tparisi committed Jan 28, 2015
2 parents 4329f8f + 76f9486 commit 8ad1175
Show file tree
Hide file tree
Showing 5,735 changed files with 1,525 additions and 1,747,812 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
262 changes: 251 additions & 11 deletions build/glam-nodeps.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3732,12 +3732,11 @@ glam.DOM.getAnimation = function(id) {
return glam.DOM.animations[id];
}


$(document).ready(function(){

glam.DOM.ready();
});

window.addEventListener('load',
function() {
glam.DOM.ready();
},
false);

/**
* @fileoverview Picker component - add one to get picking support on your object
Expand Down Expand Up @@ -6937,15 +6936,15 @@ glam.DOMMaterial.createShaderMaterial = function(style, param, createCB) {
var vstext = "";
var fstext = "";

$.ajax({
glam.System.ajax({
type: 'GET',
url: vsurl,
dataType: "text",
success: function(result) { vstext = result; if (fstext) done(); },
});


$.ajax({
glam.System.ajax({
type: 'GET',
url: fsurl,
dataType: "text",
Expand Down Expand Up @@ -7488,7 +7487,7 @@ glam.DOMDocument = {
for (i = 0; i < len; i++)
{
{
$.parsecss(styles[i].childNodes[0].data,
glam.CSSParser.parsecss(styles[i].childNodes[0].data,
function(css) {
glam.DOMDocument.addStyle(css);
}
Expand All @@ -7497,6 +7496,225 @@ glam.DOMDocument = {
}
},
};
// jQuery based CSS parser
// documentation: http://youngisrael-stl.org/wordpress/2009/01/16/jquery-css-parser/
// Version: 1.5
// Copyright (c) 2011 Daniel Wachsstock
// MIT license:
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.

goog.provide('glam.CSSParser');
glam.CSSParser = {

};


(function(parser){

parser.extend = function(a, b){
for(var key in b)
if(b.hasOwnProperty(key))
a[key] = b[key];
return a;
}

// utility function, since we want to allow parser('style') and parser(document), so we need to look for elements in the jQuery object (parser.fn.filter) and elements that are children of the jQuery object (parser.fn.find)
parser.findandfilter = function(selector){
var ret = this.filter(selector).add(this.find(selector));
ret.prevObject = ret.prevObject.prevObject; // maintain the filter/end chain correctly (the filter and the find both push onto the chain).
return ret;
};


parser.parsecss = function(str, callback){
var ret = {};
str = munge(str).replace(/@(([^;`]|`[^b]|`b[^%])*(`b%)?);?/g, function(s,rule){
// @rules end with ; or a block, with the semicolon not being part of the rule but the closing brace (represented by `b%) is
processAtRule(rule.trim(), callback);
return '';
});

str.split('`b%').forEach(function(css){ // split on the end of a block
css = css.split('%b`'); // css[0] is the selector; css[1] is the index in munged for the cssText
if (css.length < 2) return; // invalid css
css[0] = restore(css[0]);
ret[css[0]] = parser.extend(ret[css[0]] || {}, parsedeclarations(css[1]));
});
callback(ret);
};
// explanation of the above: munge(str) strips comments and encodes strings and brace-delimited blocks, so that
// %b` corresponds to { and `b% corresponds to }
// munge(str) replaces blocks with %b`1`b% (for example)
//
// str.split('`b%') splits the text by '}' (which ends every CSS statement)
// Each so the each(munge(str... function(i,css)
// is called with css being empty (the string after the last delimiter), an @rule, or a css statement of the form
// selector %b`n where n is a number (the block was turned into %b`n`b% by munge). Splitting on %b` gives the selector and the
// number corresponding to the declaration block. parsedeclarations will do restore('%b`'+n+'`b%') to get it back.

// if anyone ever implements http://www.w3.org/TR/cssom-view/#the-media-interface, we're ready
parser.parsecss.mediumApplies = (window.media && window.media.query) || function(str){
if (!str) return true; // if no descriptor, everything applies
if (str in media) return media[str];
var style = parser('<style media="'+str+'">body {position: relative; z-index: 1;}</style>').appendTo('head');
return media[str] = [parser('body').css('z-index')==1, style.remove()][0]; // the [x,y][0] is a silly hack to evaluate two expressions and return the first
};

parser.parsecss.isValidSelector = function(str){
var s = parser('<style>'+str+'{}</style>').appendTo('head')[0];
// s.styleSheet is IE; it accepts illegal selectors but converts them to UNKNOWN. Standards-based (s.shee.cssRules) just reject the rule
return [s.styleSheet ? !/UNKNOWN/i.test(s.styleSheet.cssText) : !!s.sheet.cssRules.length, parser(s).remove()][0]; // the [x,y][0] is a silly hack to evaluate two expressions and return the first
};

parser.parsecss.parseArguments = function(str){
if (!str) return [];
var ret = [], mungedArguments = munge(str, true).split(/\s+/); // can't use parser.map because it flattens arrays !
for (var i = 0; i < mungedArguments.length; ++i) {
var a = restore(mungedArguments[i]);
try{
ret.push(eval('('+a+')'));
}catch(err){
ret.push(a);
}
}
return ret;
};


// expose the styleAttributes function
parser.parsecss.styleAttributes = styleAttributes;

// caches
var media = {}; // media description strings
var munged = {}; // strings that were removed by the parser so they don't mess up searching for specific characters

// private functions

function parsedeclarations(index){ // take a string from the munged array and parse it into an object of property: value pairs
var str = munged[index].replace(/^{|}parser/g, ''); // find the string and remove the surrounding braces
str = munge(str); // make sure any internal braces or strings are escaped
var parsed = {};
str.split(';').forEach(function (decl){
decl = decl.split(':');
if (decl.length < 2) return;
parsed[restore(decl[0])] = restore(decl.slice(1).join(':'));
});
return parsed;
}

// replace strings and brace-surrounded blocks with %s`number`s% and %b`number`b%. By successively taking out the innermost
// blocks, we ensure that we're matching braces. No way to do this with just regular expressions. Obviously, this assumes no one
// would use %s` in the real world.
// Turns out this is similar to the method that Dean Edwards used for his CSS parser in IE7.js (http://code.google.com/p/ie7-js/)
var REbraces = /{[^{}]*}/;
var REfull = /\[[^\[\]]*\]|{[^{}]*}|\([^()]*\)|function(\s+\w+)?(\s*%b`\d+`b%){2}/; // match pairs of parentheses, brackets, and braces and function definitions.
var REatcomment = /\/\*@((?:[^\*]|\*[^\/])*)\*\//g; // comments of the form /*@ text */ have text parsed
// we have to combine the comments and the strings because comments can contain string delimiters and strings can contain comment delimiters
// var REcomment = /\/\*(?:[^\*]|\*[^\/])*\*\/|<!--|-->/g; // other comments are stripped. (this is a simplification of real SGML comments (see http://htmlhelp.com/reference/wilbur/misc/comment.html) , but it's what real browsers use)
// var REstring = /\\.|"(?:[^\\\"]|\\.|\\\n)*"|'(?:[^\\\']|\\.|\\\n)*'/g; // match escaped characters and strings
var REcomment_string =
/(?:\/\*(?:[^\*]|\*[^\/])*\*\/)|(\\.|"(?:[^\\\"]|\\.|\\\n)*"|'(?:[^\\\']|\\.|\\\n)*')/g;
var REmunged = /%\w`(\d+)`\w%/;
var uid = 0; // unique id number
function munge(str, full){
var match;
var replacement;
str = str
.replace(REatcomment,'parser1') // strip /*@ comments but leave the text (to let invalid CSS through)
.replace(REcomment_string, function (s, string){ // strip strings and escaped characters, leaving munged markers, and strip comments
if (!string) return '';
var replacement = '%s`'+(++uid)+'`s%';
munged[uid] = string.replace(/^\\/,''); // strip the backslash now
return replacement;
})
;
// need a loop here rather than .replace since we need to replace nested braces
var RE = full ? REfull : REbraces;
while (match = RE.exec(str)){
replacement = '%b`'+(++uid)+'`b%';
munged[uid] = match[0];
str = str.replace(RE, replacement);
}
return str;
}

function restore(str){
var match;
if (str === undefined) return str;
while (match = REmunged.exec(str)){
str = str.replace(REmunged, munged[match[1]]);
}
return str.trim();
}

function processAtRule (rule, callback){
var split = rule.split(/\s+/); // split on whitespace
var type = split.shift(); // first word
if (type=='media'){
var css = restore(split.pop()).slice(1,-1); // last word is the rule; need to strip the outermost braces
if (parser.parsecss.mediumApplies(split.join(' '))){
parser.parsecss(css, callback);
}
}else if (type=='import'){
var url = restore(split.shift());
if (parser.parsecss.mediumApplies(split.join(' '))){
url = url.replace(/^url\(|\)parser/gi, '').replace(/^["']|["']parser/g, ''); // remove the url('...') wrapper
parser.get(url, function(str) { parser.parsecss(str, callback) });
}
}else if (type=='-webkit-keyframes' || type=='-moz-keyframes' || type=='keyframes'){
var kfName = split.shift();
var css = restore(split.join(' '));
css = css.substr(1, css.length - 2); // strip {}
parser.parsecss(css, function(keyframes) {
// console.log("Parsed keyframes: ", keyframes);
var ret = {};
ret[kfName] = keyframes;
callback(ret);
})
}
}



// experimental: find unrecognized style attributes in elements by reloading the code as text
var RESGMLcomment = /<!--([^-]|-[^-])*-->/g; // as above, a simplification of real comments. Don't put -- in your HTML comments!
var REnotATag = /(>)[^<]*/g;
var REtag = /<(\w+)([^>]*)>/g;

function styleAttributes (HTMLtext, callback) {
var ret = '', style, tags = {}; // keep track of tags so we can identify elements unambiguously
HTMLtext = HTMLtext.replace(RESGMLcomment, '').replace(REnotATag, 'parser1');
munge(HTMLtext).replace(REtag, function(s, tag, attrs){
tag = tag.toLowerCase();
if (tags[tag]) ++tags[tag]; else tags[tag] = 1;
if (style = /\bstyle\s*=\s*(%s`\d+`s%)/i.exec(attrs)){ // style attributes must be of the form style = "a: bc" ; they must be in quotes. After munging, they are marked with numbers. Grab that number
var id = /\bid\s*=\s*(\S+)/i.exec(attrs); // find the id if there is one.
if (id) id = '#'+restore(id[1]).replace(/^['"]|['"]parser/g,''); else id = tag + ':eq(' + (tags[tag]-1) + ')';
ret += [id, '{', restore(style[1]).replace(/^['"]|['"]parser/g,''),'}'].join('');
}
});
parser.parsecss(ret, callback);
}
})(glam.CSSParser);
/**
* @fileoverview animation parser/implementation
*
Expand Down Expand Up @@ -8892,6 +9110,7 @@ glam.DOMElement.getStyle = function(docelt) {
*/

goog.provide('glam.DOMParser');
goog.require('glam.CSSParser');

glam.DOMParser = {

Expand Down Expand Up @@ -8970,7 +9189,7 @@ glam.DOMParser = {
for (i = 0; i < len; i++)
{
if (styles[i].childNodes.length) {
$.parsecss(styles[i].childNodes[0].data,
glam.CSSParser.parsecss(styles[i].childNodes[0].data,
function(css) {
glam.DOMParser.addStyle(css);
}
Expand Down Expand Up @@ -12022,7 +12241,27 @@ glam.System = {
error : function() {
var args = ["[glam] "].concat([].slice.call(arguments));
console.error.apply(console, args);
}
},
ajax : function(param) {

var type = param.type,
url = param.url,
dataType = param.dataType,
success = param.success,
error = param.error;

var xhr = new XMLHttpRequest();
xhr.open(type, url, true);
xhr.responseType = dataType;

xhr.addEventListener( 'load', function ( event ) {
success(xhr.response);
}, false );
xhr.addEventListener( 'error', function ( event ) {
error(xhr.status);
}, false );
xhr.send(null);
},
};goog.provide('glam.PointLight');
goog.require('glam.Light');

Expand Down Expand Up @@ -14323,6 +14562,7 @@ goog.require('glam.LineElement');
goog.require('glam.DOMMaterial');
goog.require('glam.MeshElement');
goog.require('glam.DOMElement');
goog.require('glam.CSSParser');
goog.require('glam.DOMParser');
goog.require('glam.ParticlesElement');
goog.require('glam.RectElement');
Expand Down
Loading

0 comments on commit 8ad1175

Please sign in to comment.