Adjust the size of the canvas and the positions af the test texts so they fit within the screen.

theom · theom · commit dad454a7f503 · 2014-11-09T21:29:54.000Z
diff --git a/allteria/static/css/style.css b/allteria/static/css/style.css
@@ -4,6 +4,6 @@
     position: absolute;
     left: 0px;
     top: 0px;
-    width: 100%;
-    height: 100%;
+    width: 1920px;
+    height: 1080px;
 }
diff --git a/allteria/static/index.html b/allteria/static/index.html
@@ -2,24 +2,24 @@
 
   <head>
     <meta charset="utf-8">
-	<link rel="stylesheet" type="text/css" href="css/style.css">
+    <link rel="stylesheet" type="text/css" href="css/style.css">
     <script type="text/javascript" src="js/three.js"></script>
     <script type="text/javascript" src="js/detector.js"></script>
-	<script type="text/javascript" src="js/threex.windowresize.js"></script>
+    <script type="text/javascript" src="js/threex.windowresize.js"></script>
     <script type="text/javascript" src="js/tween.js"></script>
-	<script type="text/javascript" src="js/allteria.js"></script>
+    <script type="text/javascript" src="js/allteria.js"></script>
   </head>
 
   <body id="body" onLoad="allteria.start();">
     <div id="canvas1"></div>
-	<script type="text/javascript" src="js/socket.js"></script>
-	<script type="text/javascript" src="js/ui_component.js"></script>
-	<script type="text/javascript" src="js/letter.js"></script>
-	<script type="text/javascript" src="js/letters.js"></script>
-	<script type="text/javascript" src="js/text_line.js"></script>
-	<script type="text/javascript" src="js/paragraph.js"></script>
-	<script type="text/javascript" src="js/button.js"></script>
-	<script type="text/javascript" src="js/world.js"></script>
+    <script type="text/javascript" src="js/socket.js"></script>
+    <script type="text/javascript" src="js/ui_component.js"></script>
+    <script type="text/javascript" src="js/letter.js"></script>
+    <script type="text/javascript" src="js/letters.js"></script>
+    <script type="text/javascript" src="js/text_line.js"></script>
+    <script type="text/javascript" src="js/paragraph.js"></script>
+    <script type="text/javascript" src="js/button.js"></script>
+    <script type="text/javascript" src="js/world.js"></script>
 	<script type="text/javascript" src="js/main.js"></script>
   </body>
   
diff --git a/allteria/static/js/world.js b/allteria/static/js/world.js
@@ -344,7 +344,7 @@ allteria.world.prototype.create_world = function create_scene()
 {
     var letter;
 
-    var pos = new three.Vector3(-1050, 100, 0);
+    var pos = new three.Vector3(-940, 100, 0);
 
     this.add_letter("A", pos);
     this.add_letter("Á", pos);
@@ -465,25 +465,25 @@ allteria.world.prototype.create_world = function create_scene()
     var s;
 
     s = new allteria.text_line("ABCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVXYÝZÞÆÖ");
-    s.translateX(-1050);
+    s.translateX(-940);
     s.translateY(line_pos);
     this.scene.add(s);
 
     s = new allteria.text_line("aábcdðeéfghiíjklmnoópqrstuúvxyýzþæö1234567890:,.?+-*/!'()@=<>")
     line_pos -= s.get_height();
-    s.translateX(-1050);
+    s.translateX(-940);
     s.translateY(line_pos);
     this.scene.add(s);
 
     s = new allteria.text_line("ninnnininin")
     line_pos -= s.get_height();
-    s.translateX(-1050);
+    s.translateX(-940);
     s.translateY(line_pos);
     this.scene.add(s);
 
     s = new allteria.text_line("This is a text line.")
     line_pos -= s.get_height();
-    s.translateX(-1050);
+    s.translateX(-940);
     s.translateY(line_pos);
     this.scene.add(s);
 
@@ -492,13 +492,13 @@ allteria.world.prototype.create_world = function create_scene()
     t += "This seems to be working correctly. ";
     var p;
     p = new allteria.paragraph(t, 100);
-    p.translateX(-1050);
+    p.translateX(-940);
     p.translateY(-200);
     this.scene.add(p);
 
-    s = new allteria.text_line("This text is editable. 0123456789", 4);
+    s = new allteria.text_line("This text is editable. 0123456789", 3);
     s.set_editable(true);
-    s.translateX(-900);
+    s.translateX(-940);
     s.translateY(250);
     this.scene.add(s);
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`position: absolute;`
`5`	`5`	`left: 0px;`
`6`	`6`	`top: 0px;`
`7`		`- width: 100%;`
`8`		`- height: 100%;`
	`7`	`+ width: 1920px;`
	`8`	`+ height: 1080px;`
`9`	`9`	`}`