Merge branch 'master' of github.com:ComputationalRadiationPhysics/isaac

theZiz · theZiz · commit 433a6c67557e · 2018-06-12T15:31:51.000+02:00
diff --git a/client/interface.htm b/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;
 	}
 }
 
diff --git a/example/example.cpp b/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,
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -6,8 +6,15 @@ configure_file (
 	"${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake"
 	@ONLY
 	)
+configure_file (
+    "${PROJECT_SOURCE_DIR}/ISAACBaseDir.cmake.in"
+    "${PROJECT_BINARY_DIR}/ISAACBaseDir.cmake"
+    @ONLY
+    )
 
 install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/isaac.hpp" DESTINATION "include" )
 install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/isaac" DESTINATION "include" PATTERN "mainpage.dox" EXCLUDE )
 install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/ISAACConfig.cmake" DESTINATION "lib/cmake/ISAAC" )
 install( FILES "${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake" DESTINATION "lib/cmake/ISAAC" )
+install( FILES "${PROJECT_BINARY_DIR}/ISAACBaseDir.cmake" DESTINATION "lib/cmake/ISAAC" )
+install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Modules" DESTINATION "lib/cmake/ISAAC")
diff --git a/lib/ISAACBaseDir.cmake b/lib/ISAACBaseDir.cmake
@@ -0,0 +1,10 @@
+###############################################################################
+# INCLUDES
+###############################################################################
+set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}")
+set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}/isaac")
+
+###############################################################################
+# MODULES
+###############################################################################
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ISAAC_DIR}/../Modules")
diff --git a/lib/ISAACBaseDir.cmake.in b/lib/ISAACBaseDir.cmake.in
@@ -0,0 +1,10 @@
+###############################################################################
+# INCLUDES
+###############################################################################
+set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include")
+set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/isaac")
+
+###############################################################################
+# MODULES
+###############################################################################
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/Modules")
diff --git a/lib/ISAACConfig.cmake b/lib/ISAACConfig.cmake
@@ -19,13 +19,7 @@
 cmake_minimum_required (VERSION 3.3.0)
 cmake_policy(SET CMP0048 OLD)
 
-set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}")
-set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}/isaac")
-
-###############################################################################
-# MODULES
-###############################################################################
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ISAAC_DIR}/Modules")
+include("${CMAKE_CURRENT_LIST_DIR}/ISAACBaseDir.cmake")
 
 ###############################################################################
 # OPTIONS
diff --git a/lib/isaac/isaac_compositors.hpp b/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;
diff --git a/lib/isaac/isaac_controllers.hpp b/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") )
diff --git a/lib/isaac/isaac_defines.hpp b/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
diff --git a/lib/isaac/isaac_helper.hpp b/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)
 	{
diff --git a/lib/isaac/isaac_kernel.hpp b/lib/isaac/isaac_kernel.hpp

Original file line number	Diff line number	Diff line change
`@@ -697,8 +697,11 @@ <h3 id="isaac_name"></h3>`
`697`	`697`	`var row = metadata_table.insertRow(-1);`
`698`	`698`	`var cell = row.insertCell(-1);`
`699`	`699`	`cell.innerHTML += "<b>" + element + "</b>";`
`700`		`- cell = row.insertCell(-1);`
`701`		`- cell.innerHTML += metadata[element];`
	`700`	`+ cell = row.insertCell(-1);`
	`701`	`+ var cell_string = String(metadata[element]);`
	`702`	`+ if (cell_string.length > 50)`
	`703`	`+ cell_string = cell_string.substring(0,50) + "...";`
	`704`	`+ cell.innerHTML += cell_string;`
`702`	`705`	`}`
`703`	`706`	`}`
`704`	`707`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ namespace isaac`
`21`	`21`	`struct DefaultCompositor`
`22`	`22`	`{`
`23`	`23`	`DefaultCompositor( isaac_size2 framebuffer_size ) {}`
`24`		`- ~DefaultCompositor() {}`
`25`	`24`	`static inline isaac_size2 getCompositedbufferSize( isaac_size2 framebuffer_size )`
`26`	`25`	`{`
`27`	`26`	`return framebuffer_size;`