Skip to content

Commit

Permalink
Fixed up marker id mapping to be 64 to match .png included in this ex…
Browse files Browse the repository at this point in the history
…ample.

NOTE: See jsartoolkit repos for other markers https://github.com/kig/JSARToolKit/tree/master/demos/markers
Enabled render_effects plugin to camera stream is automatically shown.
Replaced texture png with updated awe graphic.
  • Loading branch information
Rob Manson authored and Rob Manson committed Oct 15, 2016
1 parent bad25ff commit 8387618
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Binary file removed examples/marker_ar/awe_by_buildAR.png
Binary file not shown.
Binary file added examples/marker_ar/awe_orange_square.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions examples/marker_ar/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,16 @@

awe.settings.update({data:{value: 'ar'}, where:{id: 'view_mode'}})

awe.pois.add({ id:'jsartoolkit_marker_16', position: { x:0, y:0, z:0 }, visible: false });
awe.pois.add({ id:'jsartoolkit_marker_64', position: { x:0, y:0, z:0 }, visible: false });
awe.projections.add({
id:'marker_projection',
geometry: { shape: 'cube', x:50, y:50, z:50 },
position: { x:0, y:0, z:0 },
rotation: { x:0, y:0, z:180 },
material:{ type: 'phong', color: 0xFFFFFF },
texture: { path: 'awe_by_buildAR.png' },
texture: { path: 'awe_orange_square.png' },
visible: false,
}, { poi_id: 'jsartoolkit_marker_16' });
}, { poi_id: 'jsartoolkit_marker_64' });


awe.pois.add({ id:'fixed_poi', position: { x:100, y:0, z:-250 }, visible: true });
Expand All @@ -90,7 +91,7 @@
position: { x:0, y:0, z:0 },
rotation: { x:0, y:0, z:0 },
material:{ type: 'phong', color: 0xFFFFFF },
texture: { path: 'awe_by_buildAR.png' },
texture: { path: 'awe_orange_square.png' },
}, { poi_id: 'fixed_poi' });

// animate the fixed POI
Expand All @@ -102,6 +103,7 @@
where:{ id:"fixed_projection" },
});

awe.plugins.view('render_effects').enable();
awe.plugins.view('jsartoolkit').enable();
},
},
Expand Down

0 comments on commit 8387618

Please sign in to comment.