Merge branch 'development'

Author: kovacsv

build/jsmodeler.js

@@ -1,7 +1,7 @@
 html, body
 {
 	color : #222222;
-	background : #ffffff;
+	background : #eeeeee;
 	font-size : 12px;
 	font-family : Arial, cursive;
 	margin : 0px;

build/jsmodeler.viewer.js

@@ -2800,15 +2800,6 @@
 						["id", "anything", "the id for added polygons"]
 					]
 				},
-				"MergeCoplanarPolygons" : {
-					"description" : "Merges the coplanar polygons of a body.",
-					"parameters" : [
-						["body", "Body", "the body"]
-					],
-					"returns" : [
-						["Body", "the result"]
-					]
-				},
 				"CalculatePlanarTextureCoord" : {
 					"description" : "Calculates the planar texture coordinate for a coordinate.",
 					"parameters" : [

documentation/jsmdoc/include/jsmdoc.css

@@ -98,7 +98,7 @@
 			if (content.example !== undefined) {
 				indented.appendChild (CreateElement ('div', isMember ? 'doctitle4' : 'doctitle2', 'example'));
 				var example = CreateElement ('div', 'moreindented');
-				example.appendChild (CreateElement ('pre', 'example; brush: js; toolbar: false;', content.example));
+				example.appendChild (CreateElement ('pre', 'brush: js; toolbar: false;', content.example));
 				indented.appendChild (example);
 			}
 			parentDiv.appendChild (indented);

documentation/jsmdoc/include/jsmdoc.json

@@ -68,7 +68,8 @@
 	<script type="text/javascript" src="../src/extras/csg.js"></script>
 	<script type="text/javascript" src="../src/extras/curves.js"></script>
 	<script type="text/javascript" src="../src/renderer/webglutils.js"></script>
-	<script type="text/javascript" src="../src/renderer/rendergeometry.js"></script>
+	<script type="text/javascript" src="../src/renderer/renderdata.js"></script>
+	<script type="text/javascript" src="../src/renderer/shaderprogram.js"></script>
 	<script type="text/javascript" src="../src/renderer/renderer.js"></script>
 	<script type="text/javascript" src="../src/renderer/pointcloudrenderer.js"></script>
 	<script type="text/javascript" src="../src/renderer/renderconverter.js"></script>