Merge until breaking change

Author: theZiz

client/interface.htm

@@ -697,8 +697,11 @@ <h3 id="isaac_name"></h3>
 		var row = metadata_table.insertRow(-1);
 		var cell = row.insertCell(-1);
 		cell.innerHTML += "<b>" + element + "</b>";
-			cell = row.insertCell(-1);
-		cell.innerHTML += metadata[element];
+		cell = row.insertCell(-1);
+		var cell_string = String(metadata[element]);
+		if (cell_string.length > 50)
+			cell_string = cell_string.substring(0,50) + "...";
+		cell.innerHTML += cell_string;
 	}
 }
 

example/example.cpp

@@ -160,7 +160,7 @@ int main(int argc, char **argv)
 		srand(time(NULL));
 		id = rand() % 1000000;
 	}
-	MPI_Bcast(&id,sizeof(id), MPI_INT, 0, MPI_COMM_WORLD);
+	MPI_Bcast(&id,1, MPI_INT, 0, MPI_COMM_WORLD);
 	char name[32];
 	sprintf(name,"Example_%i",id);
 	printf("Using name %s\n",name);
@@ -309,6 +309,7 @@ int main(int argc, char **argv)
 
 		#if (ISAAC_STEREO == 0)
 			isaac::DefaultController,
+			//isaac::OrthoController,
 			isaac::DefaultCompositor
 		#else
 			isaac::StereoController,

lib/isaac/isaac_compositors.hpp

@@ -21,7 +21,6 @@ namespace isaac
 struct DefaultCompositor
 {
 	DefaultCompositor( isaac_size2 framebuffer_size ) {}
-	~DefaultCompositor() {}
 	static inline isaac_size2 getCompositedbufferSize( isaac_size2 framebuffer_size )
 	{
 		return framebuffer_size;

lib/isaac/isaac_controllers.hpp

@@ -21,8 +21,6 @@ namespace isaac
 struct DefaultController
 {
 	static const int pass_count = 1;
-	DefaultController() {}
-	~DefaultController() {}
 	inline bool updateProjection( IceTDouble * const projection, const isaac_size2 & framebuffer_size, json_t * const message, const bool first = false)
 	{
 		if (first)
@@ -32,14 +30,25 @@ struct DefaultController
 	inline void sendFeedback( json_t * const json_root, bool force = false ) {}
 };
 
+struct OrthoController
+{
+	static const int pass_count = 1;
+	inline bool updateProjection( IceTDouble * const projection, const isaac_size2 & framebuffer_size, json_t * const message, const bool first = false)
+	{
+		if (first)
+			setOrthographic( projection, (isaac_float)framebuffer_size.x/(isaac_float)framebuffer_size.y*isaac_float(2), isaac_float(2), ISAAC_Z_NEAR, ISAAC_Z_FAR);
+		return false;
+	}
+	inline void sendFeedback( json_t * const json_root, bool force = false ) {}
+};
+
 struct StereoController
 {
 	static const int pass_count = 2;
 	StereoController() :
 		eye_distance(0.06f),
 		send_stereo(true)
 	{}
-	~StereoController() {}
 	inline bool updateProjection( IceTDouble * const projection, const isaac_size2 & framebuffer_size, json_t * const message, const bool first = false)
 	{
 		if ( json_t* js = json_object_get(message, "eye distance") )

lib/isaac/isaac_defines.hpp

@@ -38,7 +38,7 @@
 #endif
 
 #ifndef ISAAC_GUARD_SIZE
-    #define ISAAC_GUARD_SIZE 2
+    #define ISAAC_GUARD_SIZE 1
 #endif
 
 #ifndef ISAAC_DEFAULT_STEP

lib/isaac/isaac_helper.hpp

@@ -276,6 +276,7 @@ void setFrustum(IceTDouble * const projection, const isaac_float left,const isaa
 	projection[14] = ( -znear2 * zfar ) / -zRange;
 	projection[15] = isaac_float( 0);
 }
+
 void setPerspective(IceTDouble * const projection, const isaac_float fovyInDegrees,const isaac_float aspectRatio,const isaac_float znear,const isaac_float zfar )
 {
 	isaac_float ymax = znear * tan( fovyInDegrees * M_PI / isaac_float(360) );
@@ -294,6 +295,29 @@ void spSetPerspectiveStereoscopic( IceTDouble * const projection, const isaac_fl
 	projection[12] += distance;
 }
 
+
+void setOrthographic(IceTDouble * const projection, const isaac_float right,const isaac_float top,const isaac_float znear,const isaac_float zfar )
+{
+	projection[ 0] = 1.0 / right;
+	projection[ 1] = isaac_float( 0);
+	projection[ 2] = isaac_float( 0);
+	projection[ 3] = isaac_float( 0);
+	projection[ 4] = isaac_float( 0);
+	projection[ 5] = 1.0 / top;
+	projection[ 6] = isaac_float( 0);
+	projection[ 7] = isaac_float( 0);
+	projection[ 8] = isaac_float( 0);
+	projection[ 9] = isaac_float( 0);
+	projection[10] = -2.0 / (zfar-znear);
+	projection[11] = isaac_float( 0);
+	projection[12] = isaac_float( 0);
+	projection[13] = isaac_float( 0);
+	projection[14] = - (zfar+znear) / (zfar-znear);
+	projection[15] = isaac_float( 1);
+}
+
+
+
 #if ISAAC_VALGRIND_TWEAKS == 1
 	static void *extra_malloc(size_t size)
 	{