Skip to content

Commit b1589e8

Browse files
author
Aaron Sillus
committed
AframeCanvasManipulator (& more)
-FlyToEntity-function not working yet -AframeActionController working with some workarounds -AframeCanvasMarkController working
1 parent 158396b commit b1589e8

9 files changed

Lines changed: 1130 additions & 926 deletions

File tree

ui/aframe.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
TODO in application auslagern
66
-->
77
<script type="text/javascript">
8-
var modelUrl = "data/aframe/modelSmall";
8+
var modelUrl = "data/aframe/model1";
99
var metaDataJsonUrl = modelUrl + "/metaData.json";
1010

1111
var canvasId = "aframe-canvas";
@@ -49,9 +49,9 @@
4949
<link rel="stylesheet" href="libs/jqwidgets/styles/jqx.metro.css" type="text/css" />
5050

5151
<script type="text/javascript" src="scripts/CanvasFilter/CanvasFilterController.js"></script>
52-
<script type="text/javascript" src="scripts/CanvasMark/CanvasMarkController.js"></script>
52+
<script type="text/javascript" src="scripts/CanvasMark/AframeCanvasMarkController.js"></script>
5353
<script type="text/javascript" src="scripts/CanvasFlyTo/CanvasFlyToController.js"></script>
54-
<script type="text/javascript" src="scripts/CanvasHover/CanvasHoverController.js"></script>
54+
<script type="text/javascript" src="scripts/CanvasHover/AframeCanvasHoverController.js"></script>
5555
<script type="text/javascript" src="scripts/CanvasSelect/CanvasSelectController.js"></script>
5656
<script type="text/javascript" src="scripts/CanvasResetView/CanvasResetViewController.js"></script>
5757
<script type="text/javascript" src="scripts/CanvasGrid/CanvasGridController.js"></script>
@@ -87,7 +87,6 @@
8787
<script>
8888
$(function(){
8989
$("#canvas").load(modelUrl + "/model.html");
90-
9190
});
9291
</script>
9392
</div>

0 commit comments

Comments
 (0)