Skip to content

Commit 1d6881c

Browse files
author
Aaron Sillus
committed
Merge branch 'aframe-port' into development
2 parents f743279 + cd444f0 commit 1d6881c

9 files changed

Lines changed: 1712 additions & 63 deletions

‎ui/aframe.html‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<!DOCTYPE html>
2+
3+
4+
<!--
5+
TODO in application auslagern
6+
-->
7+
<script type="text/javascript">
8+
var modelUrl = "data/aframe";
9+
var metaDataJsonUrl = modelUrl + "/metaData.json";
10+
11+
var canvasId = "aframe-canvas";
12+
13+
var visMode = "aframe";
14+
</script>
15+
16+
<html>
17+
<head>
18+
<title>Getaviz-A-Frame</title>
19+
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
20+
21+
<!--Main-->
22+
<script type="text/javascript" src="libs/jquery-1.11.1.js"></script>
23+
<script type="text/javascript" src="libs/typeahead.bundle.js"></script>
24+
<script type="text/javascript" src="libs/handlebars-v2.0.0.js"></script>
25+
26+
<!--A-Frame-->
27+
<script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
28+
29+
<!--jqwidgets-->
30+
<script type="text/javascript" src="libs/jqwidgets/jqxcore.js"></script>
31+
<script type="text/javascript" src="libs/jqwidgets/jqxdata.js"></script>
32+
<script type="text/javascript" src="libs/jqwidgets/jqxbuttons.js"></script>
33+
<script type="text/javascript" src="libs/jqwidgets/jqxmenu.js"></script>
34+
<script type="text/javascript" src="libs/jqwidgets/jqxsplitter.js"></script>
35+
<script type="text/javascript" src="libs/jqwidgets/jqxscrollbar.js"></script>
36+
<script type="text/javascript" src="libs/jqwidgets/jqxpanel.js"></script>
37+
<script type="text/javascript" src="libs/jqwidgets/jqxcheckbox.js"></script>
38+
<script type="text/javascript" src="libs/jqwidgets/jqxradiobutton.js"></script>
39+
<script type="text/javascript" src="libs/jqwidgets/jqxexpander.js"></script>
40+
<script type="text/javascript" src="libs/jqwidgets/jqxinput.js"></script>
41+
<script type="text/javascript" src="libs/jqwidgets/jqxnavigationbar.js"></script>
42+
<script type="text/javascript" src="libs/jqwidgets/jqxwindow.js"></script>
43+
<script type="text/javascript" src="libs/jqwidgets/jqxnotification.js"></script>
44+
<script type="text/javascript" src="libs/jqwidgets/jqxtextarea.js"></script>
45+
<script type="text/javascript" src="libs/jqwidgets/jqxswitchbutton.js"></script>
46+
47+
<link rel="stylesheet" href="libs/jqwidgets/styles/jqx.base.css" type="text/css" />
48+
<link rel="stylesheet" href="libs/jqwidgets/styles/jqx.metro.css" type="text/css" />
49+
50+
<script type="text/javascript" src="scripts/CanvasFilter/CanvasFilterController.js"></script>
51+
<script type="text/javascript" src="scripts/CanvasMark/CanvasMarkController.js"></script>
52+
<script type="text/javascript" src="scripts/CanvasFlyTo/CanvasFlyToController.js"></script>
53+
<script type="text/javascript" src="scripts/CanvasHover/CanvasHoverController.js"></script>
54+
<script type="text/javascript" src="scripts/CanvasSelect/CanvasSelectController.js"></script>
55+
<script type="text/javascript" src="scripts/CanvasResetView/CanvasResetViewController.js"></script>
56+
<script type="text/javascript" src="scripts/CanvasGrid/CanvasGridController.js"></script>
57+
<script type="text/javascript" src="scripts/RelationConnector/RelationConnectorController.js"></script>
58+
<script type="text/javascript" src="scripts/RelationTransparency/RelationTransparencyController.js"></script>
59+
<script type="text/javascript" src="scripts/RelationHighlight/RelationHighlightController.js"></script>
60+
<script type="text/javascript" src="scripts/PackageExplorer/PackageExplorerController.js"></script>
61+
<script type="text/javascript" src="scripts/Search/SearchController.js"></script>
62+
<script type="text/javascript" src="scripts/Experiment/ExperimentController.js"></script>
63+
<script type="text/javascript" src="scripts/SourceCode/SourceCodeController.js"></script>
64+
<script type="text/javascript" src="scripts/InteractionLogger/InteractionLogger.js"></script>
65+
<script type="text/javascript" src="scripts/Email/EmailController.js"></script>
66+
<script type="text/javascript" src="scripts/Menu/MenuController.js"></script>
67+
68+
<!--user interface-->
69+
<script type="text/javascript" src="scripts/DefaultLogger.js"></script>
70+
<script type="text/javascript" src="scripts/Model.js"></script>
71+
<script type="text/javascript" src="scripts/Events.js"></script>
72+
<script type="text/javascript" src="scripts/AframeCanvasManipulator.js"></script>
73+
<script type="text/javascript" src="scripts/Application.js"></script>
74+
<script type="text/javascript" src="scripts/AframeActionController.js"></script>
75+
<script type="text/javascript" src="scripts/aframe-orbit-camera-component.js"></script>
76+
77+
78+
<link rel="stylesheet" href="Style.css" type="text/css" />
79+
80+
<!--setup-->
81+
<script type="text/javascript" src="setups/test/blank.js"></script>
82+
83+
</head>
84+
<body>
85+
<div id="canvas">
86+
<script>
87+
$(function(){
88+
$("#canvas").load("data/aframe/modelSmall/model.html");
89+
90+
});
91+
</script>
92+
</div>
93+
94+
</body>
95+
</html>

‎ui/index.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
var multipartX3dUrl = modelUrl + "/multiPart.x3d";
99
var multipartJsonUrl = modelUrl + "/multiPart.json";
1010
var metaDataJsonUrl = modelUrl + "/metaData.json";
11+
12+
var canvasId = "x3dom-x3dElement-canvas";
13+
var visMode = "x3dom";
1114
</script>
1215

1316
<html>

‎ui/scripts/ActionController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var actionController = (function() {
8686
function initialize(){
8787

8888
//canvas actions
89-
var canvas = document.getElementById("x3dom-x3dElement-canvas");
89+
var canvas = document.getElementById(canvasId);
9090

9191
//mousedown
9292
canvas.onmousedown = function(eventObject){

0 commit comments

Comments
 (0)