提交 30cc7426 编写于 作者: J Jerome Etienne

more work

上级 fb39064c
......@@ -136,11 +136,11 @@
// // to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// // to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -153,7 +153,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
maxDetectionRate: 30,
canvasWidth: 80*3,
......@@ -183,8 +183,8 @@
scene.add(markerRoot)
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
//////////////////////////////////////////////////////////////////////////////
......
......@@ -214,7 +214,7 @@ hiroImage.onload = function() {
updateARCode()
}
hiroImage.src = '../../data/images/hiro.png';
hiroImage.src = THREEx.ArToolkitContext.baseURL + '../data/images/hiro.png';
function updateARCode(){
var urlQrCode = document.querySelector('#urlQrCode').value
......
......@@ -50,11 +50,11 @@
// // to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -74,7 +74,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
})
// initialize it
......@@ -100,8 +100,8 @@
// init controls for camera
var markerControls = new THREEx.ArMarkerControls(arToolkitContext, camera, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
// as we controls the camera, set changeMatrixMode: 'cameraTransformMatrix'
changeMatrixMode: 'cameraTransformMatrix'
})
......
......@@ -68,11 +68,11 @@
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -92,7 +92,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
canvasWidth: 80*4,
canvasHeight: 60*4,
......@@ -122,8 +122,8 @@
if( false ){
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
}else{
var deadReckoningControls = new THREEx.DeadReckoningControls(markerRoot)
......@@ -136,8 +136,8 @@ if( false ){
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, knownPositionMesh, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
artoolkitMarker.addEventListener('markerFound', function(event){
......
......@@ -200,11 +200,11 @@
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -255,7 +255,7 @@
var markerControls = new THREEx.ArMarkerControls(arToolkitContext, camera, {
type : 'pattern',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
// as we controls the camera, set changeMatrixMode: 'cameraTransformMatrix'
changeMatrixMode: 'cameraTransformMatrix'
})
......
......@@ -125,11 +125,11 @@
//
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -179,7 +179,7 @@
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : THREEx.ArToolkitContext.baseURL+'../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
//////////////////////////////////////////////////////////////////////////////////
......
......@@ -82,11 +82,11 @@
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -106,7 +106,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
imageSmoothingEnabled: false,
maxDetectionRate: 30,
......@@ -135,8 +135,8 @@
scene.add(markerRoot)
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
//////////////////////////////////////////////////////////////////////////////////
......
......@@ -57,11 +57,11 @@
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
sourceType : 'video',
sourceUrl : '../../data/videos/headtracking.mp4',
sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -82,7 +82,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
})
// initialize it
......@@ -107,8 +107,8 @@
scene.add(markerRoot)
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
// patternUrl : '../../data/data/patt.hiro',
patternUrl : '../../data/data/patt.kanji',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
//////////////////////////////////////////////////////////////////////////////////
......
......@@ -58,11 +58,11 @@
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -83,7 +83,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
})
// initialize it
......@@ -111,8 +111,8 @@
scene.add(markerRoot1)
var markerControls = new THREEx.ArMarkerControls(arToolkitContext, markerRoot1, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
// add a gizmo in the center of the marker
......@@ -133,8 +133,8 @@
scene.add(markerRoot2)
var markerControls = new THREEx.ArMarkerControls(arToolkitContext, markerRoot2, {
type : 'pattern',
// patternUrl : '../../data/data/patt.hiro',
patternUrl : '../../data/data/patt.kanji',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
// add a gizmo in the center of the marker
......
......@@ -57,14 +57,14 @@
var arToolkitSource = new THREEx.ArToolkitSource({
// to read from the webcam
sourceType : 'webcam',
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -84,7 +84,7 @@
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
maxDetectionRate: 30,
canvasWidth: 80*3,
......@@ -112,8 +112,8 @@
scene.add(markerRoot)
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro'
// patternUrl : '../../data/data/patt.kanji'
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro'
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji'
})
//////////////////////////////////////////////////////////////////////////////////
......
......@@ -210,11 +210,11 @@ body {
//
// // // to read from an image
// // sourceType : 'image',
// // sourceUrl : '../../data/images/img.jpg',
// // sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
//
// // to read from a video
// // sourceType : 'video',
// // sourceUrl : '../../data/videos/headtracking.mp4',
// // sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
// })
arToolkitSource.init(function onReady(){
......@@ -234,7 +234,7 @@ body {
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
canvasWidth: 80*3,
canvasHeight: 60*3,
......@@ -261,8 +261,8 @@ body {
scene.add(markerRoot)
var artoolkitMarker = new THREEx.ArMarkerControls(arToolkitContext, markerRoot, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
})
//////////////////////////////////////////////////////////////////////////////////
......
......@@ -91,8 +91,8 @@
var artoolkitProfile = new THREEx.ArToolkitProfile()
artoolkitProfile.sourceWebcam().hiroMarker()
// artoolkitProfile.sourceVideo('../../data/videos/headtracking.mp4').kanjiMarker();
// artoolkitProfile.sourceImage('../../data/images/img.jpg').hiroMarker()
// artoolkitProfile.sourceVideo(THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4').kanjiMarker();
// artoolkitProfile.sourceImage(THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg').hiroMarker()
// artoolkitProfile.performance('desktop-fast')
if( localStorage.getItem('artoolkitPerformanceProfile') !== null ){
......
......@@ -80,11 +80,11 @@ renderer.shadowMap.enabled = true;
// to read from an image
// sourceType : 'image',
// sourceUrl : '../../data/images/img.jpg',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/images/img.jpg',
// to read from a video
// sourceType : 'video',
// sourceUrl : '../../data/videos/headtracking.mp4',
// sourceUrl : THREEx.ArToolkitContext.baseURL + '../data/videos/headtracking.mp4',
})
arToolkitSource.init(function onReady(){
......@@ -104,7 +104,7 @@ renderer.shadowMap.enabled = true;
// create atToolkitContext
var arToolkitContext = new THREEx.ArToolkitContext({
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono',
imageSmoothingEnabled: false,
// maxDetectionRate: 30,
......@@ -134,8 +134,8 @@ renderer.shadowMap.enabled = true;
var markerControls = new THREEx.ArMarkerControls(arToolkitContext, camera, {
type : 'pattern',
patternUrl : '../../data/data/patt.hiro',
// patternUrl : '../../data/data/patt.kanji',
patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.hiro',
// patternUrl : THREEx.ArToolkitContext.baseURL + '../data/data/patt.kanji',
// as we controls the camera, set changeMatrixMode: 'cameraTransformMatrix'
changeMatrixMode: 'cameraTransformMatrix'
})
......
......@@ -8,7 +8,7 @@
type: 'ArToolkitContext',
method: 'new',
args : [{
cameraParametersUrl: '../../data/data/camera_para.dat',
cameraParametersUrl: THREEx.ArToolkitContext.baseURL + '../data/data/camera_para.dat',
detectionMode: 'mono'
}]
})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册