Fix docker problem

xarray · xarray · commit 299cfecd7d31 · 2023-11-02T21:48:00.000+08:00
Fix pipeline config problem
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -156,8 +156,6 @@ ELSEIF(ANDROID)
     SET(THIRDPARTY_ROOT ${VERSE_3RDPARTY_PATH}/android)
 ELSEIF(APPLE)
     SET(THIRDPARTY_ROOT ${VERSE_3RDPARTY_PATH}/apple)
-ELSEIF(NOT CMAKE_CL_64)
-    SET(THIRDPARTY_ROOT ${VERSE_3RDPARTY_PATH}/x86)
 ENDIF()
 
 FIND_PATH(BULLET_INCLUDE_DIR btBulletDynamicsCommon.h
@@ -168,7 +166,7 @@ FIND_PATH(BULLET_INCLUDE_DIR btBulletDynamicsCommon.h
     NO_CMAKE_FIND_ROOT_PATH
 )
 
-FIND_PATH(BULLET_LIB_DIR libBulletDynamics.so BulletDynamics.lib
+FIND_PATH(BULLET_LIB_DIR libBulletDynamics.so libBulletDynamics.a BulletDynamics.lib
     PATHS ${THIRDPARTY_ROOT}/lib
     $ENV{BULLET_ROOT}/lib $ENV{BULLET_ROOT}/${FIND_LIB_POSTFIX}
     /usr/lib /usr/${FIND_LIB_POSTFIX} /usr/lib/x86_64-linux-gnu
@@ -183,7 +181,7 @@ FIND_PATH(DRACO_INCLUDE_DIR draco/draco_features.h
     NO_CMAKE_FIND_ROOT_PATH
 )
 
-FIND_PATH(DRACO_LIB_DIR libdraco.so libdraco.a draco.lib
+FIND_PATH(DRACO_LIB_DIR libdraco.so draco.lib
     PATHS ${THIRDPARTY_ROOT}/lib
     /usr/lib /usr/${FIND_LIB_POSTFIX}
     /usr/local/lib /usr/local/${FIND_LIB_POSTFIX}
@@ -192,12 +190,12 @@ FIND_PATH(DRACO_LIB_DIR libdraco.so libdraco.a draco.lib
 
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
     PATHS ${THIRDPARTY_ROOT}/include/SDL
-    /usr/include
-    /usr/local/include
+    ${THIRDPARTY_ROOT}/include/SDL2
+    /usr/include /usr/local/include
     NO_CMAKE_FIND_ROOT_PATH
 )
 
-FIND_PATH(SDL2_LIB_DIR libSDL2.so SDL2.lib
+FIND_PATH(SDL2_LIB_DIR libSDL2.so libSDL2.a SDL2.lib
     PATHS ${THIRDPARTY_ROOT}/lib
     /usr/lib /usr/${FIND_LIB_POSTFIX} /usr/lib/x86_64-linux-gnu
     /usr/local/lib /usr/local/${FIND_LIB_POSTFIX}
diff --git a/applications/viewer/viewer_main.cpp b/applications/viewer/viewer_main.cpp
@@ -184,7 +184,7 @@ int main(int argc, char** argv)
     viewer.setUpViewOnSingleScreen(0);  // Always call viewer.setUp*() before setupStandardPipeline()!
 
     // Setup the pipeline
-#if true
+#if false
     params.enablePostEffects = true; params.enableAO = true;
     setupStandardPipeline(pipeline.get(), &viewer, params);
 #else
diff --git a/assets/shaders/standard_pipeline.json b/assets/shaders/standard_pipeline.json
@@ -684,7 +684,7 @@
                 {
                     "name": "BrightnessExtracting", "type": "deferred",
                     "inputs": [ { "stage": "ShadowCombining", "name": "CombinedBuffer", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer0", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer0", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "BrightnessThreshold", "uniform_type": "float", "value": "0.7" } ],
                     "shaders": [
                         { "name": "QuadVS" },
@@ -712,35 +712,35 @@
                 {
                     "name": "BrightnessDownsampling1", "type": "deferred", "scale": 0.5,
                     "inputs": [ { "stage": "BrightnessExtracting", "name": "BrightnessBuffer0", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer1", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer1", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "InvBufferResolution", "uniform_type": "vec2", "value": "0.000260417 0.00185185" } ],
                     "shaders": [ { "name": "QuadVS" }, { "name": "BrightnessDownsampleFS" } ]
                 },
                 {
                     "name": "BrightnessDownsampling2", "type": "deferred", "scale": 0.125,
                     "inputs": [ { "stage": "BrightnessDownsampling1", "name": "BrightnessBuffer1", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer2", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer2", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "InvBufferResolution", "uniform_type": "vec2", "value": "0.0000651 0.00740741" } ],
                     "shaders": [ { "name": "QuadVS" }, { "name": "BrightnessDownsampleFS" } ]
                 },
                 {
                     "name": "BrightnessDownsampling3", "type": "deferred", "scale": 0.03125,
                     "inputs": [ { "stage": "BrightnessDownsampling2", "name": "BrightnessBuffer2", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer3", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer3", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "InvBufferResolution", "uniform_type": "vec2", "value": "0.0000162 0.0296296" } ],
                     "shaders": [ { "name": "QuadVS" }, { "name": "BrightnessDownsampleFS" } ]
                 },
                 {
                     "name": "BrightnessDownsampling4", "type": "deferred", "scale": 0.0078125,
                     "inputs": [ { "stage": "BrightnessDownsampling3", "name": "BrightnessBuffer3", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer4", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer4", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "InvBufferResolution", "uniform_type": "vec2", "value": "0.00000407 0.118519" } ],
                     "shaders": [ { "name": "QuadVS" }, { "name": "BrightnessDownsampleFS" } ]
                 },
                 {
                     "name": "BrightnessDownsampling5", "type": "deferred", "scale": 0.001953125,
                     "inputs": [ { "stage": "BrightnessDownsampling4", "name": "BrightnessBuffer4", "sampler_name": "ColorBuffer", "unit": 0 } ],
-                    "outputs": [ { "name": "BrightnessBuffer5", "format": "RGB_INT8" } ],
+                    "outputs": [ { "name": "BrightnessBuffer5", "format": "R_INT8" } ],
                     "uniforms": [ { "name": "InvBufferResolution", "uniform_type": "vec2", "value": "0.000001017 0.474074" } ],
                     "shaders": [ { "name": "QuadVS" }, { "name": "BrightnessDownsampleFS" } ]
                 },
@@ -789,11 +789,11 @@
                                 "    vec4 color5 = blur5(BrightnessBuffer4, uv0);",
                                 "    vec4 color6 = blur5(BrightnessBuffer5, uv0);",
 
-                                "    vec3 color = mix(color1.rgb, color2.rgb, color2.a);",
-                                "    color = mix(color.rgb, color3.rgb, color3.a);",
-                                "    color = mix(color.rgb, color4.rgb, color4.a);",
-                                "    color = mix(color.rgb, color5.rgb, color5.a);",
-                                "    color = mix(color.rgb, color6.rgb, color6.a);",
+                                "    vec3 color = mix(color1.rgb, color2.rgb, color2.r);",
+                                "    color = mix(color.rgb, color3.rgb, color3.r);",
+                                "    color = mix(color.rgb, color4.rgb, color4.r);",
+                                "    color = mix(color.rgb, color5.rgb, color5.r);",
+                                "    color = mix(color.rgb, color6.rgb, color6.r);",
                                 "    fragData = vec4(color, 1.0);",
                                 "    VERSE_FS_FINAL(fragData);",
                                 "}"
diff --git a/assets/shaders/standard_pipeline_wasm.json b/assets/shaders/standard_pipeline_wasm.json
@@ -774,11 +774,11 @@
                                 "    vec4 color5 = blur5(BrightnessBuffer4, uv0);",
                                 "    vec4 color6 = blur5(BrightnessBuffer5, uv0);",
 
-                                "    vec3 color = mix(color1.rgb, color2.rgb, color2.a);",
-                                "    color = mix(color.rgb, color3.rgb, color3.a);",
-                                "    color = mix(color.rgb, color4.rgb, color4.a);",
-                                "    color = mix(color.rgb, color5.rgb, color5.a);",
-                                "    color = mix(color.rgb, color6.rgb, color6.a);",
+                                "    vec3 color = mix(color1.rgb, color2.rgb, color2.r);",
+                                "    color = mix(color.rgb, color3.rgb, color3.r);",
+                                "    color = mix(color.rgb, color4.rgb, color4.r);",
+                                "    color = mix(color.rgb, color5.rgb, color5.r);",
+                                "    color = mix(color.rgb, color6.rgb, color6.r);",
                                 "    fragData = vec4(color, 1.0);",
                                 "    VERSE_FS_FINAL(fragData);",
                                 "}"
diff --git a/dockerfiles/linux/Dockerfile b/dockerfiles/linux/Dockerfile
@@ -1,4 +1,5 @@
 # !IMPORTANT!
+# Use 'docker build -t osgverse:linux -m 2GB <dockerfile_path>' to build
 # * Pass -m 2GB (or more) when building the image.
 # * Configure Docker to use disks larger than the default 20 GB.
 
@@ -33,6 +34,8 @@ RUN cd /home/osgv/Source; \
     git clone --branch release-2.28.4 https://github.com/libsdl-org/SDL.git SDL
 RUN cd /home/osgv/Source; \
     git clone --branch OpenSceneGraph-3.6.5 https://github.com/openscenegraph/OpenSceneGraph.git OpenSceneGraph
+RUN cd /home/osgv/Release; \
+    git clone https://github.com/openscenegraph/OpenSceneGraph-Data.git data
 RUN cd /home/osgv; \
     git clone https://github.com/xarray/osgverse.git osgverse
 
@@ -44,7 +47,7 @@ RUN mkdir -p /home/osgv/Builds/bullet3; cd /home/osgv/Builds/bullet3; \
 #    cmake -DCMAKE_INSTALL_PREFIX=/home/osgv/Dependencies/x64 -DCMAKE_BUILD_TYPE=Release ../../Source/ZLMediaKit; \
 #    make; make install
 RUN mkdir -p /home/osgv/Builds/draco; cd /home/osgv/Builds/draco; \
-    cmake -DCMAKE_INSTALL_PREFIX=/home/osgv/Dependencies/x64 -DCMAKE_BUILD_TYPE=Release ../../Source/draco; \
+    cmake -DCMAKE_INSTALL_PREFIX=/home/osgv/Dependencies/x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON ../../Source/draco; \
     make; make install
 RUN mkdir -p /home/osgv/Builds/SDL; cd /home/osgv/Builds/SDL; \
     cmake -DCMAKE_INSTALL_PREFIX=/home/osgv/Dependencies/x64 -DCMAKE_BUILD_TYPE=Release ../../Source/SDL; \
@@ -65,6 +68,9 @@ RUN mkdir -p /home/osgv/Builds/osgverse; cd /home/osgv/Builds/osgverse; \
 RUN bash -c 'echo -e "%manavr ALL=(ALL) NOPASSWD: ALL\n" > /etc/sudoers.d/01_manavr'
 RUN addgroup manavr && useradd -u 1000 -m osgv && usermod -aG manavr osgv
 
+# Use 'docker run -it osgverse:linux' to start the terminal
 USER osgv
 WORKDIR /home/osgv
+ENV OSG_FILE_PATH=/home/osgv/Release/data
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/osgv/Release/lib
 CMD ["/bin/bash"]
diff --git a/pipeline/SymbolManager.cpp b/pipeline/SymbolManager.cpp
@@ -304,9 +304,7 @@ void SymbolManager::initialize(osg::Group* group)
     geode2->setCullingActive(false);
     geode2->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
     geode2->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
-
     group->addChild(geode1); group->addChild(geode2);
-    group->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
 }
 
 void SymbolManager::update(osg::Group* group, unsigned int frameNo)

Original file line number	Diff line number	Diff line change
`@@ -304,9 +304,7 @@ void SymbolManager::initialize(osg::Group* group)`
`304`	`304`	`geode2->setCullingActive(false);`
`305`	`305`	`geode2->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);`
`306`	`306`	`geode2->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);`
`307`		`-`
`308`	`307`	`group->addChild(geode1); group->addChild(geode2);`
`309`		`- group->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);`
`310`	`308`	`}`
`311`	`309`
`312`	`310`	`void SymbolManager::update(osg::Group* group, unsigned int frameNo)`