Permalink
Browse files

add viewer 2d popup

  • Loading branch information...
1 parent ba31a82 commit 311d01c298160b2cda9acbb7e7e18be6b4aeaf64 @lautr3k committed Mar 20, 2016
Showing with 40 additions and 2 deletions.
  1. +6 −0 index.html
  2. +22 −2 js/main.js
  3. +12 −0 viewer2d.html
View
@@ -33,6 +33,12 @@
<div class="body container-fluid">
<div id="sidebar">
+ <div class="form-group">
+ <button id="open-viewer-2d" class="btn btn-default btn-xs" type="button">
+ 2D viewer <span class="glyphicon glyphicon-modal-window"></span>
+ </button>
+ </div>
+
<div id="file" class="panel panel-default">
<div class="panel-heading">
<button class="panel-toggle btn btn-default btn-xs pull-right" type="button" data-toggle="collapse" data-target="#file-body">
View
@@ -44,8 +44,8 @@ var settings = new SLAcer.Settings({
}
},
screen: {
- width : 1680,
- height : 1050,
+ width : window.screen.width,
+ height : window.screen.height,
diagonal : { size: 22, unit: 'in' },
panel : {
collapsed: false,
@@ -130,6 +130,26 @@ THREE.Triangulation.setLibrary('earcut');
//THREE.Triangulation.setLibrary('libtess');
//THREE.Triangulation.setLibrary('poly2tri');
+// Viewer 2D
+var viewer2d = null;
+$openViewer2D = $('#open-viewer-2d');
+
+$openViewer2D.click(function(e) {
+ if (! viewer2d) {
+ var screen = settings.get('screen');
+ var size = 'width=' + screen.width + ', height=' + screen.height;
+ var opts = 'menubar=0, toolbar=0, location=0, directories=0, personalbar=0, status=0, resizable=1, dependent=0'
+ viewer2d = window.open('viewer2d.html', 'SLAcer.viewer2d', size + ', ' + opts);
+
+ $(viewer2d).on('beforeunload', function(e) {
+ viewer2d = null;
+ });
+ }
+
+ viewer2d.focus();
+ return false;
+});
+
// Slider
var $sliderInput = $('#slider input');
View
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <title>Viewer 2D - SLAcer.js (bêta)</title>
+ </head>
+ <body>
+ <h1>Viewer 2D</h1>
+ </body>
+</html>

0 comments on commit 311d01c

Please sign in to comment.