diff options
| author | Julie Lala <jules@okfoc.us> | 2014-04-15 20:15:31 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-04-15 20:15:31 -0400 |
| commit | 1e0cefea2daa2f757e9bd8c824c75b77c368ca07 (patch) | |
| tree | 265c3576590c267da3437d092569c2b442d2178f /rectangles.html | |
| parent | 28da2a26238ff76f87f4e086a9832a5478c35b23 (diff) | |
| parent | 9c3c0151cb2b0a824f184501ea2672ef9e87a993 (diff) | |
merge
Diffstat (limited to 'rectangles.html')
| -rw-r--r-- | rectangles.html | 64 |
1 files changed, 53 insertions, 11 deletions
diff --git a/rectangles.html b/rectangles.html index 32790d7..b415b62 100644 --- a/rectangles.html +++ b/rectangles.html @@ -3,29 +3,53 @@ <head> <link rel="stylesheet" type="text/css" href="assets/stylesheets/css.css"> <style type="text/css"> +body { background: black; } body > div { float: left; } #info { padding: 30px; } +#hud { + position: absolute; + top:0;left:0; + z-index: 10; +} +.face { + background-color: #fff; +} +.front { background-color: #f00; } +.back { background-color: #800; } +.left { background-color: #00f; } +.right { background-color: #008; } </style> </head> <body> + <div id="bg"></div> + <div id="scene"></div> -<div id="map"></div> -<div id="info"> - <select id="palette"> - <option>colors</option> - <option>redblue</option> - <option>gray</option> - <option selected>alpha</option> - </select> - <div id="intersects"></div> -</div> + <div id="hud"> + <div id="map" style="display: block"> + </div> + <div id="info"> + <select id="palette"> + <option>colors</option> + <option>redblue</option> + <option>gray</option> + <option selected>alpha</option> + </select> + <div id="intersects"></div> + </div> + </div> + </body> +<script src="assets/javascripts/vendor/jquery.min.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/tube.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/loader.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/polyfill.js"></script> <script type="text/javascript" src="assets/javascripts/util.js"></script> +<<<<<<< HEAD <script type="text/javascript" src="tree.js"></script> <script type="text/javascript" src="rect.js"></script> <script type="text/javascript" src="vec2.js"></script> @@ -262,6 +286,24 @@ function draw_mouse(){ } } } +======= +<script type="text/javascript" src="assets/javascripts/rectangles/_env.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/colors.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/debug.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/tree.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/rect.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/vec2.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/draw.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/sort.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/builder.js"></script> +<script type="text/javascript" src="assets/javascripts/rectangles/clipper.js"></script> + +<script src="assets/javascripts/mx/mx.js"></script> +<script src="assets/javascripts/mx/mx.quaternion.js"></script> +<script src="assets/javascripts/mx/extensions/mx.scene.js"></script> +<script src="assets/javascripts/mx/extensions/mx.movements.js"></script> +<script src="assets/javascripts/mx/primitives/mx.scaleBox.js"></script> +<script src="assets/javascripts/app.js"></script> +>>>>>>> 9c3c0151cb2b0a824f184501ea2672ef9e87a993 -</script> </html> |