Merge remote-tracking branch 'origin/master'

Author: DanielsCreation

archive/windows/covise.iss

@@ -200,7 +200,7 @@ ShowLanguageDialog=yes
 [Types]
 Name: standard; Description: COVISE Standard Installation
 Name: custom; Description: Custom Installation; Flags: iscustom
-Name: retistry; Description: Registry only, don�t install any files
+Name: retistry; Description: Registry only, don t install any files
 [Components]
 
 Name: core; Description: COVISE core system; Types: standard custom
@@ -352,6 +352,7 @@ Source: {#CUDAPATH}\bin\*.dll; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist;
 Source: {#FFMPEG}\bin\*.dll; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist; Components: core
 Source: {#BOOST}\lib\*.dll; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist; Components: core
 Source: {#INTEL}\bin\*.dll; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist; Components: core
+Source: {#EXTERNLIBS}\all\libfbxsdk.dll; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist; Components: core
 
 Source: {#SYS}; DestDir: {#DLIB}; Flags: recursesubdirs; Components: core
 ;Source: {#XERCES}\bin\*.exe; DestDir: {#DLIB}; Flags: skipifsourcedoesntexist; Components: core
@@ -590,7 +591,7 @@ Filename: {app}\{#ARCHSUFFIX}\lib\bin\w_cproc_p_11.1.072_redist_intel64.exe; Par
 #elif ARCHSUFFIX == "amdwin64opt"
 Filename: {app}\{#ARCHSUFFIX}\lib\vcredist_x64_sp1_secfix.exe; Parameters: /Q; Description: Install VisualStudio 2005 SP1 Runtime (incl. ATL sec.fix); Flags: postinstall shellexec
 #endif
-; don�t run because environment is not yet up to date...Filename: {app}\{#ARCHSUFFIX}\bin\coviseDaemon.exe; Parameters: ; Description: Start COVISE Daemon; Flags: nowait postinstall shellexec
+; don t run because environment is not yet up to date...Filename: {app}\{#ARCHSUFFIX}\bin\coviseDaemon.exe; Parameters: ; Description: Start COVISE Daemon; Flags: nowait postinstall shellexec
           
 [UninstallDelete]   
 Type: files; Name: "{commonappdata}\Autodesk\Revit\Addins\2023\OpenFOAMInterface.addin"

bin/hlrsDemo

@@ -317,7 +317,10 @@ demo 140 "Zweite mobilitaetswoche" run_marienplatz_mobilitaetswoche
 
 demo 141 "FLOWER" vistle /data/iag/windpark_gagnon/FLOWer_Beispiel_MERIDIONAL/workflows/tracer_cluster.vsl
 
-demo 142 "EuropaPark" cover /data/mack-research/Europa-Park-Twin/presentation.wrl
+run_EP() {
+opencover opencover://plugin/GeoData /data/mack-research/Europa-Park-Twin/presentation.wrl
+}
+demo 142 "EuropaPark" run_EP
 
 # Vistle
 category="Vistle"

config/config.uwe.xml

@@ -33,7 +33,7 @@
     <UseVertexBufferObjects value="false" />
    <Input>
         <MouseNav value="true" />
-        <Device>
+        <!--Device>
 
 
            <DTrackCave driver="dtrack" port="5000" serverHost="192.168.1.2">
@@ -114,7 +114,7 @@
            <Person name="Tripod" eyeDistance="0.0" head="TripodHead" hand="CaveHand" buttons="CaveMouse" />
            <Person name="Camera" eyeDistance="0.0" head="CaveCamera" hand="CaveHand" buttons="CaveMouse" />
            <Person name="Gloves" eyeDistance="0.0" head="CaveGloves" hand="CaveHand" buttons="CaveMouse" />
-        </Persons>
+        </Persons-->
      </Input>
   <Plugin>
    <Browser logLevel="1" logFile="/tmp/browserlog.txt" />

config/config.xml

@@ -146,6 +146,11 @@
 	<!--Console value="on" file="/tmp/coverlog"/-->
    <Plugin>
 
+   <LamurePointCloud>
+   <upload value="64" />
+   <vram value="2000" />
+   <ram value="10000" />
+   </LamurePointCloud>
    <RhrClient mpiThread="false" />
    <Browser menu="true" logLevel="1" logFile="/tmp/browserlog.txt" />
 

src/OpenCOVER/fixLOD/fixLOD.cpp

@@ -39,10 +39,14 @@ int fixLOD(float factor, const std::string& filename)
         {
             nrl.push_back(ranges[i]);
         }
-        nrl[0].first = factor*plod->getRadius();
+        double newRad = factor * plod->getRadius();
+        nrl[0].first = newRad;
         nrl[0].second = 1.0E10;
-        nrl[1].first = 0.0;
-        nrl[1].second = factor*plod->getRadius();
+        for (int i = 1; i< (int)ranges.size(); i++)
+        {
+            nrl[i].first = 0.0;
+            nrl[i].second = newRad;
+        }
         plod->setRangeList(nrl);
         osgDB::writeNodeFile(*root, fn.c_str(), options);
     }