Skip to content

Commit d4e9fbb

Browse files
Olli Etuahogreggman
Olli Etuaho
authored and
greggman
committed
Use the same core code for both Aquarium versions
Instead of having two nearly identical copies of the code, it's simpler to differentiate the VR and non-VR versions with just a simple configuration file. This switches to more similar canvas resizing logic in both VR and non-VR versions of Aquarium. The canvas is resized in non-VR mode only if fitWindow is set.
1 parent 2125186 commit d4e9fbb

File tree

8 files changed

+455
-2129
lines changed

8 files changed

+455
-2129
lines changed

‎aquarium-vr/aquarium-config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
3+
var g_aquariumConfig = {
4+
aquariumRoot: '../aquarium/',
5+
enableVR: true
6+
};

‎aquarium-vr/aquarium-vr.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@
110110
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
111111
<script type="text/javascript" src="../khronos/webgl-debug.js"></script>
112112
<script type="text/javascript" src="../tdl/base.js"></script>
113-
<script type="text/javascript" src="../aquarium/aquarium-common.js"></script>
114113
<script type="text/javascript" src="utils/vr_text_renderer.js"></script>
115114
<script type="text/javascript" src="utils/gamepad.js"></script>
116115
<script type="text/javascript" src="utils/ui.js"></script>
117-
<script type="text/javascript" src="aquarium-vr.js"></script>
116+
<script type="text/javascript" src="aquarium-config.js"></script>
117+
<script type="text/javascript" src="../aquarium/aquarium-common.js"></script>
118+
<script type="text/javascript" src="../aquarium/aquarium.js"></script>
118119
</head>
119120
<body>
120121
<div id="info"><a href="http://threedlibrary.googlecode.com" target="_blank">tdl.js</a> - aquarium</div>

0 commit comments

Comments
 (0)