Use new classnames

three.js/threex-artoolkitcontext.js

+var ARjs = ARjs || {}
 var THREEx = THREEx || {}
 
-THREEx.ArToolkitContext = function(parameters){
+ARjs.Context = THREEx.ArToolkitContext = function(parameters){
 	var _this = this
 	
 	_this._updatedAt = null
@@ -17,7 +18,7 @@ THREEx.ArToolkitContext = function(parameters){
 		matrixCodeType: '3x3',
 		
 		// url of the camera parameters
-		cameraParametersUrl: THREEx.ArToolkitContext.baseURL + 'parameters/camera_para.dat',
+		cameraParametersUrl: ARjs.Context.baseURL + 'parameters/camera_para.dat',
 
 		// tune the maximum rate of pose detection in the source image
 		maxDetectionRate: 60,
@@ -67,12 +68,12 @@ THREEx.ArToolkitContext = function(parameters){
 	}
 }
 
-Object.assign( THREEx.ArToolkitContext.prototype, THREE.EventDispatcher.prototype );
+Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
 
-// THREEx.ArToolkitContext.baseURL = '../'
+// ARjs.Context.baseURL = '../'
 // default to github page
-THREEx.ArToolkitContext.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-THREEx.ArToolkitContext.REVISION = '1.0.1-dev'
+ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
+ARjs.Context.REVISION = '1.0.1-dev'
 
 
 
@@ -81,7 +82,7 @@ THREEx.ArToolkitContext.REVISION = '1.0.1-dev'
  * @param {string} trackingBackend - the tracking to user
  * @return {THREE.Camera} the created camera
  */
-THREEx.ArToolkitContext.createDefaultCamera = function( trackingBackend ){
+ARjs.Context.createDefaultCamera = function( trackingBackend ){
 	console.assert(false, 'use ARjs.Utils.createDefaultCamera instead')
 	// Create a camera
 	if( trackingBackend === 'artoolkit' ){
@@ -98,7 +99,7 @@ THREEx.ArToolkitContext.createDefaultCamera = function( trackingBackend ){
 //////////////////////////////////////////////////////////////////////////////
 //		init functions
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype.init = function(onCompleted){
+ARjs.Context.prototype.init = function(onCompleted){
 	var _this = this
 	if( this.parameters.trackingBackend === 'artoolkit' ){
 		this._initArtoolkit(done)
@@ -124,7 +125,7 @@ THREEx.ArToolkitContext.prototype.init = function(onCompleted){
 ////////////////////////////////////////////////////////////////////////////////
 //          update function
 ////////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype.update = function(srcElement){
+ARjs.Context.prototype.update = function(srcElement){
 
 	// be sure arController is fully initialized
         if(this.parameters.trackingBackend === 'artoolkit' && this.arController === null) return false;
@@ -165,12 +166,12 @@ THREEx.ArToolkitContext.prototype.update = function(srcElement){
 ////////////////////////////////////////////////////////////////////////////////
 //          Add/Remove markerControls
 ////////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype.addMarker = function(arMarkerControls){
+ARjs.Context.prototype.addMarker = function(arMarkerControls){
 	console.assert(arMarkerControls instanceof THREEx.ArMarkerControls)
 	this._arMarkersControls.push(arMarkerControls)
 }
 
-THREEx.ArToolkitContext.prototype.removeMarker = function(arMarkerControls){
+ARjs.Context.prototype.removeMarker = function(arMarkerControls){
 	console.assert(arMarkerControls instanceof THREEx.ArMarkerControls)
 	// console.log('remove marker for', arMarkerControls)
 	var index = this.arMarkerControlss.indexOf(artoolkitMarker);
@@ -181,7 +182,7 @@ THREEx.ArToolkitContext.prototype.removeMarker = function(arMarkerControls){
 //////////////////////////////////////////////////////////////////////////////
 //		artoolkit specific
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype._initArtoolkit = function(onCompleted){
+ARjs.Context.prototype._initArtoolkit = function(onCompleted){
         var _this = this
 
 	// set this._artoolkitProjectionAxisTransformMatrix to change artoolkit projection matrix axis to match usual webgl one
@@ -252,7 +253,7 @@ THREEx.ArToolkitContext.prototype._initArtoolkit = function(onCompleted){
 /**
  * return the projection matrix
  */
-THREEx.ArToolkitContext.prototype.getProjectionMatrix = function(srcElement){
+ARjs.Context.prototype.getProjectionMatrix = function(srcElement){
 	
 	
 // FIXME rename this function to say it is artoolkit specific - getArtoolkitProjectMatrix
@@ -275,14 +276,14 @@ THREEx.ArToolkitContext.prototype.getProjectionMatrix = function(srcElement){
 	return projectionMatrix
 }
 
-THREEx.ArToolkitContext.prototype._updateArtoolkit = function(srcElement){
+ARjs.Context.prototype._updateArtoolkit = function(srcElement){
 	this.arController.process(srcElement)
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //		aruco specific 
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype._initAruco = function(onCompleted){
+ARjs.Context.prototype._initAruco = function(onCompleted){
 	this.arucoContext = new THREEx.ArucoContext()
 	
 	// honor this.parameters.canvasWidth/.canvasHeight
@@ -303,7 +304,7 @@ THREEx.ArToolkitContext.prototype._initAruco = function(onCompleted){
 }
 
 
-THREEx.ArToolkitContext.prototype._updateAruco = function(srcElement){
+ARjs.Context.prototype._updateAruco = function(srcElement){
 	// console.log('update aruco here')
 	var _this = this
 	var arMarkersControls = this._arMarkersControls
@@ -331,7 +332,7 @@ THREEx.ArToolkitContext.prototype._updateAruco = function(srcElement){
 //////////////////////////////////////////////////////////////////////////////
 //		tango specific 
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitContext.prototype._initTango = function(onCompleted){
+ARjs.Context.prototype._initTango = function(onCompleted){
 	var _this = this
 	// check webvr is available
 	if (navigator.getVRDisplays){
@@ -374,7 +375,7 @@ THREEx.ArToolkitContext.prototype._initTango = function(onCompleted){
 }
 
 
-THREEx.ArToolkitContext.prototype._updateTango = function(srcElement){
+ARjs.Context.prototype._updateTango = function(srcElement){
 	// console.log('update aruco here')
 	var _this = this
 	var arMarkersControls = this._arMarkersControls

three.js/threex-artoolkitprofile.js

 var ARjs = ARjs || {}
-
 var THREEx = THREEx || {}
 
 /**

three.js/threex-artoolkitsource.js

+var ARjs = ARjs || {}
 var THREEx = THREEx || {}
 
-THREEx.ArToolkitSource = function(parameters){	
+ARjs.Source = THREEx.ArToolkitSource = function(parameters){	
 	var _this = this
 
 	this.ready = false
@@ -49,7 +50,7 @@ THREEx.ArToolkitSource = function(parameters){
 //////////////////////////////////////////////////////////////////////////////
 //		Code Separator
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitSource.prototype.init = function(onReady, onError){
+ARjs.Source.prototype.init = function(onReady, onError){
 	var _this = this
 
         if( this.parameters.sourceType === 'image' ){
@@ -85,7 +86,7 @@ THREEx.ArToolkitSource.prototype.init = function(onReady, onError){
 ////////////////////////////////////////////////////////////////////////////////
 
 
-THREEx.ArToolkitSource.prototype._initSourceImage = function(onReady) {
+ARjs.Source.prototype._initSourceImage = function(onReady) {
 	// TODO make it static
         var domElement = document.createElement('img')
 	domElement.src = this.parameters.sourceUrl
@@ -110,7 +111,7 @@ THREEx.ArToolkitSource.prototype._initSourceImage = function(onReady) {
 ////////////////////////////////////////////////////////////////////////////////
 
 
-THREEx.ArToolkitSource.prototype._initSourceVideo = function(onReady) {
+ARjs.Source.prototype._initSourceVideo = function(onReady) {
 	// TODO make it static
 	var domElement = document.createElement('video');
 	domElement.src = this.parameters.sourceUrl
@@ -147,7 +148,7 @@ THREEx.ArToolkitSource.prototype._initSourceVideo = function(onReady) {
 //          handle webcam source
 ////////////////////////////////////////////////////////////////////////////////
 
-THREEx.ArToolkitSource.prototype._initSourceWebcam = function(onReady, onError) {
+ARjs.Source.prototype._initSourceWebcam = function(onReady, onError) {
 	var _this = this
 
 	// init default value
@@ -226,7 +227,7 @@ THREEx.ArToolkitSource.prototype._initSourceWebcam = function(onReady, onError)
 //////////////////////////////////////////////////////////////////////////////
 //		Handle Mobile Torch
 //////////////////////////////////////////////////////////////////////////////
-THREEx.ArToolkitSource.prototype.hasMobileTorch = function(){
+ARjs.Source.prototype.hasMobileTorch = function(){
 	var stream = arToolkitSource.domElement.srcObject
 	if( stream instanceof MediaStream === false )	return false
 
@@ -248,7 +249,7 @@ THREEx.ArToolkitSource.prototype.hasMobileTorch = function(){
  * toggle the flash/torch of the mobile fun if applicable.
  * Great post about it https://www.oberhofer.co/mediastreamtrack-and-its-capabilities/
  */
-THREEx.ArToolkitSource.prototype.toggleMobileTorch = function(){
+ARjs.Source.prototype.toggleMobileTorch = function(){
 	// sanity check
 	console.assert(this.hasMobileTorch() === true)
 		
@@ -284,7 +285,7 @@ THREEx.ArToolkitSource.prototype.toggleMobileTorch = function(){
 //          handle resize
 ////////////////////////////////////////////////////////////////////////////////
 
-THREEx.ArToolkitSource.prototype.onResizeElement = function(mirrorDomElements){
+ARjs.Source.prototype.onResizeElement = function(mirrorDomElements){
 	var _this = this
 	var screenWidth = window.innerWidth
 	var screenHeight = window.innerHeight
@@ -342,7 +343,7 @@ THREEx.ArToolkitSource.prototype.onResizeElement = function(mirrorDomElements){
 	})
 }
 
-THREEx.ArToolkitSource.prototype.copyElementSizeTo = function(otherElement){
+ARjs.Source.prototype.copyElementSizeTo = function(otherElement){
 	otherElement.style.width = this.domElement.style.width
 	otherElement.style.height = this.domElement.style.height	
 	otherElement.style.marginLeft = this.domElement.style.marginLeft
@@ -353,7 +354,7 @@ THREEx.ArToolkitSource.prototype.copyElementSizeTo = function(otherElement){
 //		Code Separator
 //////////////////////////////////////////////////////////////////////////////
 
-THREEx.ArToolkitSource.prototype.copySizeTo = function(){
+ARjs.Source.prototype.copySizeTo = function(){
 	console.warn('obsolete function arToolkitSource.copySizeTo. Use arToolkitSource.copyElementSizeTo' )
 	this.copyElementSizeTo.apply(this, arguments)
 }
@@ -362,14 +363,15 @@ THREEx.ArToolkitSource.prototype.copySizeTo = function(){
 //		Code Separator
 //////////////////////////////////////////////////////////////////////////////
 
-THREEx.ArToolkitSource.prototype.onResize	= function(arToolkitContext, renderer, camera){
-	var trackingBackend = arToolkitContext.parameters.trackingBackend
-	
+ARjs.Source.prototype.onResize	= function(arToolkitContext, renderer, camera){
 	if( arguments.length !== 3 ){
 		console.warn('obsolete function arToolkitSource.onResize. Use arToolkitSource.onResizeElement' )
 		return this.onResizeElement.apply(this, arguments)
 	}
 
+	var trackingBackend = arToolkitContext.parameters.trackingBackend
+	
+
 	// RESIZE DOMELEMENT
 	if( trackingBackend === 'artoolkit' ){