ProjectBuilder Update

plugins/energybalance/src/EnergyBalanceModel.cu

@@ -33,6 +33,11 @@ __device__ float evaluateEnergyBalance( float T, float R, float Qother, float ep
     //Outgoing emission flux
     float Rout = float(Nsides)*eps*5.67e-8F*T*T*T*T;
 
+    // Added by sbanks from previous commit
+    float cp_air_mol = 29.25f; //Molar specific heat of air. Units: J/mol
+    float lambda_mol = 44000.f; //Latent heat of vaporization for water. Units: J/mol
+    //
+
     //Sensible heat flux
     float QH = cp_air_mol*gH*(T-Ta); // (see Campbell and Norman Eq. 6.8)
 

plugins/plantarchitecture/CMakeLists.txt

@@ -10,8 +10,6 @@ add_library( plantarchitecture STATIC "src/PlantArchitecture.cpp;src/PlantLibrar
 set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
 
 file(GLOB_RECURSE OBJ_ASSET_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/obj/*")
-add_custom_target(copy_obj_assets ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/obj" COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OBJ_ASSET_FILES} "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/obj/" DEPENDS ${OBJ_ASSET_FILES})
-add_dependencies(plantarchitecture copy_obj_assets)
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/assets/obj"  DESTINATION "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets")
 file(GLOB_RECURSE TEXTURE_ASSET_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/textures/*")
-add_custom_target(copy_texture_assets ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/textures" COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TEXTURE_ASSET_FILES} "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/textures/" DEPENDS ${TEXTURE_ASSET_FILES})
-add_dependencies(plantarchitecture copy_texture_assets)
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/assets/textures" DESTINATION "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets")

plugins/projectbuilder/include/ProjectBuilder.h

@@ -288,6 +288,9 @@ class ProjectBuilder {
     //! User input
     bool user_input;
 
+    //! If true, the context has been updated since the last time the visualizer has been updated
+    bool is_dirty = false;
+
     //! If true, the project has been built and `visualize()` can be run.
     bool built = false;
 
@@ -398,7 +401,9 @@ class ProjectBuilder {
                                                 "peduncle", "petal", "pedicel", "fruit"};
 
     //! Bounding boxes
-    std::map<std::string, bool> bounding_boxes;
+    std::map<std::string, bool> bounding_boxes = {{"plantID", false}, {"leafID", false}, {"peduncleID", false},
+                                                  {"closedflowerID", false}, {"openflowerID", false}, {"fruitID", false},
+                                                  {"rank", false}, {"age", false}, {"carbohydrate_concentration", false}};
 
     //! Bounding boxes map
     std::map<std::string, int> bounding_boxes_map;
@@ -612,6 +617,9 @@ class ProjectBuilder {
     //! Enable coordinate axes
     bool enable_coordinate_axes = true;
 
+    //! Enable colorbar
+    bool enable_colorbar = false;
+
     //! Latitude
     float latitude = 38.55;
 
@@ -1039,8 +1047,17 @@ class ProjectBuilder {
     //! Fruit emissivity spectrum
     std::string fruit_emissivity_spectrum;
 
-    //! All possible visualization types
-    std::set<std::string> visualization_types = {"radiation_flux_PAR", "radiation_flux_NIR", "radiation_flux_LW"};
+    //! All possible visualization types for primitives
+    std::set<std::string> visualization_types_primitive = {"radiation_flux_PAR", "radiation_flux_NIR", "radiation_flux_LW"};
+
+    //! All possible visualization types for objects
+    std::set<std::string> visualization_types_object = {};
+
+    //! Primitive data types
+    std::map<std::string, helios::HeliosDataType> primitive_data_types;
+
+    //! Object data types
+    std::map<std::string, helios::HeliosDataType> object_data_types;
 
     //! Visualization type
     std::string visualization_type = "RGB";