basic function done

ElsaXing · ElsaXing · commit 1542555e3608 · 2016-07-14T13:35:17.000+08:00
diff --git a/CSS/index.css b/CSS/index.css
@@ -8,8 +8,9 @@
     width: 30%;
     height: 68%;
     float: right;
+    margin-top: 10px;
 }
 
 #linkButton {
-    padding: 15px;
+    margin: 15px;
 }
diff --git a/ModelViewPage.html b/ModelViewPage.html
@@ -20,6 +20,7 @@
 
 
 <div id="container"></div>
+<a href="index.html">Back to editor</a>
 <div id="menuBar">
     <div id="menu"></div>
 </div>
diff --git a/index.html b/index.html
@@ -7,7 +7,7 @@
 </head>
 <body>
     <div id="container"></div>
-    <a href="ModelViewPage.html" id="linkButton">Model View</a>
+    <a href="ModelViewPage.html" id="linkButton">Model View Page</a>
     <div id="menuBar">
         <form>
             <input type="file" id="btn_inputModel"><br>
@@ -17,6 +17,7 @@
             <button type="button" class="btn_addMesh" onclick="addPreMesh('cylinder')">cylinder</button><br>
             <button type="button" id="btn_saveScene" onclick="addDataToDatabase()">save scene</button>
             <button type="button" id="btn_getScene" onclick="getDataFromDatabase()">get scene</button>
+            <!--<button type="button" id="btn_clearScene" onclick="clearScene()">clear scene</button>-->
         </form>
         <div id="menu"></div>
     </div>
@@ -41,9 +42,32 @@
     <script src="js/deleteObject.js"></script>
     <script src="js/showUserData.js"></script>
     <script src="js/transform.js"></script>
+    <script src="js/clearScene.js"></script>
 
 
     <script>
+        var scene,
+                defaultCamera,
+                renderer,
+                light,
+                backgroundLight,
+                skyLight;
+        var DEFAULT,
+                userSceneElements,
+                sensingElements;
+        var transformGroup;
+        var groundGeo,
+                groundMat,
+                ground,
+                skyGeo,
+                skyMat,
+                sky;
+        var object;
+        var deletedObject = [];
+        var transformControls;
+        var container =document.getElementById('container');
+
+
         //set up renderer
         renderer = new THREE.WebGLRenderer({antialias: true});
         renderer.setClearColor(0xccffff);
diff --git a/js/basicScene.js b/js/basicScene.js
@@ -1,29 +1,3 @@
-/**
- * Created by Elsa on 2016/7/5.
- */
-
-var scene,
-    defaultCamera,
-    renderer,
-    light,
-    backgroundLight,
-    skyLight;
-var DEFAULT,
-    userSceneElements,
-    sensingElements;
-var transformGroup;
-var groundGeo,
-    groundMat,
-    ground,
-    skyGeo,
-    skyMat,
-    sky;
-var object;
-var deletedObject = [];
-var transformControls;
-var container =document.getElementById('container');
-
-
 function init() {
     //set up scene
     scene = new THREE.Scene();
diff --git a/js/getDataFromDatabase.js b/js/getDataFromDatabase.js
@@ -76,7 +76,7 @@ function addObject( object ) {
     } );
 
     scene.add( object );
-    transformGroup = scene.children[2];
+    transformGroup = scene.children[1];
 
 }
 
diff --git a/js/transform.js b/js/transform.js
@@ -1,6 +1,5 @@
 function transform() {
 //transform
-
     transformControls = new THREE.TransformControls( defaultCamera, container.firstElementChild);
     transformControls.addEventListener('change',render);
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@`
`8`	`8`	`width: 30%;`
`9`	`9`	`height: 68%;`
`10`	`10`	`float: right;`
	`11`	`+ margin-top: 10px;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`#linkButton {`
`14`		`- padding: 15px;`
	`15`	`+ margin: 15px;`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function addObject( object ) {`
`76`	`76`	`} );`
`77`	`77`
`78`	`78`	`scene.add( object );`
`79`		`- transformGroup = scene.children[2];`
	`79`	`+ transformGroup = scene.children[1];`
`80`	`80`
`81`	`81`	`}`
`82`	`82`