Request 3991 (accepted)

sview.changes Changed

sview.spec Changed

0001-Makefile-sort-input-files.patch Deleted

@@ -1,191 +0,0 @@
-From 1c7f107a903a57908e1ff0682457433a4930422b Mon Sep 17 00:00:00 2001
-From: Olaf Hering <olaf@aepfle.de>
-Date: Sat, 11 Feb 2017 08:19:43 +0100
-Subject: Makefile -- sort input files
-
-Sorting input files helps with what Debian sells as reproducilbe builds.
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
----
- Makefile | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8f1e1c46..2c8472e9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -307,12 +307,12 @@ pre_all:
- 	cp -f -r textures/* $(BUILD_ROOT)/textures/
- 
- # StShared shared library
--aStShared_SRCS1 := $(wildcard $(SRCDIR)/StShared/*.cpp)
-+aStShared_SRCS1 := $(sort $(wildcard $(SRCDIR)/StShared/*.cpp))
- aStShared_OBJS1 := ${aStShared_SRCS1:.cpp=.o}
- aStShared_SRCS2 :=
- aStShared_OBJS2 :=
- ifeq ($(TARGET_OS),osx)
--aStShared_SRCS2 := $(wildcard $(SRCDIR)/StShared/*.mm)
-+aStShared_SRCS2 := $(sort $(wildcard $(SRCDIR)/StShared/*.mm))
- aStShared_OBJS2 := ${aStShared_SRCS2:.mm=.o}
- endif
- aStShared_LIB  := $(LIB) $(LIB_GLX) $(LIB_GTK) $(LIB_ANDROID) -lavutil -lavformat -lavcodec -lswscale -lfreetype $(LIB_CONFIG) $(LIB_PTHREAD)
-@@ -323,7 +323,7 @@ clean_StShared:
- 	rm -rf StShared/*.o
- 
- # StGLWidgets shared library
--aStGLWidgets_SRCS := $(wildcard $(SRCDIR)/StGLWidgets/*.cpp)
-+aStGLWidgets_SRCS := $(sort $(wildcard $(SRCDIR)/StGLWidgets/*.cpp))
- aStGLWidgets_OBJS := ${aStGLWidgets_SRCS:.cpp=.o}
- aStGLWidgets_LIB  := $(LIB) -lStShared $(LIB_GLX)
- $(aStGLWidgets) : pre_StGLWidgets $(aStShared) $(aStGLWidgets_OBJS)
-@@ -335,12 +335,12 @@ clean_StGLWidgets:
- 	rm -rf StGLWidgets/*.o
- 
- # StCore library
--aStCore_SRCS1 := $(wildcard $(SRCDIR)/StCore/*.cpp)
-+aStCore_SRCS1 := $(sort $(wildcard $(SRCDIR)/StCore/*.cpp))
- aStCore_OBJS1 := ${aStCore_SRCS1:.cpp=.o}
- aStCore_SRCS2 :=
- aStCore_OBJS2 :=
- ifeq ($(TARGET_OS),osx)
--aStCore_SRCS2 := $(wildcard $(SRCDIR)/StCore/*.mm)
-+aStCore_SRCS2 := $(sort $(wildcard $(SRCDIR)/StCore/*.mm))
- aStCore_OBJS2 := ${aStCore_SRCS2:.mm=.o}
- endif
- aStCore_LIB  := $(LIB) -lStShared $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD) $(LIB_XLIB) $(LIB_ANDROID) $(LIB_IOKIT)
-@@ -351,7 +351,7 @@ clean_StCore:
- 	rm -rf StCore/*.o
- 
- # StOutAnaglyph library (Anaglyph output)
--aStOutAnaglyph_SRCS := $(wildcard $(SRCDIR)/StOutAnaglyph/*.cpp)
-+aStOutAnaglyph_SRCS := $(sort $(wildcard $(SRCDIR)/StOutAnaglyph/*.cpp))
- aStOutAnaglyph_OBJS := ${aStOutAnaglyph_SRCS:.cpp=.o}
- aStOutAnaglyph_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStOutAnaglyph) : pre_StOutAnaglyph $(aStCore) $(aStOutAnaglyph_OBJS)
-@@ -373,7 +373,7 @@ clean_StOutAnaglyph:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutAnaglyph.lng
- 
- # StOutDual library (Dual output)
--aStOutDual_SRCS := $(wildcard $(SRCDIR)/StOutDual/*.cpp)
-+aStOutDual_SRCS := $(sort $(wildcard $(SRCDIR)/StOutDual/*.cpp))
- aStOutDual_OBJS := ${aStOutDual_SRCS:.cpp=.o}
- aStOutDual_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStOutDual) : pre_StOutDual $(aStCore) $(aStOutDual_OBJS)
-@@ -392,7 +392,7 @@ clean_StOutDual:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutDual.lng
- 
- # StOutIZ3D library (iZ3D monitor)
--aStOutIZ3D_SRCS := $(wildcard $(SRCDIR)/StOutIZ3D/*.cpp)
-+aStOutIZ3D_SRCS := $(sort $(wildcard $(SRCDIR)/StOutIZ3D/*.cpp))
- aStOutIZ3D_OBJS := ${aStOutIZ3D_SRCS:.cpp=.o}
- aStOutIZ3D_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStOutIZ3D) : pre_StOutIZ3D $(aStCore) $(aStOutIZ3D_OBJS)
-@@ -414,7 +414,7 @@ clean_StOutIZ3D:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutIZ3D.lng
- 
- # StOutInterlace library (Interlaced output)
--aStOutInterlace_SRCS := $(wildcard $(SRCDIR)/StOutInterlace/*.cpp)
-+aStOutInterlace_SRCS := $(sort $(wildcard $(SRCDIR)/StOutInterlace/*.cpp))
- aStOutInterlace_OBJS := ${aStOutInterlace_SRCS:.cpp=.o}
- aStOutInterlace_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStOutInterlace) : pre_StOutInterlace $(aStCore) $(aStOutInterlace_OBJS)
-@@ -436,12 +436,12 @@ clean_StOutInterlace:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutInterlace.lng
- 
- # StOutPageFlip library (Shutter glasses output)
--aStOutPageFlip_SRCS1 := $(wildcard $(SRCDIR)/StOutPageFlip/*.cpp)
-+aStOutPageFlip_SRCS1 := $(sort $(wildcard $(SRCDIR)/StOutPageFlip/*.cpp))
- aStOutPageFlip_OBJS1 := ${aStOutPageFlip_SRCS1:.cpp=.o}
- aStOutPageFlip_SRCS2 :=
- aStOutPageFlip_OBJS2 :=
- ifeq ($(TARGET_OS),osx)
--aStOutPageFlip_SRCS2 := $(wildcard $(SRCDIR)/StOutPageFlip/*.mm)
-+aStOutPageFlip_SRCS2 := $(sort $(wildcard $(SRCDIR)/StOutPageFlip/*.mm))
- aStOutPageFlip_OBJS2 := ${aStOutPageFlip_SRCS2:.mm=.o}
- endif
- aStOutPageFlip_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-@@ -461,7 +461,7 @@ clean_StOutPageFlip:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutPageFlip.lng
- 
- # StOutDistorted library
--aStOutDistorted_SRCS := $(wildcard $(SRCDIR)/StOutDistorted/*.cpp)
-+aStOutDistorted_SRCS := $(sort $(wildcard $(SRCDIR)/StOutDistorted/*.cpp))
- aStOutDistorted_OBJS := ${aStOutDistorted_SRCS:.cpp=.o}
- aStOutDistorted_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStOutDistorted) : pre_StOutDistorted $(aStCore) $(aStOutDistorted_OBJS)
-@@ -480,7 +480,7 @@ clean_StOutDistorted:
- 	rm -rf $(BUILD_ROOT)/lang/*/StOutDistorted.lng
- 
- # StImageViewer library (Image Viewer)
--aStImageViewer_SRCS := $(wildcard $(SRCDIR)/StImageViewer/*.cpp)
-+aStImageViewer_SRCS := $(sort $(wildcard $(SRCDIR)/StImageViewer/*.cpp))
- aStImageViewer_OBJS := ${aStImageViewer_SRCS:.cpp=.o}
- aStImageViewer_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStImageViewer) : pre_StImageViewer $(aStGLWidgets) outputs_all $(aStImageViewer_OBJS)
-@@ -499,11 +499,11 @@ clean_StImageViewer:
- 	rm -rf $(BUILD_ROOT)/lang/*/StImageViewer.lng
- 
- # StMoviePlayer library (Image Viewer)
--aStMoviePlayer_SRCS1 := $(wildcard $(SRCDIR)/StMoviePlayer/*.cpp)
-+aStMoviePlayer_SRCS1 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/*.cpp))
- aStMoviePlayer_OBJS1 := ${aStMoviePlayer_SRCS1:.cpp=.o}
--aStMoviePlayer_SRCS2 := $(wildcard $(SRCDIR)/StMoviePlayer/StVideo/*.cpp)
-+aStMoviePlayer_SRCS2 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/StVideo/*.cpp))
- aStMoviePlayer_OBJS2 := ${aStMoviePlayer_SRCS2:.cpp=.o}
--aStMoviePlayer_SRCS3 := $(wildcard $(SRCDIR)/StMoviePlayer/*.c)
-+aStMoviePlayer_SRCS3 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/*.c))
- aStMoviePlayer_OBJS3 := ${aStMoviePlayer_SRCS3:.c=.o}
- aStMoviePlayer_LIB   := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) -lavutil -lavformat -lavcodec -lswscale $(LIB_OPENAL) $(LIB_PTHREAD)
- $(aStMoviePlayer) : pre_StMoviePlayer $(aStGLWidgets) outputs_all $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3)
-@@ -525,7 +525,7 @@ clean_StMoviePlayer:
- 	rm -rf $(BUILD_ROOT)/web/*
- 
- # StDiagnostics library
--aStDiagnostics_SRCS := $(wildcard $(SRCDIR)/StDiagnostics/*.cpp)
-+aStDiagnostics_SRCS := $(sort $(wildcard $(SRCDIR)/StDiagnostics/*.cpp))
- aStDiagnostics_OBJS := ${aStDiagnostics_SRCS:.cpp=.o}
- aStDiagnostics_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- $(aStDiagnostics) : pre_StDiagnostics $(aStGLWidgets) outputs_all $(aStDiagnostics_OBJS)
-@@ -544,7 +544,7 @@ clean_StDiagnostics:
- 	rm -rf $(BUILD_ROOT)/lang/*/StDiagnostics.lng
- 
- # sView CAD Android JNI executable
--sViewAndroidCad_SRCS := $(wildcard $(SRCDIR)/StCADViewer/*.cpp)
-+sViewAndroidCad_SRCS := $(sort $(wildcard $(SRCDIR)/StCADViewer/*.cpp))
- sViewAndroidCad_OBJS := ${sViewAndroidCad_SRCS:.cpp=.o}
- sViewAndroidCad_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_OCCT) -lfreetype -llog -landroid -lEGL -lGLESv2 -lc
- $(sViewAndroidCad) : pre_StCADViewer $(aStGLWidgets) outputs_all $(sViewAndroidCad_OBJS)
-@@ -555,7 +555,7 @@ clean_sViewAndroidCad:
- 	rm -rf $(BUILD_ROOT)/lang/*/StCADViewer.lng
- 
- # StCADViewer library
--aStCADViewer_SRCS := $(wildcard $(SRCDIR)/StCADViewer/*.cpp)
-+aStCADViewer_SRCS := $(sort $(wildcard $(SRCDIR)/StCADViewer/*.cpp))
- aStCADViewer_OBJS := ${aStCADViewer_SRCS:.cpp=.o}
- aStCADViewer_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
- aStCADViewer_LIB  += $(LIB_OCCT)
-@@ -575,7 +575,7 @@ clean_StCADViewer:
- 	rm -rf $(BUILD_ROOT)/lang/*/StCADViewer.lng
- 
- # sView Android JNI executable
--sViewAndroid_SRCS := $(wildcard $(SRCDIR)/sview/jni/*.cpp)
-+sViewAndroid_SRCS := $(sort $(wildcard $(SRCDIR)/sview/jni/*.cpp))
- sViewAndroid_OBJS := ${sViewAndroid_SRCS:.cpp=.o}
- sViewAndroid_LIB  := $(LIB) -lStShared -lStCore -lStImageViewer -lStMoviePlayer -llog -landroid -lEGL -lGLESv2 -lc
- $(sViewAndroid) : $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid_OBJS)
-@@ -585,13 +585,13 @@ clean_sViewAndroid:
- 	rm -rf sview/jni/*.o
- 
- # sView executable
--sView_SRCS1 := $(wildcard $(SRCDIR)/sview/*.cpp)
-+sView_SRCS1 := $(sort $(wildcard $(SRCDIR)/sview/*.cpp))
- sView_OBJS1 := ${sView_SRCS1:.cpp=.o}
- sView_SRCS2 :=
- sView_OBJS2 :=
- sView_LIB_DEPS = -lX11 -ldl -lgthread-2.0
- ifeq ($(TARGET_OS),osx)
--sView_SRCS2 := $(wildcard $(SRCDIR)/sview/*.mm)
-+sView_SRCS2 := $(sort $(wildcard $(SRCDIR)/sview/*.mm))
- sView_OBJS2 := ${sView_SRCS2:.mm=.o}
- sView_LIB_DEPS = -framework Appkit
- endif

sview-16_06.tar.gz/3rdparty/libconfig/rebuild.sh Deleted

sview-16_06.tar.gz/3rdparty/openal-soft/openal-android.sh Deleted

@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# go to the script directory
-anOpenAlSrc=${BASH_SOURCE%/*}
-if [ -d "$anOpenAlSrc" ]; then cd "$anOpenAlSrc"; fi
-anOpenAlSrc="$PWD"
-
-#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-15 --install-dir=$HOME/develop/android15-armv7a --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=arm-linux-androideabi-4.9
-
-aToolchain=$HOME/develop/android-cmake/android.toolchain.cmake
-
-anApi="15"
-anAbi="armeabi-v7a"
-aPlatformAndCompiler=android-$anAbi
-aWorkDir=build/${aPlatformAndCompiler}-make
-aLogFile=$anOpenAlSrc/build-${aPlatformAndCompiler}.log
-
-aNbJobs=1
-
-mkdir -p $aWorkDir
-rm    -f $aLogFile
-
-pushd $aWorkDir
-
-set -o pipefail
-
-echo Configuring OpenAL-soft for Android...
-cmake -G "Unix Makefiles" \
- -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$aToolchain" \
- -D ANDROID_STANDALONE_TOOLCHAIN:FILEPATH="$HOME/develop/android15-armv7a" \
- -D CMAKE_BUILD_TYPE:STRING="Release" \
- -D BUILD_LIBRARY_TYPE:STRING="Shared" \
- -D ALSOFT_BACKEND_OPENSL:BOOL="ON" \
- -D ALSOFT_REQUIRE_OPENSL:BOOL="ON" \
- -D ALSOFT_BACKEND_WAVE:BOOL="OFF" \
- -D ALSOFT_EXAMPLES:BOOL="OFF" \
- -D ALSOFT_TESTS:BOOL="OFF" \
- -D ALSOFT_UTILS:BOOL="OFF" \
- -D ALSOFT_NO_CONFIG_UTIL:BOOL="ON" \
- -D ANDROID_ABI:STRING="$anAbi" \
- -D ANDROID_NATIVE_API_LEVEL:STRING="$anApi" \
- -D ANDROID_STL:STRING="gnustl_shared" \
- -D CMAKE_INSTALL_PREFIX:PATH="$anOpenAlSrc/build/$aPlatformAndCompiler" \
- "$anOpenAlSrc" | tee -a $aLogFile
-
-#-D ANDROID_NDK:FILEPATH="$HOME/develop/android-ndk-r12b"
-
-aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
-
-# make clean build
-make clean
-
-echo Building OpenAL-soft...
-make -j $aNbJobs | tee -a $aLogFile
-aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
-
-echo Installing OCCT into $anOpenAlSrc/work/$aPlatformAndCompiler...
-make install | tee -a $aLogFile
-
-#$HOME/develop/android-ndk-r12b/ndk-depends $anOpenAlSrc/build/$aPlatformAndCompiler/libopenal.so
-
-popd

sview-16_06.tar.gz/.gitattributes -> sview-17_04.tar.gz/.gitattributes Changed

sview-16_06.tar.gz/.gitignore -> sview-17_04.tar.gz/.gitignore Changed

sview-16_06.tar.gz/3rdparty/FFmpeg/rebuild.sh -> sview-17_04.tar.gz/3rdparty/FFmpeg/rebuild.sh Changed

@@ -153,7 +153,12 @@
   # WinAPI threads are used only partially in FFmpeg
   # you should use with --enable-pthreads instead to enable full multithreading support!
   #configArguments="$configArguments --enable-w32threads"
-  configArguments="$configArguments --enable-avisynth"
+  configArguments="$configArguments --disable-w32threads"
+  if [ "$rebuildLicense" == "GPL" ]; then
+    configArguments="$configArguments --enable-avisynth"
+  fi
+
+  configArguments="$configArguments --enable-libopenjpeg"
 
   # avoid dynamic linkage with libgcc_s_sjlj-1.dll
   configArguments="$configArguments --extra-ldflags=-static-libgcc"
@@ -173,7 +178,7 @@
     targetFlags="--cross-prefix=$compilerPrefix --sysroot=${androidNdkRoot}/platforms/android-15/arch-arm --arch=arm"
   fi
 
-  configArguments="$configArguments --enable-cross-compile --target-os=linux $targetFlags"
+  configArguments="$configArguments --enable-cross-compile --target-os=android $targetFlags"
   #configArguments="$configArguments --extra-cflags='-fno-builtin-sin -fno-builtin-sinf'"
 
   configArguments="$configArguments --enable-jni --enable-mediacodec"
@@ -204,7 +209,7 @@
 fi
 
 # redirect error state from tee
-set -i pipefail
+set -o pipefail
 
 aNbJobs="$(getconf _NPROCESSORS_ONLN)"
 
@@ -236,6 +241,8 @@
   cp -f libavcodec/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libavcodec/libavcodec.dylib ]; then
   cp -f -p -R libavcodec/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libavcodec/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libavcodec/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -245,6 +252,8 @@
   cp -f libavdevice/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libavdevice/libavdevice.dylib ]; then
   cp -f -p -R libavdevice/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libavdevice/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libavdevice/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -254,6 +263,8 @@
   cp -f libavfilter/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libavfilter/libavfilter.dylib ]; then
   cp -f -p -R libavfilter/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libavfilter/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libavfilter/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -263,6 +274,8 @@
   cp -f libavformat/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libavformat/libavformat.dylib ]; then
   cp -f -p -R libavformat/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libavformat/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libavformat/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -272,6 +285,8 @@
   cp -f libavutil/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libavutil/libavutil.dylib ]; then
   cp -f -p -R libavutil/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libavutil/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libavutil/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -281,6 +296,8 @@
   cp -f libswscale/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libswscale/libswscale.dylib ]; then
   cp -f -p -R libswscale/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libswscale/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libswscale/*.so* $OUTPUT_FOLDER_LIB
 fi
@@ -290,6 +307,8 @@
   cp -f libswresample/*.lib $OUTPUT_FOLDER_LIB &>/dev/null
 elif [ -f libswresample/libswresample.dylib ]; then
   cp -f -p -R libswresample/*.dylib* $OUTPUT_FOLDER_LIB
+elif [ "$rebuildAndroid" == "true" ]; then
+  cp -f -L libswresample/*.so $OUTPUT_FOLDER_LIB
 else
   cp -f -d libswresample/*.so* $OUTPUT_FOLDER_LIB
 fi

sview-17_04.tar.gz/3rdparty/FFmpeg/sview_bzip_build_mingw.sh Added

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# small help to build bzip for MinGW [for sView project]
+# http://www.bzip.org/
+
+# go to the script directory
+aScriptPath=${BASH_SOURCE%/*}
+if [ -d "$aScriptPath" ]; then
+  cd "$aScriptPath"
+fi
+
+# define number of jobs from available CPU cores
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+set -o pipefail
+
+aPathBak="$PATH"
+aLibRoot="$PWD"
+
+# apply the patch
+if grep -q 'sys\\stat.h' $aLibRoot/bzip2.c; then
+  cp -f $aLibRoot/bzip2.c $aLibRoot/bzip2.c.bak
+  sed -i 's/sys\\stat.h/sys\/stat.h/g' bzip2.c
+fi
+
+# 32-bit
+OUTPUT_FOLDER="$aLibRoot/install/bzip-mingw-win32"
+aPrefix=i686-w64-mingw32
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/lib"
+cp -f    "$aLibRoot/LICENSE" "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/README"  "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/bzlib.h" "$OUTPUT_FOLDER/include"
+
+echo "Output directory 32-bit: $OUTPUT_FOLDER"
+make clean
+make libbz2.a -j$aNbJobs CC=${aPrefix}-gcc AR=${aPrefix}-ar RANLIB=${aPrefix}-ranlib
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/libbz2.a" "$OUTPUT_FOLDER/lib"
+
+rm $OUTPUT_FOLDER/../bzip-mingw-win32.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../bzip-mingw-win32.7z $OUTPUT_FOLDER
+
+# 64-bit
+OUTPUT_FOLDER="$aLibRoot/install/bzip-mingw-win64"
+aPrefix=x86_64-w64-mingw32
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/lib"
+cp -f    "$aLibRoot/LICENSE" "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/README"  "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/bzlib.h" "$OUTPUT_FOLDER/include"
+
+echo "Output directory 64-bit: $OUTPUT_FOLDER"
+make clean
+make libbz2.a -j$aNbJobs CC=${aPrefix}-gcc AR=${aPrefix}-ar RANLIB=${aPrefix}-ranlib
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/libbz2.a" "$OUTPUT_FOLDER/lib"
+
+rm $OUTPUT_FOLDER/../bzip-mingw-win64.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../bzip-mingw-win64.7z $OUTPUT_FOLDER
+
+export "PATH=$aPathBak"

sview-17_04.tar.gz/3rdparty/FFmpeg/sview_zlib_build_mingw.sh Added

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# small help to build zlib for MinGW [for sView project]
+# http://zlib.net/
+
+# go to the script directory
+aScriptPath=${BASH_SOURCE%/*}
+if [ -d "$aScriptPath" ]; then
+  cd "$aScriptPath"
+fi
+
+# define number of jobs from available CPU cores
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+set -o pipefail
+
+aPathBak="$PATH"
+aLibRoot="$PWD"
+
+# 32-bit
+OUTPUT_FOLDER="$aLibRoot/install/zlib-mingw-win32"
+aPrefix=i686-w64-mingw32
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/lib"
+cp -f    "$aLibRoot/README" "$OUTPUT_FOLDER"
+cp -f     $aLibRoot/*.h     "$OUTPUT_FOLDER/include"
+
+echo "Output directory 32-bit: $OUTPUT_FOLDER"
+export CC=${aPrefix}-gcc
+export AR=${aPrefix}-ar
+export RANLIB=${aPrefix}-ranlib
+./configure --static
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/libz.a" "$OUTPUT_FOLDER/lib"
+
+rm $OUTPUT_FOLDER/../zlib-mingw-win32.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../zlib-mingw-win32.7z $OUTPUT_FOLDER
+
+# 64-bit
+OUTPUT_FOLDER="$aLibRoot/install/zlib-mingw-win64"
+aPrefix=x86_64-w64-mingw32
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/lib"
+cp -f    "$aLibRoot/README" "$OUTPUT_FOLDER"
+cp -f     $aLibRoot/*.h     "$OUTPUT_FOLDER/include"
+
+echo "Output directory 64-bit: $OUTPUT_FOLDER"
+export CC=${aPrefix}-gcc
+export AR=${aPrefix}-ar
+export RANLIB=${aPrefix}-ranlib
+./configure --static
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/libz.a" "$OUTPUT_FOLDER/lib"
+
+rm $OUTPUT_FOLDER/../zlib-mingw-win64.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../zlib-mingw-win64.7z $OUTPUT_FOLDER
+
+export "PATH=$aPathBak"

sview-17_04.tar.gz/3rdparty/freetype Added

sview-17_04.tar.gz/3rdparty/freetype/sview_freetype_build_android.sh Added

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# small help to build FreeType for Android [for sView project]
+# https://www.freetype.org
+
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-15 --install-dir=$HOME/develop/android15-armv7a  --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=arm-linux-androideabi-4.9
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-21 --install-dir=$HOME/develop/android21-aarch64 --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=aarch64-linux-android-4.9
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-15 --install-dir=$HOME/develop/android15-x86     --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=x86-4.9
+
+# go to the script directory
+aScriptPath=${BASH_SOURCE%/*}
+if [ -d "$aScriptPath" ]; then
+  cd "$aScriptPath"
+fi
+
+# define number of jobs from available CPU cores
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+set -o pipefail
+
+aPathBak="$PATH"
+aLibRoot="$PWD"
+aCFlagsArmv7a="-O2 -march=armv7-a -mfloat-abi=softfp"
+aCFlagsArmv8a="-O2 -march=armv8-a"
+aCFlagsx86="-O2 -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32"
+aCPrefixArmv7a="arm-linux-androideabi-"
+aCPrefixArmv8a="aarch64-linux-android-"
+aCPrefixx86="i686-linux-android-"
+
+OUTPUT_FOLDER="$aLibRoot/install/freetype-android"
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/libs/armeabi-v7a"
+mkdir -p "$OUTPUT_FOLDER/libs/x86"
+mkdir -p "$OUTPUT_FOLDER/libs/arm64-v8a"
+cp -f    "$aLibRoot/README"         "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/docs/FTL.TXT"   "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/docs/GPLv2.TXT" "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/docs/CHANGES"   "$OUTPUT_FOLDER"
+cp -f -r "$aLibRoot/include"        "$OUTPUT_FOLDER"
+rm -f -r "$OUTPUT_FOLDER/include/freetype/internal"
+echo "Output directory: $OUTPUT_FOLDER"
+
+# armv7a
+export "PATH=$HOME/develop/android15-armv7a/bin:$aPathBak"
+export "CC=${aCPrefixArmv7a}gcc"
+export "CXX=${aCPrefixArmv7a}g++"
+export "CFLAGS=$aCFlagsArmv7a"
+./configure --host arm-linux-androideabi --enable-shared --with-png=no --with-harfbuzz=no 2>&1 | tee $OUTPUT_FOLDER/config-armv7a.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/objs/.libs/libfreetype.so" "$OUTPUT_FOLDER/libs/armeabi-v7a"
+${aCPrefixArmv7a}strip --strip-unneeded     "$OUTPUT_FOLDER/libs/armeabi-v7a/libfreetype.so"
+#cp -f "$aLibRoot/objs/.libs/libfreetype.a" "$OUTPUT_FOLDER/libs/armeabi-v7a"
+
+# x86
+export "PATH=$HOME/develop/android15-x86/bin:$aPathBak"
+export "CC=${aCPrefixx86}gcc"
+export "CXX=${aCPrefixx86}g++"
+export "CFLAGS=$aCFlagsx86"
+./configure --host i686-linux-android --enable-shared --with-png=no --with-harfbuzz=no 2>&1 | tee $OUTPUT_FOLDER/config-x86.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/objs/.libs/libfreetype.so" "$OUTPUT_FOLDER/libs/x86"
+${aCPrefixx86}strip --strip-unneeded        "$OUTPUT_FOLDER/libs/x86/libfreetype.so"
+#cp -f "$aLibRoot/objs/.libs/libfreetype.a" "$OUTPUT_FOLDER/libs/x86"
+
+# armv8a
+export "PATH=$HOME/develop/android21-aarch64/bin:$aPathBak"
+export "CC=${aCPrefixArmv8a}gcc"
+export "CXX=${aCPrefixArmv8a}g++"
+export "CFLAGS=$aCFlagsArmv8a"
+./configure --host aarch64-linux-android --enable-shared --with-png=no --with-harfbuzz=no 2>&1 | tee $OUTPUT_FOLDER/config-aarch64.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+cp -f "$aLibRoot/objs/.libs/libfreetype.so" "$OUTPUT_FOLDER/libs/arm64-v8a"
+${aCPrefixArmv8a}strip --strip-unneeded     "$OUTPUT_FOLDER/libs/arm64-v8a/libfreetype.so"
+#cp -f "$aLibRoot/objs/.libs/libfreetype.a" "$OUTPUT_FOLDER/libs/arm64-v8a"
+
+export "PATH=$aPathBak"
+
+rm $OUTPUT_FOLDER/../freetype-android.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../freetype-android.7z $OUTPUT_FOLDER

sview-17_04.tar.gz/3rdparty/libconfig/sview_libconfig_build_android.sh Added

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# small help to build libconfig for Android [for sView project]
+# http://www.hyperrealm.com/libconfig/
+
+# place up-to-date config.sub to libconfig-1.4.9/aux-build
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=tree
+#wget http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#wget http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-15 --install-dir=$HOME/develop/android15-armv7a  --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=arm-linux-androideabi-4.9
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-21 --install-dir=$HOME/develop/android21-aarch64 --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=aarch64-linux-android-4.9
+#$HOME/develop/android-ndk-r12b/build/tools/make-standalone-toolchain.sh --platform=android-15 --install-dir=$HOME/develop/android15-x86     --ndk-dir=$HOME/develop/android-ndk-r12b --toolchain=x86-4.9
+
+# go to the script directory
+aScriptPath=${BASH_SOURCE%/*}
+if [ -d "$aScriptPath" ]; then
+  cd "$aScriptPath"
+fi
+
+# define number of jobs from available CPU cores
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+set -o pipefail
+
+aPathBak="$PATH"
+aLibRoot="$PWD"
+aCFlagsArmv7a="-O2 -march=armv7-a -mfloat-abi=softfp"
+aCFlagsArmv8a="-O2 -march=armv8-a"
+aCFlagsx86="-O2 -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32"
+
+OUTPUT_FOLDER="$aLibRoot/install/libconfig-android"
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/libs/armeabi-v7a"
+mkdir -p "$OUTPUT_FOLDER/libs/x86"
+mkdir -p "$OUTPUT_FOLDER/libs/arm64-v8a"
+cp -f    "$aLibRoot/COPYING.LIB"       "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/README"            "$OUTPUT_FOLDER"
+cp -f    "$aLibRoot/lib/libconfig.h"   "$OUTPUT_FOLDER/include"
+cp -f    "$aLibRoot/lib/libconfig.h++" "$OUTPUT_FOLDER/include"
+echo "Output directory: $OUTPUT_FOLDER"
+
+# armv7a
+export "PATH=$HOME/develop/android15-armv7a/bin:$aPathBak"
+export "CC=arm-linux-androideabi-gcc"
+export "CXX=arm-linux-androideabi-g++"
+export "CFLAGS=$aCFlagsArmv7a"
+export "CXXFLAGS=$aCFlagsArmv7a"
+./configure --host arm-linux-androideabi 2>&1 | tee $OUTPUT_FOLDER/config-armv7a.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+#cp -f "$aLibRoot/lib/.libs/libconfig++.so" "$OUTPUT_FOLDER/libs/armeabi-v7a"
+cp -f "$aLibRoot/lib/.libs/libconfig.a"   "$OUTPUT_FOLDER/libs/armeabi-v7a"
+cp -f "$aLibRoot/lib/.libs/libconfig++.a" "$OUTPUT_FOLDER/libs/armeabi-v7a"
+
+# x86
+export "PATH=$HOME/develop/android15-x86/bin:$aPathBak"
+export "CC=i686-linux-android-gcc"
+export "CXX=i686-linux-android-g++"
+export "CFLAGS=$aCFlagsx86"
+export "CXXFLAGS=$aCFlagsx86"
+./configure --host i686-linux-android 2>&1 | tee $OUTPUT_FOLDER/config-x86.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+#cp -f "$aLibRoot/lib/.libs/libconfig++.so" "$OUTPUT_FOLDER/libs/x86"
+cp -f "$aLibRoot/lib/.libs/libconfig.a"   "$OUTPUT_FOLDER/libs/x86"
+cp -f "$aLibRoot/lib/.libs/libconfig++.a" "$OUTPUT_FOLDER/libs/x86"
+
+# armv8a
+export "PATH=$HOME/develop/android21-aarch64/bin:$aPathBak"
+export "CC=aarch64-linux-android-gcc"
+export "CXX=aarch64-linux-android-g++"
+export "CFLAGS=$aCFlagsArmv8a"
+export "CXXFLAGS=$aCFlagsArmv8a"
+./configure --host aarch64-linux-android 2>&1 | tee $OUTPUT_FOLDER/config-aarch64.log
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+make clean
+make -j$aNbJobs
+aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+#cp -f "$aLibRoot/lib/.libs/libconfig++.so" "$OUTPUT_FOLDER/libs/arm64-v8a"
+cp -f "$aLibRoot/lib/.libs/libconfig.a"   "$OUTPUT_FOLDER/libs/arm64-v8a"
+cp -f "$aLibRoot/lib/.libs/libconfig++.a" "$OUTPUT_FOLDER/libs/arm64-v8a"
+
+export "PATH=$aPathBak"
+
+rm $OUTPUT_FOLDER/../libconfig-android.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../libconfig-android.7z $OUTPUT_FOLDER

sview-17_04.tar.gz/3rdparty/openal-soft/sview_openal_build_android.sh Added

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# go to the script directory
+anOpenAlSrc=${BASH_SOURCE%/*}
+if [ -d "$anOpenAlSrc" ]; then cd "$anOpenAlSrc"; fi
+anOpenAlSrc="$PWD"
+
+aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+
+anNdkPath=$HOME/develop/android-ndk-r12b
+aToolchain=$HOME/develop/android-cmake/android.toolchain.cmake
+
+# remove SO version from library - unsupported by Android
+if grep -q PROPERTIES\ VERSION $anOpenAlSrc/CMakeLists.txt; then
+  cp -f $anOpenAlSrc/CMakeLists.txt $anOpenAlSrc/CMakeLists.bak.txt
+  sed -i '/PROPERTIES\ VERSION/,+1 d' CMakeLists.txt
+fi
+
+cmakeBuildOpenAl() {
+  anApi="$1"
+  anAbi="$2"
+  aPlatformAndCompiler=android-$anAbi
+  aWorkDir=build/${aPlatformAndCompiler}-make
+  aLogFile=$anOpenAlSrc/build-${aPlatformAndCompiler}.log
+
+  mkdir -p $aWorkDir
+  rm    -f $aLogFile
+
+  pushd $aWorkDir
+
+  set -o pipefail
+
+  echo Configuring OpenAL-soft for Android...
+  cmake -G "Unix Makefiles" \
+ -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$aToolchain" \
+ -D ANDROID_NDK:FILEPATH="$anNdkPath" \
+ -D ANDROID_ABI:STRING="$anAbi" \
+ -D ANDROID_NATIVE_API_LEVEL:STRING="$anApi" \
+ -D ANDROID_STL:STRING="gnustl_shared" \
+ -D CMAKE_BUILD_TYPE:STRING="Release" \
+ -D BUILD_LIBRARY_TYPE:STRING="Shared" \
+ -D ALSOFT_BACKEND_OPENSL:BOOL="ON" \
+ -D ALSOFT_REQUIRE_OPENSL:BOOL="ON" \
+ -D ALSOFT_BACKEND_WAVE:BOOL="OFF" \
+ -D ALSOFT_EXAMPLES:BOOL="OFF" \
+ -D ALSOFT_TESTS:BOOL="OFF" \
+ -D ALSOFT_UTILS:BOOL="OFF" \
+ -D ALSOFT_NO_CONFIG_UTIL:BOOL="ON" \
+ -D CMAKE_INSTALL_PREFIX:PATH="$anOpenAlSrc/build/$aPlatformAndCompiler" \
+ "$anOpenAlSrc" | tee -a $aLogFile
+
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+  make clean
+
+  echo Building OpenAL-soft...
+  make -j$aNbJobs | tee -a $aLogFile
+  aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi
+
+  echo Installing OpenAL into $anOpenAlSrc/work/$aPlatformAndCompiler...
+  make install | tee -a $aLogFile
+
+  popd
+}
+
+cmakeBuildOpenAl "15" "armeabi-v7a"
+cmakeBuildOpenAl "15" "x86"
+cmakeBuildOpenAl "21" "arm64-v8a"
+
+OUTPUT_FOLDER="$anOpenAlSrc/install/openal-soft-android"
+rm -f -r "$OUTPUT_FOLDER"
+mkdir -p "$OUTPUT_FOLDER/include"
+mkdir -p "$OUTPUT_FOLDER/libs/armeabi-v7a"
+mkdir -p "$OUTPUT_FOLDER/libs/x86"
+mkdir -p "$OUTPUT_FOLDER/libs/arm64-v8a"
+cp -f    "$anOpenAlSrc/COPYING"           "$OUTPUT_FOLDER"
+cp -f    "$anOpenAlSrc/README"            "$OUTPUT_FOLDER"
+cp -f -r "$anOpenAlSrc/build/android-armeabi-v7a/include"          "$OUTPUT_FOLDER"
+cp -f -r "$anOpenAlSrc/build/android-armeabi-v7a/share"            "$OUTPUT_FOLDER"
+cp -f -L "$anOpenAlSrc/build/android-armeabi-v7a/lib/libopenal.so" "$OUTPUT_FOLDER/libs/armeabi-v7a"
+cp -f -L "$anOpenAlSrc/build/android-x86/lib/libopenal.so"         "$OUTPUT_FOLDER/libs/x86"
+cp -f -L "$anOpenAlSrc/build/android-arm64-v8a/lib/libopenal.so"   "$OUTPUT_FOLDER/libs/arm64-v8a"
+
+rm $OUTPUT_FOLDER/../openal-soft-android.7z &>/dev/null
+7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../openal-soft-android.7z $OUTPUT_FOLDER

sview-16_06.tar.gz/Makefile -> sview-17_04.tar.gz/Makefile Changed

@@ -15,7 +15,7 @@
 
 TARGET_OS = linux
 
-#ANDROID_NDK = /home/kirill/develop/android-ndk-r10
+#ANDROID_NDK = $(HOME)/develop/android-ndk-r12b
 ifeq ($(OS),Windows_NT)
 TARGET_OS = wnt
 else
@@ -40,8 +40,6 @@
 BUILD_ROOT = $(BUILD_ROOT_BUNDLE)/Contents/MacOS
 endif
 
-# folder containing OCCT resources ($CASROOT/src)
-OCCT_RES =
 FFMPEG_ROOT =
 FREETYPE_ROOT =
 OPENAL_ROOT =
@@ -88,7 +86,22 @@
 
 # Android libraries
 ifdef ANDROID_NDK
-TOOLCHAIN = $(ANDROID_NDK)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/arm-linux-androideabi/bin/
+ANDROID_EABI = armeabi-v7a
+ifeq ($(ANDROID_EABI),arm64-v8a)
+  TOOLCHAIN = $(ANDROID_NDK)/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-
+  ANDROID_SYSROOT = --sysroot=$(ANDROID_NDK)/platforms/android-21/arch-arm64
+  ANDROID_MARCH   = -march=armv8-a
+else ifeq ($(ANDROID_EABI),x86)
+  TOOLCHAIN = $(ANDROID_NDK)/toolchains/i686-linux-android-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-
+  ANDROID_SYSROOT = --sysroot=$(ANDROID_NDK)/platforms/android-15/arch-x86
+  ANDROID_MARCH   = -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32
+else
+  # armeabi-v7a
+  TOOLCHAIN = $(ANDROID_NDK)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
+  ANDROID_SYSROOT = --sysroot=$(ANDROID_NDK)/platforms/android-15/arch-arm
+  ANDROID_MARCH   = -march=armv7-a -mfloat-abi=softfp
+endif
+
 HAVE_MONGOOSE =
 LIB_PTHREAD = -lc
 LIB_GLX = -lEGL -lGLESv2
@@ -103,6 +116,8 @@
 CXX = $(TOOLCHAIN)g++
 AR  = $(TOOLCHAIN)ar
 LD  = $(TOOLCHAIN)g++
+STRIP = $(TOOLCHAIN)strip
+STRIPFLAGS = --strip-unneeded
 
 LDSTRIP = -s
 LDZDEF = -z defs
@@ -115,17 +130,19 @@
 
 # to activate debug build
 #EXTRA_CXXFLAGS = -DST_DEBUG_LOG_TO_FILE=\"/sdcard/Android/data/com.sview/files/sview.log\" -DST_DEBUG
+#EXTRA_CXXFLAGS += -DST_DEBUG_GL
 #EXTRA_CXXFLAGS += -DST_DEBUG_FFMPEG_VERBOSE
 #EXTRA_CXXFLAGS += -DST_DEBUG_SYSLOG
 #EXTRA_CXXFLAGS += -DST_DEBUG_THREADID
 #LDSTRIP =
+#STRIPFLAGS = --info
 
 ifdef ANDROID_NDK
-ANDROID_EABI = armeabi-v7a
 LIBSUBFOLDER = libs/$(ANDROID_EABI)
-EXTRA_CFLAGS   += --sysroot=$(ANDROID_NDK)/platforms/android-15/arch-arm -march=armv7-a -mfloat-abi=softfp
-EXTRA_CXXFLAGS += --sysroot=$(ANDROID_NDK)/platforms/android-15/arch-arm -march=armv7-a -mfloat-abi=softfp -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.8/include -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(ANDROID_EABI)/include -DST_HAVE_EGL -DST_NO_UPDATES_CHECK
-EXTRA_LDFLAGS  += --sysroot=$(ANDROID_NDK)/platforms/android-15/arch-arm -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(ANDROID_EABI) -lstdc++ -lgnustl_shared
+EXTRA_CFLAGS   += $(ANDROID_SYSROOT) $(ANDROID_MARCH)
+EXTRA_CXXFLAGS += $(ANDROID_SYSROOT) $(ANDROID_MARCH)
+EXTRA_CXXFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/include -DST_HAVE_EGL -DST_NO_UPDATES_CHECK
+EXTRA_LDFLAGS  += $(ANDROID_SYSROOT) -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI) -lstdc++ -lgnustl_shared
 else
 EXTRA_CFLAGS   += -mmmx -msse
 EXTRA_CXXFLAGS += -mmmx -msse
@@ -251,56 +268,47 @@
 	cp -f -r $(BUILD_ROOT)/textures/*      $(aDestAndroid)/assets/textures/
 	cp -f    license-gpl-3.0.txt           $(aDestAndroid)/assets/info/license.txt
 
-install_android_libs:
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStShared)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStGLWidgets)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStCore)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutAnaglyph)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutInterlace)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutDistorted)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStImageViewer)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStMoviePlayer)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(sViewAndroid)    $(aDestAndroid)/libs/$(ANDROID_EABI)/$(sViewAndroid)
-	cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so          $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec-*.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice-*.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat-*.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil-*.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample-*.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale-*.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
-
-install_android_cad_libs:
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStShared)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStGLWidgets)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStCore)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutAnaglyph)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutInterlace)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStOutDistorted)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStImageViewer)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/$(aStMoviePlayer)
-	ln --force --symbolic ../../../$(BUILD_ROOT)/$(sViewAndroidCad) $(aDestAndroid)/libs/$(ANDROID_EABI)/$(sViewAndroid)
-	cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so          $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec-*.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice-*.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat-*.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil-*.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample-*.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
-	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale-*.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+install_android_libs: $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid)
+	cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(sViewAndroid)    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/libgnustl_shared.so $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	$(STRIP) $(STRIPFLAGS) $(aDestAndroid)/libs/$(ANDROID_EABI)/libgnustl_shared.so
+	cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+
+install_android_cad_libs: $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroidCad)
+	cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(BUILD_ROOT)/$(sViewAndroidCad) $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/
+	cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/
 	mkdir -p $(aDestAndroid)/assets/shaders
-	mkdir -p $(aDestAndroid)/assets/shaders/occt
-	mkdir -p $(aDestAndroid)/assets/res
 	mkdir -p $(aDestAndroid)/assets/lang
-	cp -f $(OCCT_RES)/Shaders/Declarations.glsl     $(aDestAndroid)/assets/shaders/occt/
-	cp -f $(OCCT_RES)/Shaders/DeclarationsImpl.glsl $(aDestAndroid)/assets/shaders/occt/
-	cp -f $(OCCT_RES)/UnitsAPI/Lexi_Expr.dat        $(aDestAndroid)/assets/res/
-	cp -f $(OCCT_RES)/UnitsAPI/Units.dat            $(aDestAndroid)/assets/res/
-	cp -f $(OCCT_RES)/SHMessage/*.*                 $(aDestAndroid)/assets/lang/
-	cp -f $(OCCT_RES)/XSMessage/*.*                 $(aDestAndroid)/assets/lang/
-	cp -f $(OCCT_RES)/TObj/*.msg                    $(aDestAndroid)/assets/lang/
-	cp -f $(OCCT_RES)/StdResource/*                 $(aDestAndroid)/assets/res/
-	cp -f $(OCCT_RES)/XSTEPResource/*               $(aDestAndroid)/assets/res/
 
 pre_all:
 	mkdir -p $(BUILD_ROOT)/lang/English
@@ -317,12 +325,12 @@
 	cp -f -r textures/* $(BUILD_ROOT)/textures/
 
 # StShared shared library
-aStShared_SRCS1 := $(wildcard $(SRCDIR)/StShared/*.cpp)
+aStShared_SRCS1 := $(sort $(wildcard $(SRCDIR)/StShared/*.cpp))
 aStShared_OBJS1 := ${aStShared_SRCS1:.cpp=.o}
 aStShared_SRCS2 :=
 aStShared_OBJS2 :=
 ifeq ($(TARGET_OS),osx)
-aStShared_SRCS2 := $(wildcard $(SRCDIR)/StShared/*.mm)
+aStShared_SRCS2 := $(sort $(wildcard $(SRCDIR)/StShared/*.mm))
 aStShared_OBJS2 := ${aStShared_SRCS2:.mm=.o}
 endif
 aStShared_LIB  := $(LIB) $(LIB_GLX) $(LIB_GTK) $(LIB_ANDROID) -lavutil -lavformat -lavcodec -lswscale -lfreetype $(LIB_CONFIG) $(LIB_PTHREAD)
@@ -333,7 +341,7 @@
 	rm -rf StShared/*.o
 
 # StGLWidgets shared library
-aStGLWidgets_SRCS := $(wildcard $(SRCDIR)/StGLWidgets/*.cpp)
+aStGLWidgets_SRCS := $(sort $(wildcard $(SRCDIR)/StGLWidgets/*.cpp))
 aStGLWidgets_OBJS := ${aStGLWidgets_SRCS:.cpp=.o}
 aStGLWidgets_LIB  := $(LIB) -lStShared $(LIB_GLX)
 $(aStGLWidgets) : pre_StGLWidgets $(aStShared) $(aStGLWidgets_OBJS)
@@ -345,12 +353,12 @@
 	rm -rf StGLWidgets/*.o
 
 # StCore library
-aStCore_SRCS1 := $(wildcard $(SRCDIR)/StCore/*.cpp)
+aStCore_SRCS1 := $(sort $(wildcard $(SRCDIR)/StCore/*.cpp))
 aStCore_OBJS1 := ${aStCore_SRCS1:.cpp=.o}
 aStCore_SRCS2 :=
 aStCore_OBJS2 :=
 ifeq ($(TARGET_OS),osx)
-aStCore_SRCS2 := $(wildcard $(SRCDIR)/StCore/*.mm)
+aStCore_SRCS2 := $(sort $(wildcard $(SRCDIR)/StCore/*.mm))
 aStCore_OBJS2 := ${aStCore_SRCS2:.mm=.o}
 endif
 aStCore_LIB  := $(LIB) -lStShared $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD) $(LIB_XLIB) $(LIB_ANDROID) $(LIB_IOKIT)
@@ -361,7 +369,7 @@
 	rm -rf StCore/*.o
 
 # StOutAnaglyph library (Anaglyph output)
-aStOutAnaglyph_SRCS := $(wildcard $(SRCDIR)/StOutAnaglyph/*.cpp)
+aStOutAnaglyph_SRCS := $(sort $(wildcard $(SRCDIR)/StOutAnaglyph/*.cpp))
 aStOutAnaglyph_OBJS := ${aStOutAnaglyph_SRCS:.cpp=.o}
 aStOutAnaglyph_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStOutAnaglyph) : pre_StOutAnaglyph $(aStCore) $(aStOutAnaglyph_OBJS)
@@ -383,7 +391,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutAnaglyph.lng
 
 # StOutDual library (Dual output)
-aStOutDual_SRCS := $(wildcard $(SRCDIR)/StOutDual/*.cpp)
+aStOutDual_SRCS := $(sort $(wildcard $(SRCDIR)/StOutDual/*.cpp))
 aStOutDual_OBJS := ${aStOutDual_SRCS:.cpp=.o}
 aStOutDual_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStOutDual) : pre_StOutDual $(aStCore) $(aStOutDual_OBJS)
@@ -402,7 +410,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutDual.lng
 
 # StOutIZ3D library (iZ3D monitor)
-aStOutIZ3D_SRCS := $(wildcard $(SRCDIR)/StOutIZ3D/*.cpp)
+aStOutIZ3D_SRCS := $(sort $(wildcard $(SRCDIR)/StOutIZ3D/*.cpp))
 aStOutIZ3D_OBJS := ${aStOutIZ3D_SRCS:.cpp=.o}
 aStOutIZ3D_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStOutIZ3D) : pre_StOutIZ3D $(aStCore) $(aStOutIZ3D_OBJS)
@@ -424,7 +432,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutIZ3D.lng
 
 # StOutInterlace library (Interlaced output)
-aStOutInterlace_SRCS := $(wildcard $(SRCDIR)/StOutInterlace/*.cpp)
+aStOutInterlace_SRCS := $(sort $(wildcard $(SRCDIR)/StOutInterlace/*.cpp))
 aStOutInterlace_OBJS := ${aStOutInterlace_SRCS:.cpp=.o}
 aStOutInterlace_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStOutInterlace) : pre_StOutInterlace $(aStCore) $(aStOutInterlace_OBJS)
@@ -446,12 +454,12 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutInterlace.lng
 
 # StOutPageFlip library (Shutter glasses output)
-aStOutPageFlip_SRCS1 := $(wildcard $(SRCDIR)/StOutPageFlip/*.cpp)
+aStOutPageFlip_SRCS1 := $(sort $(wildcard $(SRCDIR)/StOutPageFlip/*.cpp))
 aStOutPageFlip_OBJS1 := ${aStOutPageFlip_SRCS1:.cpp=.o}
 aStOutPageFlip_SRCS2 :=
 aStOutPageFlip_OBJS2 :=
 ifeq ($(TARGET_OS),osx)
-aStOutPageFlip_SRCS2 := $(wildcard $(SRCDIR)/StOutPageFlip/*.mm)
+aStOutPageFlip_SRCS2 := $(sort $(wildcard $(SRCDIR)/StOutPageFlip/*.mm))
 aStOutPageFlip_OBJS2 := ${aStOutPageFlip_SRCS2:.mm=.o}
 endif
 aStOutPageFlip_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
@@ -471,7 +479,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutPageFlip.lng
 
 # StOutDistorted library
-aStOutDistorted_SRCS := $(wildcard $(SRCDIR)/StOutDistorted/*.cpp)
+aStOutDistorted_SRCS := $(sort $(wildcard $(SRCDIR)/StOutDistorted/*.cpp))
 aStOutDistorted_OBJS := ${aStOutDistorted_SRCS:.cpp=.o}
 aStOutDistorted_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStOutDistorted) : pre_StOutDistorted $(aStCore) $(aStOutDistorted_OBJS)
@@ -490,7 +498,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StOutDistorted.lng
 
 # StImageViewer library (Image Viewer)
-aStImageViewer_SRCS := $(wildcard $(SRCDIR)/StImageViewer/*.cpp)
+aStImageViewer_SRCS := $(sort $(wildcard $(SRCDIR)/StImageViewer/*.cpp))
 aStImageViewer_OBJS := ${aStImageViewer_SRCS:.cpp=.o}
 aStImageViewer_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStImageViewer) : pre_StImageViewer $(aStGLWidgets) outputs_all $(aStImageViewer_OBJS)
@@ -509,11 +517,11 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StImageViewer.lng
 
 # StMoviePlayer library (Image Viewer)
-aStMoviePlayer_SRCS1 := $(wildcard $(SRCDIR)/StMoviePlayer/*.cpp)
+aStMoviePlayer_SRCS1 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/*.cpp))
 aStMoviePlayer_OBJS1 := ${aStMoviePlayer_SRCS1:.cpp=.o}
-aStMoviePlayer_SRCS2 := $(wildcard $(SRCDIR)/StMoviePlayer/StVideo/*.cpp)
+aStMoviePlayer_SRCS2 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/StVideo/*.cpp))
 aStMoviePlayer_OBJS2 := ${aStMoviePlayer_SRCS2:.cpp=.o}
-aStMoviePlayer_SRCS3 := $(wildcard $(SRCDIR)/StMoviePlayer/*.c)
+aStMoviePlayer_SRCS3 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/*.c))
 aStMoviePlayer_OBJS3 := ${aStMoviePlayer_SRCS3:.c=.o}
 aStMoviePlayer_LIB   := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) -lavutil -lavformat -lavcodec -lswscale $(LIB_OPENAL) $(LIB_PTHREAD)
 $(aStMoviePlayer) : pre_StMoviePlayer $(aStGLWidgets) outputs_all $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3)
@@ -535,7 +543,7 @@
 	rm -rf $(BUILD_ROOT)/web/*
 
 # StDiagnostics library
-aStDiagnostics_SRCS := $(wildcard $(SRCDIR)/StDiagnostics/*.cpp)
+aStDiagnostics_SRCS := $(sort $(wildcard $(SRCDIR)/StDiagnostics/*.cpp))
 aStDiagnostics_OBJS := ${aStDiagnostics_SRCS:.cpp=.o}
 aStDiagnostics_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 $(aStDiagnostics) : pre_StDiagnostics $(aStGLWidgets) outputs_all $(aStDiagnostics_OBJS)
@@ -554,7 +562,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StDiagnostics.lng
 
 # sView CAD Android JNI executable
-sViewAndroidCad_SRCS := $(wildcard $(SRCDIR)/StCADViewer/*.cpp)
+sViewAndroidCad_SRCS := $(sort $(wildcard $(SRCDIR)/StCADViewer/*.cpp))
 sViewAndroidCad_OBJS := ${sViewAndroidCad_SRCS:.cpp=.o}
 sViewAndroidCad_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_OCCT) -lfreetype -llog -landroid -lEGL -lGLESv2 -lc
 $(sViewAndroidCad) : pre_StCADViewer $(aStGLWidgets) outputs_all $(sViewAndroidCad_OBJS)
@@ -565,7 +573,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StCADViewer.lng
 
 # StCADViewer library
-aStCADViewer_SRCS := $(wildcard $(SRCDIR)/StCADViewer/*.cpp)
+aStCADViewer_SRCS := $(sort $(wildcard $(SRCDIR)/StCADViewer/*.cpp))
 aStCADViewer_OBJS := ${aStCADViewer_SRCS:.cpp=.o}
 aStCADViewer_LIB  := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
 aStCADViewer_LIB  += $(LIB_OCCT)
@@ -585,7 +593,7 @@
 	rm -rf $(BUILD_ROOT)/lang/*/StCADViewer.lng
 
 # sView Android JNI executable
-sViewAndroid_SRCS := $(wildcard $(SRCDIR)/sview/jni/*.cpp)
+sViewAndroid_SRCS := $(sort $(wildcard $(SRCDIR)/sview/jni/*.cpp))
 sViewAndroid_OBJS := ${sViewAndroid_SRCS:.cpp=.o}
 sViewAndroid_LIB  := $(LIB) -lStShared -lStCore -lStImageViewer -lStMoviePlayer -llog -landroid -lEGL -lGLESv2 -lc
 $(sViewAndroid) : $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid_OBJS)
@@ -595,13 +603,13 @@
 	rm -rf sview/jni/*.o
 
 # sView executable
-sView_SRCS1 := $(wildcard $(SRCDIR)/sview/*.cpp)
+sView_SRCS1 := $(sort $(wildcard $(SRCDIR)/sview/*.cpp))
 sView_OBJS1 := ${sView_SRCS1:.cpp=.o}
 sView_SRCS2 :=
 sView_OBJS2 :=
 sView_LIB_DEPS = -lX11 -ldl -lgthread-2.0
 ifeq ($(TARGET_OS),osx)
-sView_SRCS2 := $(wildcard $(SRCDIR)/sview/*.mm)
+sView_SRCS2 := $(sort $(wildcard $(SRCDIR)/sview/*.mm))
 sView_OBJS2 := ${sView_SRCS2:.mm=.o}
 sView_LIB_DEPS = -framework Appkit
 endif

sview-16_06.tar.gz/StCADViewer/AndroidManifest.xml -> sview-17_04.tar.gz/StCADViewer/AndroidManifest.xml Changed

@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.sview.cadviewer"
           android:versionCode="1"
-          android:versionName="16.03">
+          android:versionName="16.12"
+          android:installLocation="auto">
     <application android:label="@string/app_name"
                  android:hasCode="true"
                  android:icon="@drawable/ic_launcher">
@@ -26,6 +27,8 @@
 
                 <data android:mimeType="model/iges"/>
                 <data android:mimeType="model/step"/>
+                <data android:mimeType="model/gltf+json"/>
+                <data android:mimeType="model/gltf.binary"/>
 
                 <data android:mimeType="application/iges"/>
                 <data android:mimeType="application/step"/>
@@ -56,6 +59,19 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.brep"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.BREP"/>
 
+                <data android:pathPattern=".*\\.xbf"/>
+                <data android:pathPattern=".*\\.XBF"/>
+                <data android:pathPattern=".*\\..*\\.xbf"/>
+                <data android:pathPattern=".*\\..*\\.XBF"/>
+                <data android:pathPattern=".*\\..*\\..*\\.xbf"/>
+                <data android:pathPattern=".*\\..*\\..*\\.XBF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.xbf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.XBF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.xbf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.XBF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.xbf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.XBF"/>
+
                 <data android:pathPattern=".*\\.rle"/>
                 <data android:pathPattern=".*\\.RLE"/>
                 <data android:pathPattern=".*\\..*\\.rle"/>
@@ -120,6 +136,32 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.IGES"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.iges"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.IGES"/>
+
+                <data android:pathPattern=".*\\.gltf"/>
+                <data android:pathPattern=".*\\.GLTF"/>
+                <data android:pathPattern=".*\\..*\\.gltf"/>
+                <data android:pathPattern=".*\\..*\\.GLTF"/>
+                <data android:pathPattern=".*\\..*\\..*\\.gltf"/>
+                <data android:pathPattern=".*\\..*\\..*\\.GLTF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.gltf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.GLTF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gltf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.GLTF"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gltf"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.GLTF"/>
+
+                <data android:pathPattern=".*\\.glb"/>
+                <data android:pathPattern=".*\\.GLB"/>
+                <data android:pathPattern=".*\\..*\\.glb"/>
+                <data android:pathPattern=".*\\..*\\.GLB"/>
+                <data android:pathPattern=".*\\..*\\..*\\.glb"/>
+                <data android:pathPattern=".*\\..*\\..*\\.GLB"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.glb"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.GLB"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.glb"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.GLB"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.glb"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.GLB"/>
             </intent-filter>
         </activity>
     </application>

sview-17_04.tar.gz/StCADViewer/StAssetDocument.cpp Added

sview-17_04.tar.gz/StCADViewer/StAssetDocument.h Added

@@ -0,0 +1,142 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StAssetDocument_h_
+#define __StAssetDocument_h_
+
+#include "StPrimArray.h"
+
+#include <NCollection_Vector.hxx>
+#include <NCollection_Sequence.hxx>
+
+/**
+ * Type of the document node.
+ */
+enum StDocNodeType {
+    StDocNodeType_Node,   //!< general node type containing child of any type
+    StDocNodeType_Object, //!< object node type
+    StDocNodeType_Mesh,   //!< mesh node
+    StDocNodeType_Unknown //!< invalid node type
+};
+
+/**
+ * Basic document node.
+ */
+class StDocNode : public Standard_Transient {
+
+    DEFINE_STANDARD_RTTI_INLINE(StDocNode, Standard_Transient)
+
+        public:
+
+    /**
+     * Return node type.
+     */
+    StDocNodeType nodeType() const { return myNodeType; }
+
+    /**
+     * Return node name.
+     */
+    const StString& nodeName() const { return myNodeName; }
+
+    /**
+     * Assign node name.
+     */
+    void setNodeName(const StString& theName) { myNodeName = theName; }
+
+    /**
+     * Return node local transformation (relative to the parent node).
+     */
+    const gp_Trsf& nodeTransformation() const { return myTrsf; }
+
+    /**
+     * Assign node local transformation.
+     */
+    void setNodeTransformation(const gp_Trsf& theTrsf) { myTrsf = theTrsf; }
+
+    /**
+     * Access child nodes.
+     */
+    const NCollection_Sequence<Handle(StDocNode)>& Children() const { return myChildren; }
+
+    /**
+     * Modify child nodes.
+     */
+    NCollection_Sequence<Handle(StDocNode)>& ChangeChildren() { return myChildren; }
+
+        protected:
+
+    /**
+     * Protected constructor.
+     */
+    StDocNode(StDocNodeType theNodeType) : myNodeType(theNodeType) {}
+
+        protected:
+
+    NCollection_Sequence<Handle(StDocNode)> myChildren; //!< child nodes
+    StString      myNodeName; //!< node name
+    StDocNodeType myNodeType; //!< node type
+    gp_Trsf       myTrsf;     //!< node local transformation
+
+};
+
+/**
+ * The document node holding object(s).
+ */
+class StDocObjectNode : public StDocNode {
+
+    DEFINE_STANDARD_RTTI_INLINE(StDocObjectNode, StDocNode)
+
+        public:
+
+    /**
+     * Empty constructor.
+     */
+    StDocObjectNode() : StDocNode(StDocNodeType_Object) {}
+
+};
+
+/**
+ * The document node holding Mesh object (list of primitive arrays).
+ */
+class StDocMeshNode : public StDocNode {
+
+    DEFINE_STANDARD_RTTI_INLINE(StDocMeshNode, StDocNode)
+
+        public:
+
+    /**
+     * Empty constructor.
+     */
+    StDocMeshNode() : StDocNode(StDocNodeType_Mesh) {}
+
+    /**
+     * Access primitive arrays.
+     */
+    const NCollection_Sequence<Handle(StPrimArray)>& PrimitiveArrays() const { return myPrimArrays; }
+
+    /**
+     * Modify primitive arrays.
+     */
+    NCollection_Sequence<Handle(StPrimArray)>& ChangePrimitiveArrays() { return myPrimArrays; }
+
+        protected:
+
+    NCollection_Sequence<Handle(StPrimArray)> myPrimArrays; //!< primitive arrays
+
+};
+
+/**
+ * Document definition.
+ */
+class StAssetDocument : public StDocObjectNode {
+
+        public:
+
+    ST_LOCAL StAssetDocument();
+
+};
+
+#endif //__StAssetDocument_h_

sview-17_04.tar.gz/StCADViewer/StAssetImportGltf.cpp Added

@@ -0,0 +1,1465 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016-2017
+ */
+
+#ifdef _WIN32
+    #define NOMINMAX
+#endif
+
+#include "StAssetImportGltf.h"
+
+#include "StImageOcct.h"
+
+#include <StStrings/StLogger.h>
+#include <StTemplates/StArrayStreamBuffer.h>
+
+#include <Graphic3d_Mat4d.hxx>
+#include <Graphic3d_Vec.hxx>
+#include <gp_Quaternion.hxx>
+#include <NCollection_Buffer.hxx>
+#include <OSD_OpenFile.hxx>
+#include <Precision.hxx>
+
+namespace
+{
+    /**
+     * Material extension.
+     */
+    const char THE_KHR_materials_common[] = "KHR_materials_common";
+    const char THE_KHR_binary_glTF[]      = "KHR_binary_glTF";
+
+    //! Look-up table for decoding base64 stream.
+    static const stUByte_t THE_BASE64_FROM[128] = {
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,  62, 255,  62, 255,  63,
+         52,  53,  54,  55,  56,  57,  58,  59,  60,  61, 255, 255,   0, 255, 255, 255,
+        255,   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+         15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25, 255, 255, 255, 255,  63,
+        255,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,
+         41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51, 255, 255, 255, 255, 255
+    };
+
+    /**
+     * Function decoding base64 stream.
+     */
+    Handle(NCollection_Buffer) decodeBase64(const stUByte_t* theStr,
+                                            const size_t theLen) {
+        Handle(NCollection_Buffer) aData = new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator());
+        if(!aData->Allocate (3 * theLen / 4)) {
+            ST_ERROR_LOG("Fail to allocate memory.");
+            return Handle(NCollection_Buffer)();
+        }
+
+        stUByte_t* aDataPtr = aData->ChangeData();
+        const stUByte_t* anEnd = theStr + theLen;
+        for(const stUByte_t* aByteIter = theStr; aByteIter < anEnd; aByteIter += 4) {
+            // get values for each group of four base 64 characters
+            const stUByte_t b4[4] = {
+                aByteIter + 0 < anEnd && aByteIter[0] <= 'z' ? THE_BASE64_FROM[aByteIter[0]] : stUByte_t(0xFF),
+                aByteIter + 1 < anEnd && aByteIter[1] <= 'z' ? THE_BASE64_FROM[aByteIter[1]] : stUByte_t(0xFF),
+                aByteIter + 2 < anEnd && aByteIter[2] <= 'z' ? THE_BASE64_FROM[aByteIter[2]] : stUByte_t(0xFF),
+                aByteIter + 3 < anEnd && aByteIter[3] <= 'z' ? THE_BASE64_FROM[aByteIter[3]] : stUByte_t(0xFF)
+            };
+
+            // transform into a group of three bytes
+            const stUByte_t b3[3] = {
+                stUByte_t(((b4[0] & 0x3F) << 2) + ((b4[1] & 0x30) >> 4)),
+                stUByte_t(((b4[1] & 0x0F) << 4) + ((b4[2] & 0x3C) >> 2)),
+                stUByte_t(((b4[2] & 0x03) << 6) + ((b4[3] & 0x3F) >> 0))
+            };
+
+            // add the byte to the return value if it isn't part of an '=' character (indicated by 0xFF)
+            if(b4[1] != 0xFF) {
+                *aDataPtr = b3[0];
+                ++aDataPtr;
+            }
+            if(b4[2] != 0xFF) {
+                *aDataPtr = b3[1];
+                ++aDataPtr;
+            }
+            if(b4[3] != 0xFF) {
+                *aDataPtr = b3[2];
+                ++aDataPtr;
+            }
+        }
+
+        return aData;
+    }
+
+    /**
+     * Find member of the object in a safe way.
+     */
+    static const rapidjson::Document::GenericValue* findObjectMember(const rapidjson::Document::GenericValue& theObject,
+                                                                     const char*  theName) {
+        if(!theObject.IsObject()) {
+            return NULL;
+        }
+
+        rapidjson::Document::ConstMemberIterator anIter = theObject.FindMember(theName);
+        return anIter != theObject.MemberEnd()
+             ? &anIter->value
+             : NULL;
+    }
+
+}
+
+/**
+ * Image texture embedded into binary glTF file.
+ */
+class StGltfBinTexture : public StAssetTexture {
+
+    DEFINE_STANDARD_RTTI_INLINE(StGltfBinTexture, StAssetTexture)
+
+        public:
+
+    /**
+     * Constructor.
+     */
+    StGltfBinTexture(const StString& theUri,
+                     const StString& theMime,
+                     const int64_t theStart,
+                     const int theLen)
+    : StAssetTexture(theUri),
+      myStart(theStart),
+      myLen(theLen),
+      myMime(theMime) {
+        if(!theUri.isEmpty()) {
+            const StString anId = StString("texture://") + theUri + "@offset=" + StString(theStart) + "@len=" + StString(theLen);
+            myTexId = anId.toCString();
+        }
+    }
+
+    /**
+     * Constructor.
+     */
+    StGltfBinTexture(const StString& theUri,
+                     const StString& theMime,
+                     const Handle(NCollection_Buffer)& theBuffer)
+    : StAssetTexture(theUri),
+      myStart(0),
+      myLen(0),
+      myBuffer(theBuffer),
+      myMime(theMime) {
+        if(!theUri.isEmpty()) {
+            const StString anId = StString("texture://") + theUri + "@base64";
+            myTexId = anId.toCString();
+        }
+    }
+
+    /**
+     * Image getter.
+     */
+    virtual Handle(Image_PixMap) GetImage() const Standard_OVERRIDE {
+        Handle(Image_PixMap) anImage;
+        if(!myBuffer.IsNull()) {
+            Handle(StImageOcct) anStImage = new StImageOcct();
+            if(anStImage->Load(myImageUri, StMIME(myMime, StString(), StString()), myBuffer->ChangeData(), (int )myBuffer->Size())) {
+                anImage = anStImage;
+            }
+        } else {
+            std::ifstream aFile;
+            OSD_OpenStream(aFile, myImageUri.toCString(), std::ios::in | std::ios::binary);
+            if(!aFile.is_open() || !aFile.good()) {
+                ST_ERROR_LOG(StString() + "Texture points to non existing file '" + myImageUri.toCString() + "'");
+                return false;
+            }
+
+            aFile.seekg(myStart, std::ios_base::beg);
+            if(!aFile.good()) {
+                aFile.close();
+                ST_ERROR_LOG(StString() + "Texture refers to non-existing location");
+                return false;
+            }
+
+            Handle(NCollection_Buffer) aData = new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator());
+            if(!aData->Allocate(myLen)) {
+                ST_ERROR_LOG("Fail to allocate memory.");
+                return false;
+            }
+
+            if(!aFile.read((char* )aData->ChangeData(), myLen)) {
+                ST_ERROR_LOG(StString() + "Texture refers to non-existing location");
+                return false;
+            }
+
+            Handle(StImageOcct) anStImage = new StImageOcct();
+            if(anStImage->Load(myImageUri, StMIME(myMime, StString(), StString()), aData->ChangeData(), myLen)) {
+                anImage = anStImage;
+            }
+        }
+
+        if(anImage.IsNull()) {
+            return Handle(Image_PixMap)();
+        }
+        return anImage;
+    }
+
+    /**
+     * Compare with another texture.
+     */
+    virtual bool isEqual(const StAssetTexture& theOther) const {
+        return myTexId == theOther.GetId();
+    }
+
+        private:
+
+    int64_t myStart;
+    int     myLen;
+    Handle(NCollection_Buffer) myBuffer;
+    StString myMime;
+
+};
+
+void StAssetImportGltf::GltfElementMap::init(const TCollection_AsciiString& theRootName,
+                                             const GenericValue* theRoot) {
+    myRoot = theRoot;
+    myChildren.Clear();
+    if(theRoot == NULL) {
+        return;
+    }
+
+    if(theRoot->IsObject()) {
+        // glTF 1.0
+        for(ConstMemberIterator aChildIter = theRoot->MemberBegin(); aChildIter != theRoot->MemberEnd(); ++aChildIter) {
+            if(!aChildIter->name.IsString()) {
+                continue;
+            }
+
+            const TCollection_AsciiString aKey(aChildIter->name.GetString());
+            if(!myChildren.Bind(aKey, &aChildIter->value)) {
+                ST_DEBUG_LOG("Warning! Invalid glTF syntax - key '" + aKey.ToCString() + "' is already defined in '" + theRootName.ToCString() + "'.");
+            }
+        }
+    } else if(theRoot->IsArray()) {
+        // glTF 2.0
+        int aChildIndex = 0;
+        for(rapidjson::Value::ConstValueIterator aChildIter = theRoot->Begin(); aChildIter != theRoot->End(); ++aChildIter, ++aChildIndex) {
+            myChildren.Bind(TCollection_AsciiString(aChildIndex), aChildIter);
+        }
+    }
+}
+
+StString StAssetImportGltf::formatSyntaxError(const StString& theFilePath,
+                                              const StString& theLibDescr) {
+    StString aFileName, aFolderName;
+    StFileNode::getFolderAndFile(theFilePath, aFolderName, aFileName);
+    ST_ERROR_LOG("Invalid syntax within glTF document \"" + theFilePath + "\" (" + theLibDescr + ')');
+    return StString("Invalid syntax within glTF document\n\"") + aFileName + "\"\n" + theLibDescr;
+}
+
+bool StAssetImportGltf::probeFormatFromHeader(const char* theHeader,
+                                              const StString& theExt) {
+    return ::memcmp(theHeader, "glTF", 4) == 0
+         || theExt.isEqualsIgnoreCase(stCString("gltf"));
+}
+
+bool StAssetImportGltf::probeFormatFromExtension(const StString& theExt) {
+    return theExt.isEqualsIgnoreCase(stCString("gltf"))
+        || theExt.isEqualsIgnoreCase(stCString("glb"));
+}
+
+StAssetImportGltf::StAssetImportGltf()
+: myBinBodyOffset(0),
+  myBinBodyLen(0),
+  myIsBinary(false) {
+    //
+}
+
+bool StAssetImportGltf::load(const Handle(StDocNode)& theParentNode,
+                             const StString& theFile) {
+    myFileName = theFile;
+    StString aName;
+    StFileNode::getFolderAndFile(theFile, myFolder, aName);
+    if(!myFolder.isEmpty()) {
+        myFolder += SYS_FS_SPLITTER;
+    }
+
+    std::ifstream aFile;
+    OSD_OpenStream(aFile, theFile.toCString(), std::ios::in | std::ios::binary);
+    if(!aFile.is_open() || !aFile.good()) {
+        signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' is not found!"));
+        return false;
+    }
+
+    char aGlbHeader[12] = {};
+    aFile.read(aGlbHeader, sizeof(aGlbHeader));
+    int64_t aJsonBodyOffset = 0;
+    int64_t aJsonBodyLen    = 0;
+    if(::strncmp(aGlbHeader, "glTF", 4) == 0) {
+        myIsBinary = true;
+        const uint32_t* aVer = (const uint32_t* )(aGlbHeader + 4);
+        const uint32_t* aLen = (const uint32_t* )(aGlbHeader + 8);
+        if(*aVer == 1) {
+            if(*aLen < 20) {
+                signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' has broken glTF format!"));
+                return false;
+            }
+
+            char aHeader1[8] = {};
+            aFile.read(aHeader1, sizeof(aHeader1));
+
+            const uint32_t* aSceneLen    = (const uint32_t* )(aHeader1 + 0);
+            const uint32_t* aSceneFormat = (const uint32_t* )(aHeader1 + 4);
+            aJsonBodyOffset = 20;
+            aJsonBodyLen    = int64_t(*aSceneLen);
+
+            myBinBodyOffset = aJsonBodyOffset + aJsonBodyLen;
+            myBinBodyLen    = int64_t(*aLen) - myBinBodyOffset;
+            if(*aSceneFormat != 0) {
+                signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' is written using unsupported Scene format!"));
+                return false;
+            }
+        } else { //if (*aVer == 2) {
+            if(*aVer != 2) {
+                //signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' is written using unknown version " + int(*aVer) + "!"));
+            }
+
+            for(int aChunkIter = 0; !aFile.eof() && aChunkIter < 2; ++aChunkIter) {
+                char aChunkHeader2[8] = {};
+                if(int64_t(aFile.tellg()) + int64_t(sizeof(aChunkHeader2)) > int64_t(aLen)) {
+                    break;
+                }
+
+                aFile.read(aChunkHeader2, sizeof(aChunkHeader2));
+                if(!aFile.good()) {
+                    signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' is written using unsupported format!"));
+                    return false;
+                }
+
+                const uint32_t* aChunkLen  = (const uint32_t* )(aChunkHeader2 + 0);
+                const uint32_t* aChunkType = (const uint32_t* )(aChunkHeader2 + 4);
+                if(*aChunkType == 0x4E4F534A) {
+                    aJsonBodyOffset = int64_t(aFile.tellg());
+                    aJsonBodyLen    = int64_t(*aChunkLen);
+                } else if(*aChunkType == 0x004E4942) {
+                    myBinBodyOffset = int64_t(aFile.tellg());
+                    myBinBodyLen    = int64_t(*aChunkLen);
+                }
+                if(*aChunkLen != 0) {
+                    aFile.seekg(*aChunkLen, std::ios_base::cur);
+                }
+            }
+
+            aFile.seekg(aJsonBodyOffset, std::ios_base::beg);
+        }
+    } else {
+        aFile.seekg(0, std::ios_base::beg);
+    }
+
+    rapidjson::IStreamWrapper aFileStream(aFile);
+    rapidjson::ParseResult aRes;
+    if(myIsBinary) {
+        aRes = ParseStream<rapidjson::kParseStopWhenDoneFlag, rapidjson::UTF8<>, rapidjson::IStreamWrapper>(aFileStream);
+    } else {
+        aRes = ParseStream(aFileStream);
+    }
+
+    if(aRes.IsError()) {
+        if(aRes.Code() == rapidjson::kParseErrorDocumentEmpty) {
+            signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' is empty!"));
+            return false;
+        }
+
+        signals.onError(formatSyntaxError(myFileName, StString("File '") + theFile + "' defines invalid JSON document!\n"
+                                                    + formatParseError(aRes.Code()) + "."));
+        return false;
+    }
+
+    return gltfParse(theParentNode);
+}
+
+bool StAssetImportGltf::gltfParseRoots() {
+    // find glTF root elements for smooth navigation
+    GenericValue aNames[GltfRootElement_NB];
+    for(int aRootNameIter = 0; aRootNameIter < GltfRootElement_NB; ++aRootNameIter) {
+        aNames[aRootNameIter] = rapidjson::StringRef(GltfRootElementNames[aRootNameIter]);
+    }
+
+    for(ConstMemberIterator aRootIter = MemberBegin(); aRootIter != MemberEnd(); ++aRootIter) {
+        for(int aRootNameIter = 0; aRootNameIter < GltfRootElement_NB; ++aRootNameIter) {
+            if(myGltfRoots[aRootNameIter].isNull()
+                 && aNames[aRootNameIter] == aRootIter->name) {
+                // we will not modify JSON document, thus it is OK to keep the pointers
+                myGltfRoots[aRootNameIter].init(GltfRootElementNames[aRootNameIter], &aRootIter->value);
+                break;
+            }
+        }
+    }
+
+    for(int aRootNameIter = 0; aRootNameIter < GltfRootElement_NB_MANDATORY; ++aRootNameIter) {
+        if(myGltfRoots[aRootNameIter].isNull()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Member '") + GltfRootElementNames[aRootNameIter] + "' is not found."));
+            return false;
+        }
+    }
+    return true;
+}
+
+void StAssetImportGltf::gltfParseAsset() {
+    const GenericValue* anAsset = myGltfRoots[GltfRootElement_Asset].getRoot();
+    if(anAsset == NULL) {
+        return;
+    }
+
+    if(const GenericValue* aGenerator = findObjectMember(*anAsset, "generator")) {
+        if(aGenerator->IsString()) {
+            StString aStr = aGenerator->GetString();
+        }
+    }
+    if(const GenericValue* aCopyRight = findObjectMember(*anAsset, "copyright")) {
+        if(aCopyRight->IsString()) {
+            StString aStr = aCopyRight->GetString();
+        }
+    }
+}
+
+void StAssetImportGltf::gltfParseMaterials() {
+    const GenericValue* aMatList = myGltfRoots[GltfRootElement_Materials].getRoot();
+    if(aMatList == NULL) {
+        return;
+    } else if(aMatList->IsObject()) {
+        // glTF 1.0
+        for(ConstMemberIterator aMatIter = aMatList->MemberBegin(); aMatIter != aMatList->MemberEnd(); ++aMatIter) {
+            Handle(StGLMaterial) aMat = new StGLMaterial();
+            const GenericValue& aMatNode = aMatIter->value;
+            const GenericValue& aMatId   = aMatIter->name;
+            const GenericValue* aNameVal = findObjectMember (aMatNode, "name");
+            if(!gltfParseCommonMaterial(*aMat, aMatNode)) {
+                if(!gltfParseStdMaterial(*aMat, aMatNode)) {
+                    continue;
+                }
+            }
+
+            if(aNameVal != NULL && aNameVal->IsString()) {
+                aMat->Name = aNameVal->GetString();
+            } else {
+                aMat->Name = aMatId.GetString();
+            }
+            myMaterials.Bind(aMatId.GetString(), aMat);
+        }
+    } else if(aMatList->IsArray()) {
+        // glTF 2.0
+        int aMatIndex = 0;
+        for(rapidjson::Value::ConstValueIterator aMatIter = aMatList->Begin(); aMatIter != aMatList->End(); ++aMatIter, ++aMatIndex) {
+            Handle(StGLMaterial) aMat = new StGLMaterial();
+            const GenericValue& aMatNode = *aMatIter;
+            const GenericValue* aNameVal = findObjectMember(aMatNode, "name");
+            if(!gltfParsePbrMaterial   (*aMat, aMatNode)
+            && !gltfParseCommonMaterial(*aMat, aMatNode)
+            && !gltfParseStdMaterial   (*aMat, aMatNode)) {
+                continue;
+            }
+
+            if(aNameVal != NULL && aNameVal->IsString()) {
+                aMat->Name = aNameVal->GetString();
+            } else {
+                aMat->Name = StString("mat_") + aMatIndex;
+            }
+            myMaterials.Bind(TCollection_AsciiString(aMatIndex), aMat);
+        }
+    }
+}
+
+bool StAssetImportGltf::gltfParseStdMaterial(StGLMaterial& theMat,
+                                             const GenericValue& theMatNode) {
+    const GenericValue* aTechVal = findObjectMember(theMatNode, "technique");
+    const GenericValue* aValues  = findObjectMember(theMatNode, "values");
+    if(aValues == NULL) {
+        return false;
+    }
+
+    const GenericValue* anAmbVal = findObjectMember(*aValues, "ambient");
+    const GenericValue* aDiffVal = findObjectMember(*aValues, "diffuse");
+    const GenericValue* anEmiVal = findObjectMember(*aValues, "emission");
+    const GenericValue* aSpecVal = findObjectMember(*aValues, "specular");
+    const GenericValue* aShinVal = findObjectMember(*aValues, "shininess");
+    if(anAmbVal == NULL
+    && aDiffVal == NULL
+    && anEmiVal == NULL
+    && aSpecVal == NULL
+    && aShinVal == NULL) {
+        return false;
+    }
+
+    StGLVec4 anAmb, aDiff, anEmi, aSpec;
+    if(anAmbVal != NULL && anAmbVal->IsString()) {
+        // ambient texture
+        gltfParseTexture(theMat, anAmbVal);
+        theMat.AmbientColor = StGLVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    } else if(gltfReadVec4(anAmb, anAmbVal) && validateColor4(anAmb)) {
+        theMat.AmbientColor = anAmb;
+    }
+    if(aDiffVal != NULL && aDiffVal->IsString()) {
+        // diffuse texture
+        gltfParseTexture(theMat, aDiffVal);
+        theMat.DiffuseColor = StGLVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    } else if(gltfReadVec4(aDiff, aDiffVal) && validateColor4(aDiff)) {
+        theMat.DiffuseColor = aDiff;
+    }
+    if(gltfReadVec4(anEmi, anEmiVal) && validateColor4(anEmi)) {
+        theMat.EmissiveColor = anEmi;
+    }
+    if(gltfReadVec4(aSpec, aSpecVal) && validateColor4(aSpec)) {
+        theMat.SpecularColor = aSpec;
+    }
+    if(aShinVal != NULL && aShinVal->IsNumber()) {
+        const double aSpecular = aShinVal->GetDouble();
+        if(aSpecular >= 0) {
+            theMat.ChangeShine() = (float )stMin(aSpecular / 1000.0, 1.0);
+        }
+    }
+
+    gltfParseTechnique(theMat, aTechVal);
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseCommonMaterial(StGLMaterial& theMat,
+                                                const GenericValue& theMatNode) {
+    const GenericValue* anExtVal = findObjectMember(theMatNode, "extensions");
+    if(anExtVal == NULL) {
+        return false;
+    }
+
+    const GenericValue* aMatCommon = findObjectMember(*anExtVal, THE_KHR_materials_common);
+    if(aMatCommon == NULL) {
+        return false;
+    }
+
+    if(!gltfParseStdMaterial(theMat, *aMatCommon)) {
+        return false;
+    }
+    return true;
+}
+
+// =======================================================================
+// function : gltfParsePbrMaterial
+// purpose  :
+// =======================================================================
+bool StAssetImportGltf::gltfParsePbrMaterial(StGLMaterial& theMat,
+                                             const GenericValue& theMatNode) {
+    const GenericValue* aMetalRoughVal    = findObjectMember(theMatNode, "pbrMetallicRoughness");
+    //const GenericValue* aNormTexVal       = findObjectMember(theMatNode, "normalTexture");
+    const GenericValue* anEmissFactorVal  = findObjectMember(theMatNode, "emissiveFactor");
+    //const GenericValue* anEmissTexVal     = findObjectMember(theMatNode, "emissiveTexture");
+    //const GenericValue* anOcclusionTexVal = findObjectMember(theMatNode, "occlusionTexture");
+    if(aMetalRoughVal == NULL) {
+        return false;
+    }
+
+    /*if(const GenericValue* anExtVal = findObjectMember(theMatNode, "extensions")) {
+        if(const GenericValue* anExtDefVal = findObjectMember(*anExtVal, "KHR_materials_pbrSpecularGlossiness")) {
+            const GenericValue* aDiffTexVal = findObjectMember(*anExtDefVal, "diffuseTexture");
+            const GenericValue* aSpecTexVal = findObjectMember(*anExtDefVal, "specularGlossinessTexture");
+        }
+    }*/
+
+    const GenericValue* aBaseColorFactorVal = findObjectMember(*aMetalRoughVal, "baseColorFactor");
+    const GenericValue* aBaseColorTexVal    = findObjectMember(*aMetalRoughVal, "baseColorTexture");
+    //const GenericValue* aMetalRoughTexVal   = findObjectMember(*aMetalRoughVal, "metallicRoughnessTexture");
+
+    StGLVec4 aBaseColorFactor;
+    StGLVec3 anEmissiveFactor;
+    if(gltfReadVec4(aBaseColorFactor, aBaseColorFactorVal) && validateColor4(aBaseColorFactor)) {
+        //
+    }
+    if(gltfReadVec3(anEmissiveFactor, anEmissFactorVal) && validateColor3(anEmissiveFactor)) {
+        //
+    }
+    if(aBaseColorTexVal != NULL && aBaseColorTexVal->IsObject()) {
+        const GenericValue* aBaseColorTexIndexVal = findObjectMember(*aBaseColorTexVal, "index");
+        if(aBaseColorTexIndexVal != NULL) {
+            gltfParseTexture(theMat, aBaseColorTexIndexVal);
+        }
+    }
+
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseTechnique(StGLMaterial& theMat,
+                                           const GenericValue* theTechniqueId) {
+    // default values
+    if(theTechniqueId == NULL) {
+        return true;
+    }
+
+    const TCollection_AsciiString aTechId = getKeyString(*theTechniqueId);
+    if(aTechId.IsEqual("PHONG")
+    || aTechId.IsEqual("BLINN")
+    || aTechId.IsEqual("LAMBERT")) {
+        // KHR_materials_common extension - actually does NOT specify states!
+        theMat.SetCullBackFaces(true);
+        return true;
+    }
+
+    const GenericValue* aTechNode = myGltfRoots[GltfRootElement_Techniques].findChild(*theTechniqueId);
+    if(aTechNode == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("Technique node '") + aTechId.ToCString() + "' is not found."));
+        return false;
+    }
+
+    const GenericValue* aStatesVal = findObjectMember(*aTechNode, "states");
+    if(aStatesVal != NULL) {
+        const GenericValue* aStatesOnVal = findObjectMember(*aStatesVal, "enable");
+        if(aStatesOnVal != NULL
+        && aStatesOnVal->IsArray()) {
+            theMat.SetCullBackFaces(false);
+            const int aNbStates = aStatesOnVal->Size();
+            for(int aStateIter = 0; aStateIter < aNbStates; ++aStateIter) {
+                const GenericValue& aGenVal = (*aStatesOnVal)[aStateIter];
+                if(!aGenVal.IsInt()) {
+                    continue;
+                }
+                const int aStateId = aGenVal.GetInt();
+                switch(aStateId) {
+                    case 2884:  // CULL_FACE
+                        theMat.SetCullBackFaces(true);
+                        break;
+                    case 3042:  // BLEND
+                    case 2929:  // DEPTH_TEST
+                    case 32823: // POLYGON_OFFSET_FILL
+                    case 32926: // SAMPLE_ALPHA_TO_COVERAGE
+                    case 3089:  // SCISSOR_TEST
+                        break;
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseTexture(StGLMaterial& theMat,
+                                         const GenericValue* theTextureId) {
+    if(theTextureId == NULL
+    || myGltfRoots[GltfRootElement_Textures].isNull()
+    || myGltfRoots[GltfRootElement_Images].isNull()) {
+        return false;
+    }
+
+    const StString aTextureId = getKeyString(*theTextureId).ToCString();
+    const GenericValue* aTexNode = myGltfRoots[GltfRootElement_Textures].findChild(*theTextureId);
+    if(aTexNode == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("Texture node '") + aTextureId + "' is not found."));
+        return false;
+    }
+
+    const GenericValue* aSrcVal  = findObjectMember(*aTexNode, "source");
+    const GenericValue* aTargVal = findObjectMember(*aTexNode, "target");
+    if(aSrcVal == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("Invalid texture node '") + aTextureId + "' without a 'source' property."));
+        return false;
+    }
+    if(aTargVal != NULL
+    && aTargVal->IsNumber()
+    && aTargVal->GetInt() != 3553) { // GL_TEXTURE_2D
+        return false;
+    }
+
+    const GenericValue* anImgNode = myGltfRoots[GltfRootElement_Images].findChild(*aSrcVal);
+    if(anImgNode == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("Invalid texture node '") + aTextureId
+                                                    + "' points to non-existing image '" + getKeyString(*aSrcVal).ToCString() + "'."));
+        return false;
+    }
+
+    const GenericValue* anUriVal = findObjectMember(*anImgNode, "uri");
+    if(myIsBinary) {
+        const GenericValue* aBinVal = anImgNode;
+        if(const GenericValue* anExtVal = findObjectMember(*anImgNode, "extensions")) {
+            const GenericValue* aBinValExt = findObjectMember(*anExtVal, THE_KHR_binary_glTF);
+            if(aBinValExt != NULL) {
+                aBinVal = aBinValExt;
+            }
+        }
+
+        const GenericValue* aBufferViewName = findObjectMember(*aBinVal, "bufferView");
+        const GenericValue* aMimeTypeVal    = findObjectMember(*aBinVal, "mimeType");
+        //const GenericValue* aWidthVal       = findObjectMember(*aBinVal, "width");
+        //const GenericValue* aHeightVal      = findObjectMember(*aBinVal, "height");
+        if(aBufferViewName != NULL) {
+            const StString aBufferViewNameStr(getKeyString(*aBufferViewName).ToCString());
+            const GenericValue* aBufferView = myGltfRoots[GltfRootElement_BufferViews].findChild(*aBufferViewName);
+            if(aBufferView == NULL || !aBufferView->IsObject()) {
+                signals.onError(formatSyntaxError(myFileName, StString("Invalid texture node '") + aTextureId
+                                                            + "' points to invalid buffer view '" + aBufferViewNameStr + "'."));
+                return false;
+            }
+
+            const GenericValue* aBufferName = findObjectMember(*aBufferView, "buffer");
+            const GenericValue* aByteLength = findObjectMember(*aBufferView, "byteLength");
+            const GenericValue* aByteOffset = findObjectMember(*aBufferView, "byteOffset");
+            if(aBufferName != NULL &&  aBufferName->IsString()
+            && !IsEqual(aBufferName->GetString(), "binary_glTF")) {
+                signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + aBufferViewNameStr + "' does not define binary_glTF buffer."));
+                return false;
+            } else if(aByteOffset == NULL || !aByteOffset->IsNumber()) {
+                signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + aBufferViewNameStr + "' does not define byteOffset."));
+                return false;
+            }
+
+            GltfBufferView aBuffView;
+            aBuffView.ByteOffset = (int64_t )aByteOffset->GetDouble();
+            aBuffView.ByteLength = aByteLength != NULL && aByteLength->IsNumber()
+                                  ? (int64_t )aByteLength->GetDouble()
+                                  : 0;
+            if(aBuffView.ByteLength < 0
+            || aBuffView.ByteLength > std::numeric_limits<int>::max()) {
+                signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + aBufferViewNameStr + "' defines invalid byteLength."));
+                return false;
+            } else if(aBuffView.ByteOffset < 0) {
+                signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + aBufferViewNameStr + "' defines invalid byteOffset."));
+                return false;
+            }
+
+            const int64_t anOffset = myBinBodyOffset + aBuffView.ByteOffset;
+            StString aMime;
+            if(aMimeTypeVal != NULL && aMimeTypeVal->IsString()) {
+                aMime = aMimeTypeVal->GetString();
+            }
+            theMat.Texture = new StGltfBinTexture(myFileName, aMime, anOffset, (int )aBuffView.ByteLength);
+            return true;
+        }
+    }
+
+    if(anUriVal == NULL || !anUriVal->IsString()) {
+        return false;
+    }
+
+    const char* anUriData = anUriVal->GetString();
+    if(::strncmp(anUriData, "data:", 5) == 0) { // data:image/png;base64,DATA
+        const char* aDataStart = anUriData + 5;
+        for(const char* aDataIter = aDataStart; aDataIter != '\0'; ++aDataIter) {
+            if(stAreEqual(aDataIter, ";base64,", 8)) {
+                const char* aBase64End  = anUriData + anUriVal->GetStringLength();
+                const char* aBase64Data = aDataIter + 8;
+                const int aBase64Len = int(aBase64End - aBase64Data);
+                const StString aMime(aDataStart, aDataIter - aDataStart);
+                Handle(NCollection_Buffer) aData = decodeBase64((const stUByte_t* )aBase64Data, aBase64Len);
+                theMat.Texture = new StGltfBinTexture(myFileName + "@" + aSrcVal->GetString(), aMime, aData);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    theMat.Texture = new StAssetTexture(myFolder + anUriVal->GetString());
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseScene(const Handle(StDocNode)& theParentNode) {
+    // search default scene
+    const GenericValue* aDefScene = myGltfRoots[GltfRootElement_Scenes].findChild(*myGltfRoots[GltfRootElement_Scene].getRoot());
+    if(aDefScene == NULL) {
+        signals.onError(formatSyntaxError(myFileName, "Default scene is not found."));
+        return false;
+    }
+
+    const GenericValue* aSceneNodes = findObjectMember(*aDefScene, "nodes");
+    if(aSceneNodes == NULL || !aSceneNodes->IsArray()) {
+        signals.onError(formatSyntaxError(myFileName, StString() + "Empty scene '"
+                                                    + getKeyString(*myGltfRoots[GltfRootElement_Scene].getRoot()).ToCString() + "'."));
+        return false;
+    }
+
+    return gltfParseSceneNodes(theParentNode, *aSceneNodes);
+}
+
+bool StAssetImportGltf::gltfParseSceneNodes(const Handle(StDocNode)& theParentNode,
+                                            const GenericValue& theSceneNodes) {
+    if(!theSceneNodes.IsArray()) {
+        signals.onError(formatSyntaxError(myFileName, "Scene nodes is not array."));
+        return false;
+    }
+
+    for(rapidjson::Value::ConstValueIterator aSceneNodeIter = theSceneNodes.Begin();
+        aSceneNodeIter != theSceneNodes.End(); ++aSceneNodeIter) {
+        const GenericValue* aSceneNode = myGltfRoots[GltfRootElement_Nodes].findChild(*aSceneNodeIter);
+        if(aSceneNode == NULL) {
+            signals.onError(formatSyntaxError(myFileName, StString("Scene refers to non-existing node '") + getKeyString(*aSceneNodeIter).ToCString() + "'."));
+            return true;
+        }
+
+        if(!gltfParseSceneNode(theParentNode, getKeyString(*aSceneNodeIter), *aSceneNode)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseSceneNode(const Handle(StDocNode)& theParentNode,
+                                           const TCollection_AsciiString& theSceneNodeName,
+                                           const GenericValue& theSceneNode) {
+    const GenericValue* aName         = findObjectMember(theSceneNode, "name");
+    //const GenericValue* aJointName    = findObjectMember(theSceneNode, "jointName");
+    const GenericValue* aChildren     = findObjectMember(theSceneNode, "children");
+    const GenericValue* aMeshes       = findObjectMember(theSceneNode, "meshes");
+    const GenericValue* aMesh         = findObjectMember(theSceneNode, "mesh");
+    //const GenericValue* aCamera       = findObjectMember(theSceneNode, "camera");
+    const GenericValue* aTrsfMatVal   = findObjectMember(theSceneNode, "matrix");
+    const GenericValue* aTrsfRotVal   = findObjectMember(theSceneNode, "rotation");
+    const GenericValue* aTrsfScaleVal = findObjectMember(theSceneNode, "scale");
+    const GenericValue* aTrsfTransVal = findObjectMember(theSceneNode, "translation");
+    Handle(StDocObjectNode) aNewNode;
+    if(mySceneNodeMap.Find(theSceneNodeName, aNewNode)) {
+        theParentNode->ChangeChildren().Append(aNewNode);
+        return true;
+    }
+
+    aNewNode = new StDocObjectNode();
+    theParentNode->ChangeChildren().Append(aNewNode);
+    if(aName != NULL && aName->IsString()) {
+        aNewNode->setNodeName(aName->GetString());
+    }
+    mySceneNodeMap.Bind(theSceneNodeName, aNewNode);
+
+    const bool hasTrs = aTrsfRotVal != NULL || aTrsfScaleVal != NULL || aTrsfTransVal != NULL;
+    if(aTrsfMatVal != NULL) {
+        if(hasTrs) {
+            pushSceneNodeError(theSceneNodeName.ToCString(), "defines ambiguous transformation");
+            return false;
+        }
+        else if(!aTrsfMatVal->IsArray() || aTrsfMatVal->Size() != 16) {
+            pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid transformation matrix array");
+            return false;
+        }
+
+        Graphic3d_Mat4d aMat4;
+        for(int aColIter = 0; aColIter < 4; ++aColIter) {
+            for(int aRowIter = 0; aRowIter < 4; ++aRowIter) {
+                const GenericValue& aGenVal = (*aTrsfMatVal)[aColIter * 4 + aRowIter];
+                if(!aGenVal.IsNumber()) {
+                    pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid transformation matrix");
+                    return false;
+                }
+                aMat4.SetValue(aRowIter, aColIter, aGenVal.GetDouble());
+            }
+        }
+
+        if(!aMat4.IsIdentity()) {
+            gp_Trsf aTrsf;
+            aTrsf.SetValues(aMat4.GetValue(0, 0), aMat4.GetValue(0, 1), aMat4.GetValue(0, 2), aMat4.GetValue(0, 3),
+                            aMat4.GetValue(1, 0), aMat4.GetValue(1, 1), aMat4.GetValue(1, 2), aMat4.GetValue(1, 3),
+                            aMat4.GetValue(2, 0), aMat4.GetValue(2, 1), aMat4.GetValue(2, 2), aMat4.GetValue(2, 3));
+            if(aTrsf.Form() != gp_Identity) {
+                aNewNode->setNodeTransformation(aTrsf);
+            }
+        }
+    } else if(hasTrs) {
+        gp_Trsf aTrsf;
+        if(aTrsfRotVal != NULL) {
+            if(!aTrsfRotVal->IsArray() || aTrsfRotVal->Size() != 4) {
+                pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid rotation quaternion");
+                return false;
+            }
+
+            Graphic3d_Vec4d aRotVec4;
+            for(int aCompIter = 0; aCompIter < 4; ++aCompIter) {
+                const GenericValue& aGenVal = (*aTrsfRotVal)[aCompIter];
+                if(!aGenVal.IsNumber()) {
+                    pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid rotation");
+                    return false;
+                }
+                aRotVec4[aCompIter] = aGenVal.GetDouble();
+            }
+            const gp_Quaternion aQuaternion(aRotVec4.x(), aRotVec4.y(), aRotVec4.z(), aRotVec4.w());
+            if(Abs(aQuaternion.X())       > gp::Resolution()
+            && Abs(aQuaternion.Y())       > gp::Resolution()
+            && Abs(aQuaternion.Z())       > gp::Resolution()
+            && Abs(aQuaternion.W() - 1.0) > gp::Resolution()) {
+                aTrsf.SetRotation(aQuaternion);
+            }
+        }
+
+        if(aTrsfTransVal != NULL) {
+            if(!aTrsfTransVal->IsArray() || aTrsfTransVal->Size() != 3) {
+                pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid translation vector");
+                return false;
+            }
+
+            gp_XYZ aTransVec;
+            for(int aCompIter = 0; aCompIter < 3; ++aCompIter) {
+                const GenericValue& aGenVal = (*aTrsfTransVal)[aCompIter];
+                if(!aGenVal.IsNumber()) {
+                    pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid translation");
+                    return false;
+                }
+                aTransVec.SetCoord(aCompIter + 1, aGenVal.GetDouble());
+            }
+            aTrsf.SetTranslationPart(aTransVec);
+        }
+
+        if(aTrsfScaleVal != NULL) {
+            Graphic3d_Vec3d aScaleVec;
+            if(!aTrsfScaleVal->IsArray() || aTrsfScaleVal->Size() != 3) {
+                pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid scale vector");
+                return false;
+            }
+            for(int aCompIter = 0; aCompIter < 3; ++aCompIter) {
+                const GenericValue& aGenVal = (*aTrsfScaleVal)[aCompIter];
+                if(!aGenVal.IsNumber()) {
+                    pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid scale");
+                    return false;
+                }
+                aScaleVec[aCompIter] = aGenVal.GetDouble();
+                if(Abs(aScaleVec[aCompIter]) <= gp::Resolution()) {
+                    pushSceneNodeError(theSceneNodeName.ToCString(), "defines invalid scale");
+                    return false;
+                }
+            }
+            if(Abs(aScaleVec.x() - aScaleVec.y()) > Precision::Confusion()
+            && Abs(aScaleVec.y() - aScaleVec.z()) > Precision::Confusion()
+            && Abs(aScaleVec.x() - aScaleVec.z()) > Precision::Confusion()) {
+                ST_DEBUG_LOG("glTF reader, scene node '"
+                            + theSceneNodeName.ToCString() + "' defines unsupported scaling "
+                            + aScaleVec.x() + " " + aScaleVec.y() + " " + aScaleVec.z());
+            }
+            if(Abs (aScaleVec.x() - 1.0) > Precision::Confusion()) {
+                aTrsf.SetScaleFactor(aScaleVec.x());
+            }
+        }
+
+        if(aTrsf.Form() != gp_Identity) {
+            aNewNode->setNodeTransformation(aTrsf);
+        }
+    }
+
+    if(aChildren != NULL && !gltfParseSceneNodes(aNewNode, *aChildren)) {
+        return false;
+    }
+
+    if(aMeshes != NULL && aMeshes->IsArray()) {
+        for(rapidjson::Value::ConstValueIterator aMeshIter = aMeshes->Begin(); aMeshIter != aMeshes->End(); ++aMeshIter) {
+            const GenericValue* aMeshItem = myGltfRoots[GltfRootElement_Meshes].findChild(*aMeshIter);
+            if(aMeshItem == NULL) {
+                pushSceneNodeError(theSceneNodeName.ToCString(), "refers to non-existing mesh");
+                return false;
+            }
+
+            if(!gltfParseMesh(aNewNode, getKeyString(*aMeshIter), *aMeshItem)) {
+                return false;
+            }
+        }
+    }
+    if(aMesh != NULL) {
+        // glTF 2.0
+        const GenericValue* aMeshItem = myGltfRoots[GltfRootElement_Meshes].findChild(*aMesh);
+        if(aMeshItem == NULL) {
+            pushSceneNodeError(theSceneNodeName.ToCString(), "refers to non-existing mesh");
+            return false;
+        }
+
+        if(!gltfParseMesh(aNewNode, getKeyString(*aMesh), *aMeshItem)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseMesh(const Handle(StDocNode)& theParentNode,
+                                      const TCollection_AsciiString& theMeshName,
+                                      const GenericValue& theMesh) {
+    const GenericValue* aName  = findObjectMember(theMesh, "name");
+    const GenericValue* aPrims = findObjectMember(theMesh, "primitives");
+    if(!aPrims->IsArray()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Primitive array attributes within Mesh '")
+                                                             + theMeshName.ToCString() + "' is not an array."));
+        return false;
+    }
+
+    Handle(StDocMeshNode) aMeshNode;
+    if(myMeshMap.Find(theMeshName, aMeshNode)) {
+        theParentNode->ChangeChildren().Append(aMeshNode);
+        return true;
+    }
+
+    aMeshNode = new StDocMeshNode();
+    myMeshMap.Bind(theMeshName, aMeshNode);
+    if(aName != NULL && aName->IsString()) {
+        aMeshNode->setNodeName(aName->GetString());
+    }
+    theParentNode->ChangeChildren().Append(aMeshNode);
+    for(rapidjson::Value::ConstValueIterator aPrimArrIter = aPrims->Begin(); aPrimArrIter != aPrims->End(); ++aPrimArrIter) {
+        if(!gltfParsePrimArray(aMeshNode, theMeshName, *aPrimArrIter)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool StAssetImportGltf::gltfParsePrimArray(const Handle(StDocMeshNode)& theMeshNode,
+                                           const TCollection_AsciiString& theMeshName,
+                                           const GenericValue& thePrimArray) {
+    const GenericValue* anAttribs = findObjectMember(thePrimArray, "attributes");
+    const GenericValue* anIndices = findObjectMember(thePrimArray, "indices");
+    const GenericValue* aMaterial = findObjectMember(thePrimArray, "material");
+    const GenericValue* aModeVal  = findObjectMember(thePrimArray, "mode");
+    GltfPrimitiveMode aMode = GltfPrimitiveMode_Triangles;
+    if(anAttribs == NULL || !anAttribs->IsObject()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Primitive array within Mesh '")
+                                                             + theMeshName.ToCString() + "' defines no attributes."));
+        return false;
+    }
+    else if(aModeVal != NULL) {
+        aMode = GltfPrimitiveMode_UNKNOWN;
+        if(aModeVal->IsInt()) {
+            aMode = (GltfPrimitiveMode )aModeVal->GetInt();
+        }
+        if(aMode < GltfPrimitiveMode_Points
+        || aMode > GltfPrimitiveMode_TriangleFan) {
+            signals.onError(formatSyntaxError(myFileName, StString("Primitive array within Mesh '")
+                                                                 + theMeshName.ToCString() + "' has unknown mode."));
+            return false;
+        }
+    }
+    if(aMode != GltfPrimitiveMode_Triangles) {
+        ST_DEBUG_LOG("Primitive array within Mesh '" + theMeshName.ToCString() + "' skipped due to unsupported mode.");
+        return true;
+    }
+
+    Handle(StPrimArray) aPrimArray = new StPrimArray();
+    theMeshNode->ChangePrimitiveArrays().Append(aPrimArray);
+    if(aMaterial != NULL) {
+        // assign material
+        myMaterials.Find(getKeyString(*aMaterial), aPrimArray->Material);
+    }
+
+    bool hasPositions = false;
+    for(rapidjson::Value::ConstMemberIterator anAttribIter = anAttribs->MemberBegin(); anAttribIter != anAttribs->MemberEnd(); ++anAttribIter) {
+        const TCollection_AsciiString anAttribId = getKeyString(anAttribIter->value);
+        if(anAttribId.IsEmpty()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Primitive array attribute accessor key within Mesh '")
+                                                                 + theMeshName.ToCString() + "' is not a string."));
+            return false;
+        }
+
+        GltfArrayType aType = gltfParseAttribType(anAttribIter->name.GetString());
+        if(aType == GltfArrayType_UNKNOWN) {
+            // just ignore unknown attributes
+            continue;
+        }
+
+        const GenericValue* anAccessor = myGltfRoots[GltfRootElement_Accessors].findChild(anAttribIter->value);
+        if(anAccessor == NULL || !anAccessor->IsObject()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Primitive array attribute accessor key '") + anAttribId.ToCString()
+                                                                 + "' points to non-existing object."));
+            return false;
+        } else if(!gltfParseAccessor(aPrimArray, anAttribId, *anAccessor, aType, aMode)) {
+            return false;
+        } else if(aType == GltfArrayType_Position) {
+            hasPositions = true;
+        }
+    }
+    if(!hasPositions) {
+        signals.onError(formatSyntaxError(myFileName, StString("Primitive array within Mesh '")
+                                                             + theMeshName.ToCString() + "' does not define vertex positions."));
+        return false;
+    }
+
+    if(anIndices != NULL) {
+        const TCollection_AsciiString anIndicesId = getKeyString(*anIndices);
+        if(anIndicesId.IsEmpty()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Primitive array indices accessor key within Mesh '")
+                                                                 + theMeshName.ToCString() + "' is not a string."));
+            return false;
+        }
+
+        const GenericValue* anAccessor = myGltfRoots[GltfRootElement_Accessors].findChild(*anIndices);
+        if(anAccessor == NULL || !anAccessor->IsObject()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Primitive array indices accessor key '") + anIndicesId.ToCString()
+                                                                + "' points to non-existing object."));
+            return false;
+        } else if(!gltfParseAccessor(aPrimArray, anIndicesId, *anAccessor, GltfArrayType_Indices, aMode)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool StAssetImportGltf::gltfParseAccessor(const Handle(StPrimArray)& thePrimArray,
+                                          const TCollection_AsciiString& theName,
+                                          const GenericValue&     theAccessor,
+                                          const GltfArrayType     theType,
+                                          const GltfPrimitiveMode theMode) {
+    GltfAccessor aStruct;
+    const GenericValue* aTypeStr        = findObjectMember(theAccessor, "type");
+    const GenericValue* aBufferViewName = findObjectMember(theAccessor, "bufferView");
+    const GenericValue* aByteOffset     = findObjectMember(theAccessor, "byteOffset");
+    const GenericValue* aByteStride     = findObjectMember(theAccessor, "byteStride");
+    const GenericValue* aCompType       = findObjectMember(theAccessor, "componentType");
+    const GenericValue* aCount          = findObjectMember(theAccessor, "count");
+    if(aTypeStr == NULL || !aTypeStr->IsString()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' does not define type."));
+        return false;
+    }
+    aStruct.Type = gltfParseAccessorType(aTypeStr->GetString());
+    if(aStruct.Type == GltfAccessorLayout_UNKNOWN) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' has invalid type."));
+        return false;
+    }
+
+    if(aBufferViewName == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' does not define bufferView."));
+        return false;
+    }
+    if(aByteOffset == NULL || !aByteOffset->IsNumber()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' does not define byteOffset."));
+        return false;
+    }
+    if(aCompType == NULL || !aCompType->IsInt()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' does not define componentType."));
+        return false;
+    }
+    aStruct.ComponentType = (GltfAccessorCompType )aCompType->GetInt();
+    if(aStruct.ComponentType != GltfAccessorCompType_Int8
+    && aStruct.ComponentType != GltfAccessorCompType_UInt8
+    && aStruct.ComponentType != GltfAccessorCompType_Int16
+    && aStruct.ComponentType != GltfAccessorCompType_UInt16
+    && aStruct.ComponentType != GltfAccessorCompType_UInt32
+    && aStruct.ComponentType != GltfAccessorCompType_Float32) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' defines invalid componentType value."));
+        return false;
+    }
+
+    if(aCount == NULL || !aCount->IsNumber()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' does not define count."));
+        return false;
+    }
+
+    aStruct.ByteOffset = (int64_t )aByteOffset->GetDouble();
+    aStruct.ByteStride = aByteStride != NULL && aByteStride->IsInt()
+                       ? aByteStride->GetInt()
+                       : 0;
+    aStruct.Count = (int64_t )aCount->GetDouble();
+
+    if(aStruct.ByteOffset < 0) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' defines invalid byteOffset."));
+        return false;
+    } else if(aStruct.ByteStride < 0
+           || aStruct.ByteStride > 255) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' defines invalid byteStride."));
+        return false;
+    } else if(aStruct.Count < 1) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' defines invalid count."));
+        return false;
+    }
+
+    //const GenericValue* aMax = findObjectMember(theAccessor, "max");
+    //const GenericValue* aMin = findObjectMember(theAccessor, "min");
+    const GenericValue* aBufferView = myGltfRoots[GltfRootElement_BufferViews].findChild(*aBufferViewName);
+    if(aBufferView == NULL || !aBufferView->IsObject()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Accessor '") + theName.ToCString() + "' refers to non-existing bufferView."));
+        return false;
+    }
+
+    return gltfParseBufferView(thePrimArray, getKeyString(*aBufferViewName), *aBufferView, aStruct, theType, theMode);
+}
+
+bool StAssetImportGltf::gltfParseBufferView(const Handle(StPrimArray)& thePrimArray,
+                                            const TCollection_AsciiString& theName,
+                                            const GenericValue&     theBufferView,
+                                            const GltfAccessor&     theAccessor,
+                                            const GltfArrayType     theType,
+                                            const GltfPrimitiveMode theMode) {
+    GltfBufferView aBuffView;
+    const GenericValue* aBufferName = findObjectMember(theBufferView, "buffer");
+    const GenericValue* aByteLength = findObjectMember(theBufferView, "byteLength");
+    const GenericValue* aByteOffset = findObjectMember(theBufferView, "byteOffset");
+    const GenericValue* aTarget     = findObjectMember(theBufferView, "target");
+    if(aBufferName == NULL) {
+        signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' does not define buffer."));
+        return false;
+    } else if(aByteOffset == NULL || !aByteOffset->IsNumber()) {
+        signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' does not define byteOffset."));
+        return false;
+    }
+
+    aBuffView.ByteOffset = (int64_t )aByteOffset->GetDouble();
+    aBuffView.ByteLength = aByteLength != NULL && aByteLength->IsNumber()
+                         ? (int64_t )aByteLength->GetDouble()
+                         : 0;
+    if(aTarget != NULL && aTarget->IsInt()) {
+        aBuffView.Target = (GltfBufferViewTarget )aTarget->GetInt();
+        if(aBuffView.Target != GltfBufferViewTarget_ARRAY_BUFFER
+        && aBuffView.Target != GltfBufferViewTarget_ELEMENT_ARRAY_BUFFER) {
+            signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' defines invalid target."));
+            return false;
+        }
+    }
+
+    if(aBuffView.ByteLength < 0) {
+        signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' defines invalid byteLength."));
+        return false;
+    } else if(aBuffView.ByteOffset < 0) {
+        signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' defines invalid byteOffset."));
+        return false;
+    }
+
+    const GenericValue* aBuffer = myGltfRoots[GltfRootElement_Buffers].findChild(*aBufferName);
+    if(aBuffer == NULL || !aBuffer->IsObject()) {
+        signals.onError(formatSyntaxError(myFileName, StString("BufferView '") + theName.ToCString() + "' refers to non-existing buffer."));
+        return false;
+    }
+
+    return gltfParseBuffer(thePrimArray, getKeyString(*aBufferName), *aBuffer, theAccessor, aBuffView, theType, theMode);
+}
+
+bool StAssetImportGltf::gltfParseBuffer(const Handle(StPrimArray)& thePrimArray,
+                                        const TCollection_AsciiString& theName,
+                                        const GenericValue&     theBuffer,
+                                        const GltfAccessor&     theAccessor,
+                                        const GltfBufferView&   theView,
+                                        const GltfArrayType     theType,
+                                        const GltfPrimitiveMode theMode) {
+    //const GenericValue* aType       = findObjectMember(theBuffer, "type");
+    //const GenericValue* aByteLength = findObjectMember(theBuffer, "byteLength");
+    const GenericValue* anUriVal      = findObjectMember(theBuffer, "uri");
+
+    int64_t anOffset = theView.ByteOffset + theAccessor.ByteOffset;
+    bool isBinary = false;
+    if(myIsBinary) {
+        isBinary = theName.IsEqual("binary_glTF") // glTF 1.0
+                || anUriVal == NULL;              // glTF 2.0
+    }
+
+    if(isBinary) {
+        std::ifstream aFile;
+        OSD_OpenStream(aFile, myFileName.toCString(), std::ios::in | std::ios::binary);
+        if(!aFile.is_open() || !aFile.good()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to non-existing file '" + myFileName + "'."));
+            return false;
+        }
+
+        anOffset += myBinBodyOffset;
+        aFile.seekg(anOffset, std::ios_base::beg);
+        if(!aFile.good()) {
+            aFile.close();
+            signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to non-existing location."));
+            return false;
+        }
+
+        return gltfReadBuffer(thePrimArray, theName, theAccessor, aFile, theType, theMode);
+    }
+
+    if(anUriVal == NULL || !anUriVal->IsString()) {
+        signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' does not define uri."));
+        return false;
+    }
+
+    const char* anUriData = anUriVal->GetString();
+    if(::strncmp(anUriData, "data:application/octet-stream;base64,", 37) == 0) {
+        Handle(NCollection_Buffer) aData = decodeBase64((const stUByte_t* )anUriData + 37, anUriVal->GetStringLength() - 37);
+        StArrayStreamBuffer aStreamBuffer((const char* )aData->Data(), aData->Size());
+        std::istream aStream(&aStreamBuffer);
+        aStream.seekg(anOffset, std::ios_base::beg);
+        return gltfReadBuffer(thePrimArray, theName, theAccessor, aStream, theType, theMode);
+    } else {
+        StString anUri = anUriData;
+        if(anUri.isEmpty()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' does not define uri."));
+            return false;
+        }
+
+        std::ifstream aFile;
+        StString aPath = myFolder + anUri;
+        OSD_OpenStream(aFile, aPath.toCString(), std::ios::in | std::ios::binary);
+        if(!aFile.is_open() || !aFile.good()) {
+            signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to non-existing file '" + anUri + "'."));
+            return false;
+        }
+
+        aFile.seekg(anOffset, std::ios_base::beg);
+        if(!aFile.good()) {
+            aFile.close();
+            signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to invalid location."));
+            return false;
+        }
+
+        return gltfReadBuffer(thePrimArray, theName, theAccessor, aFile, theType, theMode);
+    }
+}
+
+bool StAssetImportGltf::gltfReadBuffer(const Handle(StPrimArray)& thePrimArray,
+                                       const TCollection_AsciiString& theName,
+                                       const GltfAccessor&     theAccessor,
+                                       std::istream&           theStream,
+                                       const GltfArrayType     theType,
+                                       const GltfPrimitiveMode theMode) {
+    if(theMode != GltfPrimitiveMode_Triangles) {
+        ST_DEBUG_LOG("Buffer '" + theName.ToCString() + "' skipped unsupported primitive array.");
+        return true;
+    }
+
+    switch(theType) {
+        case GltfArrayType_Indices: {
+            if(theAccessor.Type != GltfAccessorLayout_Scalar
+            || theAccessor.Count <= 0) {
+                break;
+            } else if((theAccessor.Count / 3) > std::numeric_limits<int>::max()) {
+                signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' defines too big array."));
+                return false;
+            }
+
+            const size_t aNbTris = size_t(theAccessor.Count / 3);
+            if(theAccessor.ComponentType == GltfAccessorCompType_UInt16) {
+                StVec3<uint16_t> aVec3_16u;
+                const int aNbSkipBytes = theAccessor.ByteStride != 0
+                                       ? (theAccessor.ByteStride - sizeof(uint16_t))
+                                       : 0;
+                thePrimArray->Indices.resize(aNbTris * 3);
+                for(size_t aTriIter = 0; aTriIter < aNbTris; ++aTriIter) {
+                    theStream.read((char* )&aVec3_16u[0], sizeof(uint16_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    theStream.read((char* )&aVec3_16u[1], sizeof(uint16_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    theStream.read((char* )&aVec3_16u[2], sizeof(uint16_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    if((size_t )aVec3_16u[0] >= thePrimArray->Positions.size()
+                    || (size_t )aVec3_16u[1] >= thePrimArray->Positions.size()
+                    || (size_t )aVec3_16u[2] >= thePrimArray->Positions.size()) {
+                        signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to invalid indices."));
+                        return false;
+                    }
+
+                    thePrimArray->Indices[aTriIter * 3 + 0] = aVec3_16u[0];
+                    thePrimArray->Indices[aTriIter * 3 + 1] = aVec3_16u[1];
+                    thePrimArray->Indices[aTriIter * 3 + 2] = aVec3_16u[2];
+                }
+            } else if(theAccessor.ComponentType == GltfAccessorCompType_UInt32) {
+                StVec3<uint32_t> aVec3_32u;
+                const int aNbSkipBytes = theAccessor.ByteStride != 0
+                                       ? (theAccessor.ByteStride - sizeof(uint32_t))
+                                       : 0;
+                thePrimArray->Indices.resize(aNbTris * 3);
+                for(size_t aTriIter = 0; aTriIter < aNbTris; ++aTriIter) {
+                    theStream.read((char* )&aVec3_32u[0], sizeof(uint32_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    theStream.read((char* )&aVec3_32u[1], sizeof(uint32_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    theStream.read((char* )&aVec3_32u[2], sizeof(uint32_t));
+                    if(aNbSkipBytes != 0) {
+                        theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                    }
+
+                    if((size_t )aVec3_32u[0] >= thePrimArray->Positions.size()
+                    || (size_t )aVec3_32u[1] >= thePrimArray->Positions.size()
+                    || (size_t )aVec3_32u[2] >= thePrimArray->Positions.size()) {
+                        signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' refers to invalid indices."));
+                        return false;
+                    }
+
+                    thePrimArray->Indices[aTriIter * 3 + 0] = aVec3_32u[0];
+                    thePrimArray->Indices[aTriIter * 3 + 1] = aVec3_32u[1];
+                    thePrimArray->Indices[aTriIter * 3 + 2] = aVec3_32u[2];
+                }
+            } else {
+                break;
+            }
+            break;
+        }
+        case GltfArrayType_Position: {
+            if(theAccessor.ComponentType != GltfAccessorCompType_Float32
+            || theAccessor.Type != GltfAccessorLayout_Vec3) {
+                break;
+            } else if(theAccessor.Count > std::numeric_limits<int>::max()) {
+                signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' defines too big array."));
+                return false;
+            }
+
+            const size_t aNbNodes = size_t(theAccessor.Count);
+            StGLVec4 aVec4(0.0f, 0.0f, 0.0f, 1.0f);
+            const int aNbSkipBytes = theAccessor.ByteStride != 0
+                                   ? (theAccessor.ByteStride - sizeof(StGLVec3))
+                                   : 0;
+            thePrimArray->Positions.resize(aNbNodes);
+            for(size_t aVertIter = 0; aVertIter < aNbNodes; ++aVertIter) {
+                theStream.read((char* )aVec4.getData(), sizeof(StGLVec3));
+                thePrimArray->Positions[aVertIter] = aVec4.xyz();
+                if(aNbSkipBytes != 0) {
+                    theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                }
+            }
+
+            break;
+        }
+        case GltfArrayType_Normal: {
+            if(theAccessor.ComponentType != GltfAccessorCompType_Float32
+            || theAccessor.Type != GltfAccessorLayout_Vec3) {
+                break;
+            } else if(theAccessor.Count > std::numeric_limits<int>::max()) {
+                signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' defines too big array."));
+                return false;
+            }
+
+            const size_t aNbNodes = size_t(theAccessor.Count);
+            StGLVec4 aVec4(0.0f, 0.0f, 0.0f, 0.0f);
+            const int aNbSkipBytes = theAccessor.ByteStride != 0
+                                   ? (theAccessor.ByteStride - sizeof(StGLVec3))
+                                   : 0;
+            thePrimArray->Normals.resize(aNbNodes);
+            for(size_t aVertIter = 0; aVertIter < aNbNodes; ++aVertIter) {
+                theStream.read((char* )aVec4.getData(), sizeof(StGLVec3));
+                thePrimArray->Normals[aVertIter] = aVec4.xyz();
+                if(aNbSkipBytes != 0) {
+                    theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                }
+            }
+
+            break;
+        }
+        case GltfArrayType_TCoord0: {
+            if(theAccessor.ComponentType != GltfAccessorCompType_Float32
+            || theAccessor.Type != GltfAccessorLayout_Vec2) {
+                break;
+            } else if(theAccessor.Count > std::numeric_limits<int>::max()) {
+                signals.onError(formatSyntaxError(myFileName, StString("Buffer '") + theName.ToCString() + "' defines too big array."));
+                return false;
+            }
+
+            const size_t aNbNodes = size_t(theAccessor.Count);
+            StGLVec2 aVec2(0.0f, 0.0f);
+            const int aNbSkipBytes = theAccessor.ByteStride != 0
+                                   ? (theAccessor.ByteStride - sizeof(StGLVec2))
+                                   : 0;
+            thePrimArray->TexCoords0.resize(aNbNodes);
+            for(size_t aVertIter = 0; aVertIter < aNbNodes; ++aVertIter) {
+                theStream.read((char* )aVec2.getData(), sizeof(StGLVec2));
+
+                thePrimArray->TexCoords0[aVertIter] = aVec2;
+                if(aNbSkipBytes != 0) {
+                    theStream.seekg(aNbSkipBytes, std::ios_base::cur);
+                }
+            }
+            break;
+        }
+        case GltfArrayType_Color:
+        case GltfArrayType_TCoord1:
+        case GltfArrayType_Joint:
+        case GltfArrayType_Weight: {
+            return true;
+        }
+        case GltfArrayType_UNKNOWN: {
+            return false;
+        }
+    }
+    return true;
+}

sview-17_04.tar.gz/StCADViewer/StAssetImportGltf.h Added

@@ -0,0 +1,554 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016-2017
+ */
+
+#ifndef __StAssetImportGltf_h_
+#define __StAssetImportGltf_h_
+
+//#define RAPIDJSON_ASSERT
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/istreamwrapper.h>
+
+#include <StStrings/StString.h>
+#include <StFile/StFileNode.h>
+#include <StSlots/StSignal.h>
+
+#include <NCollection_DataMap.hxx>
+#include <TCollection_AsciiString.hxx>
+
+#include "StAssetDocument.h"
+
+/**
+ * Root elements within glTF JSON document.
+ */
+enum GltfRootElement {
+    GltfRootElement_Asset,        //!< "asset"       element, mandatory
+    GltfRootElement_Scenes,       //!< "scenes"      element, mandatory
+    GltfRootElement_Scene,        //!< "scene"       element, mandatory
+    GltfRootElement_Nodes,        //!< "nodes"       element, mandatory
+    GltfRootElement_Meshes,       //!< "meshes"      element, mandatory
+    GltfRootElement_Accessors,    //!< "accessors"   element, mandatory
+    GltfRootElement_BufferViews,  //!< "bufferViews" element, mandatory
+    GltfRootElement_Buffers,      //!< "buffers"     element, mandatory
+    GltfRootElement_NB_MANDATORY, //!< number of mandatory elements
+    // optional elements
+    GltfRootElement_Animations = GltfRootElement_NB_MANDATORY,  //!< "animations" element
+    GltfRootElement_Materials,    //!< "materials"  element,
+    GltfRootElement_Programs,     //!< "programs"   element,
+    GltfRootElement_Shaders,      //!< "shaders"    element,
+    GltfRootElement_Skins,        //!< "skins"      element,
+    GltfRootElement_Techniques,   //!< "techniques" element,
+    GltfRootElement_Textures,     //!< "textures"   element,
+    GltfRootElement_Images,       //!< "images"     element,
+    GltfRootElement_NB            //!< overall number of elements
+};
+
+/**
+ * Root elements within glTF JSON document - names array.
+ */
+static const char* GltfRootElementNames[GltfRootElement_NB] = {
+    "asset",
+    "scenes",
+    "scene",
+    "nodes",
+    "meshes",
+    "accessors",
+    "bufferViews",
+    "buffers",
+    "animations",
+    "materials",
+    "programs",
+    "shaders",
+    "skins",
+    "techniques",
+    "textures",
+    "images",
+};
+
+enum GltfPrimitiveMode {
+    GltfPrimitiveMode_UNKNOWN       = -1, //!< unknown or invalid type
+    GltfPrimitiveMode_Points        =  0, //!< GL_POINTS
+    GltfPrimitiveMode_Lines         =  1, //!< GL_LINES
+    GltfPrimitiveMode_LineLoop      =  2, //!< GL_LINE_LOOP
+    GltfPrimitiveMode_LineStrip     =  3, //!< GL_LINE_STRIP
+    GltfPrimitiveMode_Triangles     =  4, //!< GL_TRIANGLES
+    GltfPrimitiveMode_TriangleStrip =  5, //!< GL_TRIANGLE_STRIP
+    GltfPrimitiveMode_TriangleFan   =  6, //!< GL_TRIANGLE_FAN
+};
+
+enum GltfArrayType {
+    GltfArrayType_UNKNOWN,  //!< unknown or invalid type
+    GltfArrayType_Indices,  //!< "indices"    within "primitive"  element
+    GltfArrayType_Position, //!< "POSITION"   within "attributes" element
+    GltfArrayType_Normal,   //!< "NORMAL"     within "attributes" element
+    GltfArrayType_Color,    //!< "COLOR"      within "attributes" element
+    GltfArrayType_TCoord0,  //!< "TEXCOORD_0" within "attributes" element
+    GltfArrayType_TCoord1,  //!< "TEXCOORD_1" within "attributes" element
+    GltfArrayType_Joint,    //!< "JOINT"      within "attributes" element
+    GltfArrayType_Weight,   //!< "WEIGHT"     within "attributes" element
+};
+
+/**
+ * Similar to Graphic3d_TypeOfData but does not define actual type and includes matrices.
+ */
+enum GltfAccessorLayout {
+    GltfAccessorLayout_UNKNOWN, //!< unknown or invalid type
+    GltfAccessorLayout_Scalar,  //!< "SCALAR"
+    GltfAccessorLayout_Vec2,    //!< "VEC2"
+    GltfAccessorLayout_Vec3,    //!< "VEC3"
+    GltfAccessorLayout_Vec4,    //!< "VEC4"
+    GltfAccessorLayout_Mat2,    //!< "MAT2"
+    GltfAccessorLayout_Mat3,    //!< "MAT3"
+    GltfAccessorLayout_Mat4,    //!< "MAT4"
+};
+
+/**
+ * Accessor component type.
+ */
+enum GltfAccessorCompType {
+    GltfAccessorCompType_UNKNOWN, //!< unknown or invalid type
+    GltfAccessorCompType_Int8    = 5120, //!< GL_BYTE
+    GltfAccessorCompType_UInt8   = 5121, //!< GL_UNSIGNED_BYTE
+    GltfAccessorCompType_Int16   = 5122, //!< GL_SHORT
+    GltfAccessorCompType_UInt16  = 5123, //!< GL_UNSIGNED_SHORT
+    GltfAccessorCompType_UInt32  = 5125, //!< GL_UNSIGNED_INT
+    GltfAccessorCompType_Float32 = 5126, //!< GL_FLOAT
+};
+
+/**
+ * Accessor component type.
+ */
+enum GltfBufferViewTarget {
+    GltfBufferViewTarget_UNKNOWN,                      //!< unknown or invalid type
+    GltfBufferViewTarget_ARRAY_BUFFER         = 34962, //!< GL_ARRAY_BUFFER
+    GltfBufferViewTarget_ELEMENT_ARRAY_BUFFER = 34963, //!< GL_ELEMENT_ARRAY_BUFFER
+};
+
+/**
+ * Accessor structure.
+ */
+struct GltfAccessor {
+    int64_t              ByteOffset;
+    int32_t              ByteStride; // [0, 255]
+    int64_t              Count;
+    GltfAccessorLayout   Type;
+    GltfAccessorCompType ComponentType;
+
+    GltfAccessor() : ByteOffset(0), ByteStride(0), Count(0), Type(GltfAccessorLayout_UNKNOWN), ComponentType(GltfAccessorCompType_UNKNOWN) {}
+};
+
+/**
+ * BufferView structure.
+ */
+struct GltfBufferView {
+    int64_t ByteOffset;
+    int64_t ByteLength;
+    GltfBufferViewTarget Target;
+
+    GltfBufferView() : ByteOffset(0), ByteLength(0), Target(GltfBufferViewTarget_UNKNOWN) {}
+};
+
+/**
+ * Tool for importing asset from GLTF file.
+ */
+class StAssetImportGltf : public rapidjson::Document {
+
+        public:
+
+    /**
+     * Detect file format from the file header.
+     */
+    ST_LOCAL static bool probeFormatFromHeader(const char* theHeader,
+                                               const StString& theExt);
+
+    /**
+     * Detect file format from the file header.
+     */
+    ST_LOCAL static bool probeFormatFromExtension(const StString& theExt);
+
+        public:
+
+    /**
+     * Empty constructor.
+     */
+    ST_LOCAL StAssetImportGltf();
+
+    /**
+     * Perform the import.
+     */
+    ST_LOCAL bool load(const Handle(StDocNode)& theParentNode,
+                       const StString& theFile);
+
+    /**
+     * Parse glTF document.
+     */
+    ST_LOCAL bool gltfParse(const Handle(StDocNode)& theParentNode) {
+        if(!gltfParseRoots()) {
+            return false;
+        }
+
+        gltfParseAsset();
+        gltfParseMaterials();
+        return gltfParseScene(theParentNode);
+    }
+
+        protected:
+
+    /**
+     * Search mandatory root elements in the document.
+     */
+    bool gltfParseRoots();
+
+    /**
+     * Parse default scene.
+     */
+    bool gltfParseScene(const Handle(StDocNode)& theParentNode);
+
+    /**
+     * Parse document metadata.
+     */
+    void gltfParseAsset();
+
+        protected:
+
+    /**
+     * Parse materials defined in the document.
+     */
+    void gltfParseMaterials();
+
+    /**
+     * Parse standard material.
+     */
+    bool gltfParseStdMaterial (StGLMaterial& theMat,
+                               const GenericValue& theMatNode);
+
+    /**
+     * Parse common material (KHR_materials_common extension).
+     */
+    bool gltfParseCommonMaterial (StGLMaterial& theMat,
+                                  const GenericValue& theMatNode);
+
+    /**
+     * Parse pbrMetallicRoughness material.
+     */
+    bool gltfParsePbrMaterial(StGLMaterial& theMat,
+                              const GenericValue& theMatNode);
+
+    /**
+     * Parse material technique.
+     */
+    bool gltfParseTechnique(StGLMaterial& theMat,
+                            const GenericValue* theTechniqueId);
+
+    /**
+     * Parse texture definition.
+     */
+    bool gltfParseTexture(StGLMaterial& theMat,
+                          const GenericValue* theTextureId);
+
+        protected:
+
+    /**
+     * Parse scene array of nodes recursively.
+     */
+    bool gltfParseSceneNodes(const Handle(StDocNode)& theParentNode,
+                             const GenericValue& theSceneNodes);
+
+    /**
+     * Parse scene node recursively.
+     */
+    bool gltfParseSceneNode(const Handle(StDocNode)& theParentNode,
+                            const TCollection_AsciiString& theSceneNodeName,
+                            const GenericValue& theSceneNode);
+
+    /**
+     * Parse mesh element.
+     */
+    bool gltfParseMesh(const Handle(StDocNode)& theParentNode,
+                       const TCollection_AsciiString& theMeshName,
+                       const GenericValue& theMesh);
+
+    /**
+     * Parse GltfArrayType from string.
+     */
+    static GltfArrayType gltfParseAttribType(const char* theType) {
+        if(IsEqual("POSITION", theType)) {
+            return GltfArrayType_Position;
+        } else if(IsEqual("NORMAL", theType)) {
+            return GltfArrayType_Normal;
+        } else if(IsEqual("COLOR", theType)) {
+            return GltfArrayType_Color;
+        } else if(IsEqual("TEXCOORD_0", theType)) {
+            return GltfArrayType_TCoord0;
+        } else if(IsEqual("TEXCOORD_1", theType)) {
+            return GltfArrayType_TCoord1;
+        } else if(IsEqual("JOINT", theType)) {
+            return GltfArrayType_Joint;
+        } else if(IsEqual("WEIGHT", theType)) {
+            return GltfArrayType_Weight;
+        }
+        return GltfArrayType_UNKNOWN;
+    }
+
+    /**
+     * Parse primitive array.
+     */
+    bool gltfParsePrimArray(const Handle(StDocMeshNode)& theMeshNode,
+                            const TCollection_AsciiString& theMeshName,
+                            const GenericValue& thePrimArray);
+
+    /**
+     * Parse GltfAccessorLayout from string.
+     */
+    static GltfAccessorLayout gltfParseAccessorType(const char* theType) {
+        if(IsEqual("SCALAR", theType)) {
+            return GltfAccessorLayout_Scalar;
+        } else if(IsEqual("VEC2", theType)) {
+            return GltfAccessorLayout_Vec2;
+        } else if(IsEqual("VEC3", theType)) {
+            return GltfAccessorLayout_Vec3;
+        } else if(IsEqual("VEC4", theType)) {
+            return GltfAccessorLayout_Vec4;
+        } else if(IsEqual("MAT2", theType)) {
+            return GltfAccessorLayout_Mat2;
+        } else if(IsEqual("MAT3", theType)) {
+            return GltfAccessorLayout_Mat3;
+        } else if(IsEqual("MAT4", theType)) {
+            return GltfAccessorLayout_Mat4;
+        }
+        return GltfAccessorLayout_UNKNOWN;
+    }
+
+    /**
+     * Parse accessor.
+     */
+    bool gltfParseAccessor(const Handle(StPrimArray)& thePrimArray,
+                           const TCollection_AsciiString& theName,
+                           const GenericValue&     theAccessor,
+                           const GltfArrayType     theType,
+                           const GltfPrimitiveMode theMode);
+
+    /**
+     * Parse buffer view.
+     */
+    bool gltfParseBufferView(const Handle(StPrimArray)& thePrimArray,
+                             const TCollection_AsciiString& theName,
+                             const GenericValue&     theBufferView,
+                             const GltfAccessor&     theAccessor,
+                             const GltfArrayType     theType,
+                             const GltfPrimitiveMode theMode);
+
+    /**
+     * Parse buffer.
+     */
+    bool gltfParseBuffer(const Handle(StPrimArray)& thePrimArray,
+                         const TCollection_AsciiString& theName,
+                         const GenericValue&     theBuffer,
+                         const GltfAccessor&     theAccessor,
+                         const GltfBufferView&   theView,
+                         const GltfArrayType     theType,
+                         const GltfPrimitiveMode theMode);
+
+    /**
+     * Read buffer.
+     */
+    bool gltfReadBuffer(const Handle(StPrimArray)& thePrimArray,
+                        const TCollection_AsciiString& theName,
+                        const GltfAccessor&     theAccessor,
+                        std::istream&           theStream,
+                        const GltfArrayType     theType,
+                        const GltfPrimitiveMode theMode);
+
+protected:
+
+    /**
+     * Read vec4 from specified item.
+     */
+    static bool gltfReadVec4(StGLVec4& theVec4,
+                             const GenericValue* theVal) {
+        if(theVal == NULL || !theVal->IsArray() || theVal->Size() != 4) {
+            return false;
+        }
+
+        for(int aCompIter = 0; aCompIter < 4; ++aCompIter) {
+            const GenericValue& aGenVal = (*theVal)[aCompIter];
+            if(!aGenVal.IsNumber()) {
+                return false;
+            }
+            theVec4[aCompIter] = aGenVal.GetFloat();
+        }
+        return true;
+    }
+
+    /**
+     * Validate color.
+     */
+    static bool validateColor4(const StGLVec4& theVec) {
+        return theVec.r() >= 0.0f && theVec.r() <= 1.0f
+            && theVec.g() >= 0.0f && theVec.g() <= 1.0f
+            && theVec.b() >= 0.0f && theVec.b() <= 1.0f
+            && theVec.a() >= 0.0f && theVec.a() <= 1.0f;
+    }
+
+    /**
+     * Read vec3 from specified item.
+     */
+    static bool gltfReadVec3(StGLVec3& theVec3,
+                             const GenericValue* theVal) {
+        if(theVal == NULL || !theVal->IsArray() || theVal->Size() != 3) {
+            return false;
+        }
+
+        for(int aCompIter = 0; aCompIter < 3; ++aCompIter) {
+            const GenericValue& aGenVal = (*theVal)[aCompIter];
+            if(!aGenVal.IsNumber()) {
+                return false;
+            }
+            theVec3[aCompIter] = aGenVal.GetFloat();
+        }
+        return true;
+    }
+
+    /**
+     * Validate color
+     */
+    static bool validateColor3(const StGLVec3& theVec) {
+        return theVec.r() >= 0.0f && theVec.r() <= 1.0f
+            && theVec.g() >= 0.0f && theVec.g() <= 1.0f
+            && theVec.b() >= 0.0f && theVec.b() <= 1.0f;
+    }
+
+        protected:
+
+    /**
+     * Return text description for an error code.
+     */
+    static const char* formatParseError(rapidjson::ParseErrorCode theCode) {
+        switch(theCode) {
+            case rapidjson::kParseErrorNone:                          return "";
+            case rapidjson::kParseErrorDocumentEmpty:                 return "Empty Document";
+            case rapidjson::kParseErrorDocumentRootNotSingular:       return "The document root must not follow by other values";
+            case rapidjson::kParseErrorValueInvalid:                  return "Invalid value";
+            case rapidjson::kParseErrorObjectMissName:                return "Missing a name for object member";
+            case rapidjson::kParseErrorObjectMissColon:               return "Missing a colon after a name of object member";
+            case rapidjson::kParseErrorObjectMissCommaOrCurlyBracket: return "Missing a comma or '}' after an object member";
+            case rapidjson::kParseErrorArrayMissCommaOrSquareBracket: return "Missing a comma or ']' after an array element";
+            case rapidjson::kParseErrorStringUnicodeEscapeInvalidHex: return "Incorrect hex digit after \\u escape in string";
+            case rapidjson::kParseErrorStringUnicodeSurrogateInvalid: return "The surrogate pair in string is invalid";
+            case rapidjson::kParseErrorStringEscapeInvalid:           return "Invalid escape character in string";
+            case rapidjson::kParseErrorStringMissQuotationMark:       return "Missing a closing quotation mark in string";
+            case rapidjson::kParseErrorStringInvalidEncoding:         return "Invalid encoding in string";
+            case rapidjson::kParseErrorNumberTooBig:                  return "Number is too big to be stored in double";
+            case rapidjson::kParseErrorNumberMissFraction:            return "Miss fraction part in number";
+            case rapidjson::kParseErrorNumberMissExponent:            return "Miss exponent in number";
+            case rapidjson::kParseErrorTermination:                   return "Parsing was terminated";
+            case rapidjson::kParseErrorUnspecificSyntaxError:         return "Unspecific syntax error";
+        }
+        return "UNKOWN syntax error";
+    }
+
+        protected:
+
+    static StString formatSyntaxError(const StString& theFilePath,
+                                      const StString& theLibDescr);
+
+    void pushSceneNodeError(const StString& theSceneNode,
+                            const StString& theError) {
+        signals.onError(formatSyntaxError(myFileName, StString("Scene node '") + theSceneNode + "' " + theError + "."));
+    }
+
+    /**
+     * Return the string representation of the key in the document - either string key (glTF 1.0) or integer index within array (glTF 2.0).
+     */
+    static TCollection_AsciiString getKeyString(const rapidjson::Document::GenericValue& theValue) {
+        if(theValue.IsString()) {
+            return TCollection_AsciiString(theValue.GetString());
+        } else if(theValue.IsInt()) {
+            return TCollection_AsciiString(theValue.GetInt());
+        }
+        return TCollection_AsciiString();
+    }
+
+        protected:
+
+    /**
+     * Auxiliary structure for fast look-up of document sub-nodes of specified node.
+     */
+    class GltfElementMap {
+
+            public:
+
+        /**
+          * Empty constructor.
+          */
+        GltfElementMap() : myRoot (NULL) {}
+
+        /**
+          * Return TRUE if this element is NULL.
+          */
+        bool isNull() const { return myRoot == NULL; }
+
+        /**
+          * Access this node.
+          */
+        const GenericValue* getRoot() const { return myRoot; }
+
+        /**
+          * Find the child node with specified key.
+          */
+        const GenericValue* findChild(const rapidjson::Document::GenericValue& theKey) {
+            const TCollection_AsciiString aKey = getKeyString(theKey);
+            if(aKey.IsEmpty()) {
+                return NULL;
+            }
+
+            const GenericValue* aNode = NULL;
+            return myChildren.Find(aKey, aNode)
+                  ? aNode
+                  : NULL;
+        }
+
+        /**
+          * Initialize the element.
+          */
+        void init(const TCollection_AsciiString& theRootName,
+                  const GenericValue* theRoot);
+
+            private:
+
+        NCollection_DataMap<TCollection_AsciiString, const GenericValue*, TCollection_AsciiString> myChildren;
+        const GenericValue* myRoot;
+
+    };
+
+        public:
+
+    struct {
+        /**
+         * Emit callback Slot on error.
+         * @param theUserData (const StString& ) - error description.
+         */
+        StSignal<void (const StCString& )> onError;
+    } signals;
+
+        protected:
+
+    NCollection_DataMap<TCollection_AsciiString, Handle(StDocObjectNode)> mySceneNodeMap;
+    NCollection_DataMap<TCollection_AsciiString, Handle(StDocMeshNode)>   myMeshMap;
+    NCollection_DataMap<TCollection_AsciiString, Handle(StGLMaterial)>    myMaterials;
+
+    int64_t  myBinBodyOffset;  //!< offset to binary body
+    int64_t  myBinBodyLen;     //!< binary body length
+    bool     myIsBinary;       //!< binary document
+
+    GltfElementMap myGltfRoots[GltfRootElement_NB]; //!< glTF format root elements
+    StString myFileName;
+    StString myFolder;
+
+};
+
+#endif // __StAssetImportGltf_h_

sview-17_04.tar.gz/StCADViewer/StAssetImportShape.cpp Added

@@ -0,0 +1,568 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2011-2016
+ */
+
+#include "StAssetImportShape.h"
+
+#include <StStrings/StLogger.h>
+
+#include <BRep_Builder.hxx>
+#include <BRepLProp_SLProps.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepTools.hxx>
+#include <BinTools.hxx>
+#include <BinXCAFDrivers.hxx>
+#include <IGESCAFControl_Reader.hxx>
+#include <IGESControl_Controller.hxx>
+#include <Interface_Static.hxx>
+#include <Prs3d.hxx>
+#include <STEPCAFControl_Reader.hxx>
+#include <STEPControl_Controller.hxx>
+#include <StdPrs_ShadedShape.hxx>
+#include <TDF_Tool.hxx>
+#include <TDF_ChildIterator.hxx>
+#include <TDataStd_Name.hxx>
+#include <TDocStd_Document.hxx>
+#include <Transfer_TransientProcess.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
+#include <XCAFApp_Application.hxx>
+#include <XCAFDoc_ColorTool.hxx>
+#include <XCAFDoc_DocumentTool.hxx>
+#include <XCAFDoc_ShapeTool.hxx>
+#include <XCAFPrs_Style.hxx>
+#include <XCAFPrs.hxx>
+#include <XSControl_TransferReader.hxx>
+#include <XSControl_WorkSession.hxx>
+
+namespace {
+    static StString formatError(const StString& theFilePath,
+                                const StString& theLibDescr) {
+        StString aFileName, aFolderName;
+        StFileNode::getFolderAndFile(theFilePath, aFolderName, aFileName);
+        ST_ERROR_LOG("Can not load model from file \"" + theFilePath + "\" (" + theLibDescr + ')');
+        return StString("Can not load model from file\n\"") + aFileName + "\"\n" + theLibDescr;
+    }
+
+    // Check if specified data stream starts with specified header.
+    #define findFileHeader(theData, theHeader) (::strncmp(theData, theHeader, sizeof(theHeader) - 1) == 0)
+}
+
+void StAssetImportShape::initStatic() {
+    STEPControl_Controller::Init();
+    IGESControl_Controller::Init();
+    // STEP import
+    Interface_Static::SetIVal("read.step.assembly.level", 2);
+    Interface_Static::SetIVal("read.step.product.mode", 0);
+    Interface_Static::SetIVal("read.surfacecurve.mode", 0);
+    Interface_Static::SetIVal("read.step.shape.repr", 1);
+    Interface_Static::SetIVal("read.step.product.context", 1);
+    Interface_Static::SetIVal("read.step.shape.aspect", true);
+    Interface_Static::SetIVal("read.step.shape.relationship", true);
+    // STEP export
+    Interface_Static::SetCVal("write.step.schema", "AP214IS");
+    Interface_Static::SetIVal("write.surfacecurve.mode", 1);
+    Interface_Static::SetIVal("write.step.unit", 6); // meters
+    // IGES import
+    Interface_Static::SetIVal("read.iges.bspline.continuity", 0);
+    Interface_Static::SetIVal("read.surfacecurve.mode", 0);
+    Interface_Static::SetIVal("read.iges.onlyvisible", 0);
+    // IGES export
+    Interface_Static::SetIVal("write.iges.unit", 6); // meters
+    Interface_Static::SetIVal("write.iges.brep.mode", 0); // V5_1
+}
+
+StAssetImportShape::FileFormat StAssetImportShape::probeFormatFromHeader(const char* theHeader,
+                                                                         const StString& theExt) {
+    // suspect STEP if string "ISO-10303-21" is present
+    if(findFileHeader(theHeader, "ISO-10303-21")) {
+        // double-check by presence of "FILE_SHEMA" statement
+        if(::strstr(theHeader, "FILE_SCHEMA") != NULL) {
+            return FileFormat_STEP;
+        }
+    } else if(findFileHeader(theHeader, "DBRep_DrawableShape")
+           || findFileHeader(theHeader, "CASCADE Topology V1")) {
+        return FileFormat_BREP;
+    } else if(findFileHeader(theHeader, "\nOpen CASCADE Topology V3")) {
+        return FileFormat_BINBREP;
+    } else if(findFileHeader(theHeader, "BINFILE") && theExt.isEqualsIgnoreCase(stCString("xbf"))) {
+        return FileFormat_XBF;
+    }
+
+    if(theHeader[72] == 'S') {
+        const char *aPtr = theHeader + 73;
+        while(aPtr < theHeader + 80 && (*aPtr == ' ' || *aPtr == '0')) {
+            ++aPtr;
+        }
+        if(*aPtr == '1' && !::isalnum ((unsigned char )*++aPtr)) {
+            return FileFormat_IGES;
+        }
+    }
+    return FileFormat_UNKNOWN;
+}
+
+StAssetImportShape::FileFormat StAssetImportShape::probeFormatFromExtension(const StString& theExt) {
+    if(theExt.isEqualsIgnoreCase(stCString("igs")) || theExt.isEqualsIgnoreCase(stCString("iges"))) {
+        return FileFormat_IGES;
+    } else if(theExt.isEqualsIgnoreCase(stCString("stp")) || theExt.isEqualsIgnoreCase(stCString("step"))) {
+        return FileFormat_STEP;
+    } else if(theExt.isEqualsIgnoreCase(stCString("brep")) || theExt.isEqualsIgnoreCase(stCString("rle"))) {
+        return FileFormat_BREP;
+    } else if(theExt.isEqualsIgnoreCase(stCString("xbf"))) {
+        return FileFormat_XBF;
+    }
+    return FileFormat_UNKNOWN;
+}
+
+StAssetImportShape::StAssetImportShape()
+: myXCAFApp(new TDocStd_Application()) {
+    BinXCAFDrivers::DefineFormat(myXCAFApp);
+    //StdLDrivers::DefineFormat(myXCAFApp);
+    //BinLDrivers::DefineFormat(myXCAFApp);
+    //XmlLDrivers::DefineFormat(myXCAFApp);
+    //StdDrivers::DefineFormat(myXCAFApp);
+    //BinDrivers::DefineFormat(myXCAFApp);
+    //XmlDrivers::DefineFormat(myXCAFApp);
+    reset();
+}
+
+void StAssetImportShape::reset() {
+    // close old document
+    if(!myXCAFDoc.IsNull()) {
+        if(myXCAFDoc->HasOpenCommand()) {
+            myXCAFDoc->AbortCommand();
+        }
+
+        myXCAFDoc->Main().Root().ForgetAllAttributes(Standard_True);
+        myXCAFApp->Close(myXCAFDoc);
+        myXCAFDoc.Nullify();
+    }
+
+    // create new document
+    myXCAFApp->NewDocument(TCollection_ExtendedString("BinXCAF"), myXCAFDoc);
+    if(!myXCAFDoc.IsNull()) {
+        // Set the maximum number of available "undo" actions
+        myXCAFDoc->SetUndoLimit(10);
+    }
+}
+
+void StAssetImportShape::clearSession(const Handle(XSControl_WorkSession)& theWorkSession) {
+    if(theWorkSession.IsNull()) {
+        return;
+    }
+
+    // at first clear transient process
+    Handle(Transfer_TransientProcess) aMapReader = theWorkSession->TransferReader()->TransientProcess();
+    if(!aMapReader.IsNull()) {
+        aMapReader->Clear();
+    }
+
+    // at second clear transfer reader
+    Handle(XSControl_TransferReader) aTransferReader = theWorkSession->TransferReader();
+    if(!aTransferReader.IsNull()) {
+        aTransferReader->Clear(-1);
+    }
+}
+
+bool StAssetImportShape::load(const Handle(StDocNode)& theParentNode,
+                              const StString& theFile,
+                              const FileFormat theFormat) {
+    switch(theFormat) {
+        case FileFormat_STEP: {
+            if(!loadSTEP(theFile)) {
+                return false;
+            }
+            break;
+        }
+        case FileFormat_IGES: {
+            if(!loadIGES(theFile)) {
+                return false;
+            }
+            break;
+        }
+        case FileFormat_BREP:
+        case FileFormat_BINBREP: {
+            BRep_Builder aBuilder;
+            TopoDS_Shape aShape;
+            if(theFormat == FileFormat_BINBREP
+            && !BinTools::Read(aShape, theFile.toCString())) {
+                signals.onError(formatError(theFile, "BREP loading failed"));
+                return false;
+            } else if(!BRepTools::Read(aShape, theFile.toCString(), aBuilder)) {
+                signals.onError(formatError(theFile, "BREP loading failed"));
+                return false;
+            }
+
+            if(aShape.IsNull()) {
+                signals.onError(formatError(theFile, "No shapes found in the BREP file"));
+                return false;
+            }
+
+            Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool (myXCAFDoc->Main());
+            aShapeTool->AddShape(aShape);
+            break;
+        }
+        case FileFormat_XBF: {
+            if(myXCAFApp->Open(TCollection_ExtendedString(theFile.toCString(), true), myXCAFDoc) != PCDM_RS_OK) {
+                signals.onError(formatError(theFile, "XBF loading failed"));
+                return false;
+            }
+            break;
+        }
+        case FileFormat_UNKNOWN: {
+            signals.onError(formatError(theFile, "Format doesn't supported"));
+            return false;
+        }
+    }
+
+    TDF_LabelSequence aLabels;
+    Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool (myXCAFDoc->Main());
+    Handle(XCAFDoc_ColorTool) aColorTool = XCAFDoc_DocumentTool::ColorTool(myXCAFDoc->Main());
+    aShapeTool->GetFreeShapes(aLabels);
+    if(aLabels.IsEmpty()) {
+        signals.onError(formatError(theFile, "Empty document!"));
+        return false;
+    }
+
+    // perform meshing explicitly
+    TopoDS_Compound aCompound;
+    BRep_Builder    aBuildTool;
+    aBuildTool.MakeCompound(aCompound);
+    for(TDF_LabelSequence::Iterator aLabIter(aLabels); aLabIter.More(); aLabIter.Next()) {
+        TopoDS_Shape     aShape;
+        const TDF_Label& aLabel = aLabIter.Value();
+        if(XCAFDoc_ShapeTool::GetShape(aLabel, aShape)) {
+            aBuildTool.Add(aCompound, aShape);
+        }
+    }
+
+    Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer();
+    Standard_Real aDeflection = Prs3d::GetDeflection(aCompound, aDrawer);
+    if(!BRepTools::Triangulation(aCompound, aDeflection)) {
+        BRepMesh_IncrementalMesh anAlgo;
+        anAlgo.ChangeParameters().Deflection = aDeflection;
+        anAlgo.ChangeParameters().Angle      = aDrawer->HLRAngle();
+        anAlgo.ChangeParameters().InParallel = true;
+        anAlgo.SetShape(aCompound);
+        anAlgo.Perform();
+    }
+
+    XCAFPrs_Style aDefStyle;
+    aDefStyle.SetColorSurf(Quantity_NOC_GRAY65);
+    aDefStyle.SetColorCurv(Quantity_NOC_GRAY65);
+    for(TDF_LabelSequence::Iterator aLabIter(aLabels); aLabIter.More(); aLabIter.Next()) {
+        const TDF_Label& aLabel = aLabIter.Value();
+        TopLoc_Location aTrsf = XCAFDoc_ShapeTool::GetLocation(aLabel);
+        addNodeRecursive(theParentNode, *aColorTool, aLabel, aTrsf, aDefStyle);
+    }
+    return true;
+}
+
+void StAssetImportShape::addNodeRecursive(const Handle(StDocNode)& theParentTreeItem,
+                                          XCAFDoc_ColorTool&       theColorTool,
+                                          const TDF_Label&         theLabel,
+                                          const TopLoc_Location&   theParentTrsf,
+                                          const XCAFPrs_Style&     theParentStyle) {
+    TDF_Label aRefLabel = theLabel;
+    if(XCAFDoc_ShapeTool::IsReference(theLabel)) {
+        XCAFDoc_ShapeTool::GetReferredShape(theLabel, aRefLabel);
+    }
+
+    Handle(TDataStd_Name) aNodeName;
+    TCollection_AsciiString aName;
+    if(aRefLabel.FindAttribute(TDataStd_Name::GetID(), aNodeName)) {
+        aName = TCollection_AsciiString(aNodeName->Get());
+    }
+
+    XCAFPrs_Style aDefStyle = theParentStyle;
+    Quantity_Color aColor;
+    if(theColorTool.GetColor(aRefLabel, XCAFDoc_ColorGen, aColor)) {
+        aDefStyle.SetColorCurv(aColor);
+        aDefStyle.SetColorSurf(aColor);
+    }
+    if(theColorTool.GetColor(aRefLabel, XCAFDoc_ColorSurf, aColor)) {
+        aDefStyle.SetColorSurf(aColor);
+    }
+    if(theColorTool.GetColor(aRefLabel, XCAFDoc_ColorCurv, aColor)) {
+        aDefStyle.SetColorCurv(aColor);
+    }
+
+    Handle(StDocObjectNode) aChildTreeItem = new StDocObjectNode();
+    aChildTreeItem->setNodeName(aName.ToCString());
+    aChildTreeItem->setNodeTransformation(theParentTrsf.Transformation());
+    theParentTreeItem->ChangeChildren().Append(aChildTreeItem);
+    if(!XCAFDoc_ShapeTool::IsAssembly(aRefLabel)) {
+        addMeshNode(aChildTreeItem, aRefLabel, aDefStyle);
+        return;
+    }
+
+    for(TDF_ChildIterator aChildIter(aRefLabel); aChildIter.More(); aChildIter.Next()) {
+        TDF_Label aLabel = aChildIter.Value();
+        if(!aLabel.IsNull()
+        && (aLabel.HasAttribute() || aLabel.HasChild())) {
+            const TopLoc_Location aTrsf = XCAFDoc_ShapeTool::GetLocation(aLabel);
+            addNodeRecursive(aChildTreeItem, theColorTool, aLabel, aTrsf, aDefStyle);
+        }
+    }
+}
+
+bool StAssetImportShape::addMeshNode(const Handle(StDocNode)& theParentTreeItem,
+                                     const TDF_Label&         theShapeLabel,
+                                     const XCAFPrs_Style&     theParentStyle) {
+    if(theShapeLabel.IsNull()) {
+        return false;
+    }
+
+    TopoDS_Shape aShape;
+    if(!XCAFDoc_ShapeTool::GetShape(theShapeLabel, aShape)
+    || aShape.IsNull()) {
+        return false;
+    }
+
+    XCAFPrs_DataMapOfShapeStyle aStyles1, aStyles2;
+    {
+        TopLoc_Location aDummyLoc;
+        XCAFPrs::CollectStyleSettings(theShapeLabel, aDummyLoc, aStyles1);
+        for(XCAFPrs_DataMapOfShapeStyle::Iterator aStyleIter(aStyles1); aStyleIter.More(); aStyleIter.Next()) {
+            if(aStyleIter.Key().ShapeType() < TopAbs_FACE) {
+                for(TopExp_Explorer aFaceIter(aStyleIter.Key(), TopAbs_FACE); aFaceIter.More(); aFaceIter.Next()) {
+                    if(!aStyles1.IsBound(aFaceIter.Current())) {
+                        aStyles2.Bind(aFaceIter.Current(), aStyleIter.Value());
+                    }
+                }
+            }
+        }
+    }
+
+    TopoDS_Compound anOpened, aClosed;
+    BRep_Builder aBuilder;
+    aBuilder.MakeCompound(aClosed);
+    aBuilder.MakeCompound(anOpened);
+    StdPrs_ShadedShape::ExploreSolids(aShape, aBuilder, aClosed, anOpened, true);
+
+    TopLoc_Location aFaceLoc;
+    Handle(StDocMeshNode) aMeshNode = new StDocMeshNode();
+    theParentTreeItem->ChangeChildren().Append(aMeshNode);
+    BRepLProp_SLProps anSLProps(1, 1e-12);
+    BRepAdaptor_Surface aFaceAdaptor;
+    for(int aTypeIter = 0; aTypeIter < 2; ++aTypeIter) {
+        const bool isClosed = aTypeIter == 0;
+        const TopoDS_Compound& aComp = isClosed ? aClosed : anOpened;
+        for(TopExp_Explorer aFaceIter(aComp, TopAbs_FACE); aFaceIter.More(); aFaceIter.Next()) {
+            const TopoDS_Face& aFace = TopoDS::Face(aFaceIter.Current());
+            const Handle(Poly_Triangulation)& aPolyTri = BRep_Tool::Triangulation(aFace, aFaceLoc);
+            if(aPolyTri.IsNull()
+            || aPolyTri->NbTriangles() < 1) {
+                continue;
+            }
+
+            Handle(StPrimArray) aPrimAttribs = new StPrimArray();
+            const TColgp_Array1OfPnt& aNodes = aPolyTri->Nodes();
+            const int aNbNodes = aNodes.Size();
+            aPrimAttribs->Trsf = aFaceLoc.Transformation();
+            aPrimAttribs->Positions.resize(aNbNodes);
+            aPrimAttribs->Normals  .resize(aNbNodes);
+            aPrimAttribs->Indices  .resize(aPolyTri->NbTriangles() * 3);
+            {
+                const int aNodeLower = aNodes.Lower();
+                const int aNodeUpper = aNodes.Upper();
+                for(int aNodeIter = aNodeLower; aNodeIter <= aNodeUpper; ++aNodeIter) {
+                    const gp_Pnt& aSrcPos = aNodes.Value(aNodeIter);
+                    StGLVec3& aPos = aPrimAttribs->Positions[aNodeIter - aNodeLower];
+                    aPos.x() = (float )aSrcPos.X();
+                    aPos.y() = (float )aSrcPos.Y();
+                    aPos.z() = (float )aSrcPos.Z();
+                }
+            }
+
+            const bool isMirrored = aPrimAttribs->Trsf.Form() != gp_Identity
+                                 && aPrimAttribs->Trsf.VectorialPart().Determinant() < 0.0;
+            const bool isReversed = aFace.Orientation() == TopAbs_REVERSED;
+            const bool toSwapIndices = isReversed ^ isMirrored;
+            {
+                const Poly_Array1OfTriangle& aTriangles = aPolyTri->Triangles();
+                const int aNodeLower = aNodes.Lower();
+                const int aTriLower = aTriangles.Lower();
+                const int aTriUpper = aTriangles.Upper();
+                int aTriIndices[3] = {0, 0, 0};
+                int anIndexIter = 0;
+                for(int aTriIter = aTriLower; aTriIter <= aTriUpper; ++aTriIter, anIndexIter += 3) {
+                    aTriangles.Value(aTriIter).Get(aTriIndices[0], aTriIndices[1], aTriIndices[2]);
+                    if(toSwapIndices) {
+                        std::swap(aTriIndices[1], aTriIndices[2]);
+                    }
+                    aPrimAttribs->Indices[anIndexIter + 0] = aTriIndices[0] - aNodeLower;
+                    aPrimAttribs->Indices[anIndexIter + 1] = aTriIndices[1] - aNodeLower;
+                    aPrimAttribs->Indices[anIndexIter + 2] = aTriIndices[2] - aNodeLower;
+                }
+            }
+
+            if(aPolyTri->HasNormals()
+            && (aPolyTri->Normals().Size() / 3) == aPolyTri->Nodes().Size()) {
+                const TShort_Array1OfShortReal& aNormals = aPolyTri->Normals();
+                const int aNormLower = aNormals.Lower();
+                const int aNormUpper = aNormals.Upper();
+                for(int aNodeIter = 0; aNodeIter < aNbNodes; ++aNodeIter) {
+                    StGLVec3& aNorm = aPrimAttribs->Normals[aNodeIter];
+                    aNorm.x() = aNormals.Value(aNormLower + aNodeIter * 3);
+                    aNorm.y() = aNormals.Value(aNormLower + aNodeIter * 3 + 1);
+                    aNorm.z() = aNormals.Value(aNormLower + aNodeIter * 3 + 2);
+                    if(aNorm.modulus() != 0.0f) {
+                        aNorm.normalize();
+                        if(isReversed) {
+                            aNorm = -aNorm;
+                        }
+                    } else {
+                        aNorm.x() = 0.0f;
+                        aNorm.y() = 0.0f;
+                        aNorm.z() = 1.0f;
+                    }
+                }
+            } else if(aPolyTri->HasUVNodes()
+                   && aPolyTri->UVNodes().Size() == aPolyTri->Nodes().Size()) {
+                TopoDS_Face aFaceFwd = TopoDS::Face(aFace.Oriented(TopAbs_FORWARD));
+                aFaceFwd.Location(TopLoc_Location());
+                aFaceAdaptor.Initialize(aFaceFwd, false);
+                anSLProps.SetSurface(aFaceAdaptor);
+
+                const TColgp_Array1OfPnt2d& anUVNodes = aPolyTri->UVNodes();
+                const int aNodeLower = anUVNodes.Lower();
+                const int aNodeUpper = anUVNodes.Upper();
+                for(int aNodeIter = aNodeLower; aNodeIter <= aNodeUpper; ++aNodeIter) {
+                    StGLVec3& aNorm = aPrimAttribs->Normals[aNodeIter - aNodeLower];
+                    const gp_Pnt2d& anUV = anUVNodes.Value(aNodeIter);
+                    anSLProps.SetParameters(anUV.X(), anUV.Y());
+                    if(anSLProps.IsNormalDefined()) {
+                        gp_Dir aSurfNorm = anSLProps.Normal();
+                        if(isReversed) {
+                            aSurfNorm.Reverse();
+                        }
+                        aNorm.x() = (float )aSurfNorm.X();
+                        aNorm.y() = (float )aSurfNorm.Y();
+                        aNorm.z() = (float )aSurfNorm.Z();
+                    } else {
+                        aNorm.x() = 0.0f;
+                        aNorm.y() = 0.0f;
+                        aNorm.z() = 1.0f;
+                    }
+                }
+            } else {
+                // reconstruct missing normals
+                aPrimAttribs->reconstructNormals();
+            }
+
+            XCAFPrs_Style aStyle = theParentStyle;
+            if(!aStyles1.Find(aFace, aStyle)) {
+                aStyles2.Find(aFace, aStyle);
+            }
+
+            const Graphic3d_Vec3 aColor = aStyle.GetColorSurf();
+            aPrimAttribs->Material = new StGLMaterial();
+            aPrimAttribs->Material->DiffuseColor.r() = aColor.r();
+            aPrimAttribs->Material->DiffuseColor.g() = aColor.g();
+            aPrimAttribs->Material->DiffuseColor.b() = aColor.b();
+            aPrimAttribs->Material->AmbientColor.r() = aColor.r() * 0.25f;
+            aPrimAttribs->Material->AmbientColor.g() = aColor.g() * 0.25f;
+            aPrimAttribs->Material->AmbientColor.b() = aColor.b() * 0.25f;
+            aPrimAttribs->Material->SpecularColor = StGLVec4(0.95f, 0.93f, 0.88f, 1.0f);
+            aPrimAttribs->Material->EmissiveColor = StGLVec4(0.0f,  0.0f,  0.0f,  0.0f);
+            aPrimAttribs->Material->ChangeShine() = 0.75f;
+            aPrimAttribs->Material->SetCullBackFaces(isClosed);
+
+            aMeshNode->ChangePrimitiveArrays().Append(aPrimAttribs);
+        }
+    }
+
+    return true;
+}
+
+bool StAssetImportShape::loadIGES(const StString& theFileToLoadPath) {
+    IGESCAFControl_Reader aReader;
+    Handle(XSControl_WorkSession) aWS = aReader.WS();
+    try {
+        // read model from file
+        {
+            {
+                Handle(Transfer_TransientProcess) aMapReader = aWS->TransferReader()->TransientProcess();
+                if(!aMapReader.IsNull()) {
+                    //aMapReader->SetProgress(theProgress);
+                }
+            }
+
+            if(!aReader.ReadFile(theFileToLoadPath.toCString())) {
+                signals.onError(formatError(theFileToLoadPath, "IGES reader, reading failed"));
+                clearSession (aWS);
+                return false;
+            }
+        }
+        // translate model into document
+        {
+          if(!aWS.IsNull()) {
+              Handle(Transfer_TransientProcess) aMapReader = aWS->TransferReader()->TransientProcess();
+              if(!aMapReader.IsNull()) {
+                  //aMapReader->SetProgress(theProgress);
+              }
+          }
+          {
+              if(!aReader.Transfer(myXCAFDoc)) {
+                  signals.onError(formatError(theFileToLoadPath, "IGES reader, shape translation failed"));
+                  clearSession(aWS);
+                  return false;
+              }
+              clearSession(aWS);
+          }
+        }
+    } catch(Standard_Failure theFailure) {
+        signals.onError(formatError(theFileToLoadPath, StString() + "IGES reader, exception raised\n[" + theFailure.GetMessageString() + "]"));
+        return false;
+    }
+    return true;
+}
+
+bool StAssetImportShape::loadSTEP(const StString& theFileToLoadPath) {
+    STEPCAFControl_Reader aReader;
+    Handle(XSControl_WorkSession) aWS = aReader.Reader().WS();
+    try {
+        // read model from file
+        {
+            {
+                Handle(Transfer_TransientProcess) aMapReader = aWS->TransferReader()->TransientProcess();
+                if(!aMapReader.IsNull()) {
+                    //aMapReader->SetProgress(theProgress);
+                }
+            }
+
+            if(!aReader.ReadFile(theFileToLoadPath.toCString())) {
+                signals.onError(formatError(theFileToLoadPath, "STEP reader, reading failed"));
+                clearSession(aWS);
+                return false;
+            }
+        }
+
+        // translate model into document
+        {
+            {
+              Handle(Transfer_TransientProcess) aMapReader = aWS->TransferReader()->TransientProcess();
+              if(!aMapReader.IsNull()) {
+                  //aMapReader->SetProgress(theProgress);
+              }
+            }
+
+            {
+              if(!aReader.Transfer(myXCAFDoc)) {
+                  signals.onError(formatError(theFileToLoadPath, "STEP reader, shape translation failed"));
+                  clearSession(aWS);
+                  return false;
+              }
+            }
+
+            clearSession(aWS);
+        }
+    } catch(Standard_Failure theFailure) {
+        signals.onError(formatError(theFileToLoadPath, StString() + "STEP reader, exception raised\n[" + theFailure.GetMessageString() + "]"));
+        return false;
+    }
+    return true;
+}

sview-17_04.tar.gz/StCADViewer/StAssetImportShape.h Added

@@ -0,0 +1,133 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2011-2016
+ */
+
+#ifndef __StAssetImportShape_h_
+#define __StAssetImportShape_h_
+
+#include <StStrings/StString.h>
+#include <StFile/StFileNode.h>
+#include <StSlots/StSignal.h>
+
+#include <Standard_Type.hxx>
+
+#include "StAssetDocument.h"
+
+class TDF_Label;
+class TDocStd_Document;
+class TopLoc_Location;
+class TopoDS_Shape;
+class TDocStd_Application;
+class XCAFDoc_ColorTool;
+class XCAFPrs_Style;
+class XSControl_WorkSession;
+
+/**
+ * Tool for importing asset from BRep shape.
+ */
+class StAssetImportShape {
+
+        public:
+
+    /**
+     * Supported file formats.
+     */
+    enum FileFormat {
+        FileFormat_UNKNOWN,
+        FileFormat_BREP,
+        FileFormat_BINBREP,
+        FileFormat_XBF,
+        FileFormat_STEP,
+        FileFormat_IGES,
+    };
+
+        public:
+
+    /**
+     * Detect file format from the file header.
+     */
+    ST_LOCAL static FileFormat probeFormatFromHeader(const char* theHeader,
+                                                     const StString& theExt);
+
+    /**
+     * Detect file format from the file header.
+     */
+    ST_LOCAL static FileFormat probeFormatFromExtension(const StString& theExt);
+
+    /**
+     * Initialize global data exchange parameters.
+     */
+    ST_LOCAL static void initStatic();
+
+        public:
+
+    /**
+     * Empty constructor.
+     */
+    ST_LOCAL StAssetImportShape();
+
+    /**
+     * Perform the import.
+     */
+    ST_LOCAL bool load(const Handle(StDocNode)& theParentNode,
+                       const StString& theFile,
+                       const FileFormat theFormat);
+
+        protected:
+
+    /**
+     * Fill in XDE document from IGES file.
+     */
+    ST_LOCAL bool loadIGES(const StString& theFile);
+
+    /**
+     * Fill in XDE document from STEP file.
+     */
+    ST_LOCAL bool loadSTEP(const StString& theFile);
+
+    /**
+     * Add the XDE label into Asset document.
+     */
+    ST_LOCAL void addNodeRecursive(const Handle(StDocNode)& theParentTreeItem,
+                                   XCAFDoc_ColorTool&       theColorTool,
+                                   const TDF_Label&         theLabel,
+                                   const TopLoc_Location&   theParentTrsf,
+                                   const XCAFPrs_Style&     theParentStyle);
+
+    /**
+     * Add the BRep shape into Asset document.
+     */
+    ST_LOCAL bool addMeshNode(const Handle(StDocNode)& theParentTreeItem,
+                              const TDF_Label&         theShapeLabel,
+                              const XCAFPrs_Style&     theParentStyle);
+
+    /**
+     * Reset XDE document.
+     */
+    ST_LOCAL void reset();
+
+    /**
+     * Clear working session.
+     */
+    ST_LOCAL void clearSession(const Handle(XSControl_WorkSession)& theWorkSession);
+
+        public:
+
+    struct {
+        /**
+         * Emit callback Slot on error.
+         * @param theUserData (const StString& ) - error description.
+         */
+        StSignal<void (const StCString& )> onError;
+    } signals;
+
+        protected:
+
+    Handle(TDocStd_Application) myXCAFApp;
+    Handle(TDocStd_Document)    myXCAFDoc;
+
+};
+
+#endif // __StAssetImportShape_h_

sview-17_04.tar.gz/StCADViewer/StAssetNodeIterator.h Added

@@ -0,0 +1,176 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StAssetNodeIterator_h_
+#define __StAssetNodeIterator_h_
+
+#include "StAssetNodeIterator.h"
+
+/**
+ * Smart document iterator through nodes of requested type.
+ */
+class StAssetNodeIterator {
+
+        public:
+
+    /**
+     * Main constructor.
+     */
+    StAssetNodeIterator(const Handle(StDocNode)& theRoot,
+                        const StDocNodeType theToFind)
+    : myTop(-1), myToFind(theToFind), myToAvoid(StDocNodeType_Unknown), myHasMore(false) {
+        init(theRoot, theToFind);
+    }
+
+    /**
+     * Initialize the iterator.
+     */
+    void init(const Handle(StDocNode)& theRoot,
+              const StDocNodeType theToFind) {
+        for(int aStackIter = 0; aStackIter <= myTop; ++aStackIter) {
+            myNodeStack.SetValue(aStackIter, NCollection_Sequence<Handle(StDocNode)>::Iterator());
+        }
+        myTrsf    = gp_Trsf();
+        myTop    = -1;
+        myRoot   = theRoot;
+        myToFind = theToFind;
+        if(theRoot.IsNull()
+        || myToFind == StDocNodeType_Unknown) {
+            myHasMore = false;
+            return;
+        }
+
+        const StDocNodeType aRootNodeType = theRoot->nodeType();
+        if(isLessComplexNodeType(aRootNodeType, theToFind)) {
+            // the first Shape is less complex, nothing to find
+            myHasMore = false;
+        } else if(!isSameNodeType(aRootNodeType, theToFind)) {
+            // type is more complex search inside
+            myHasMore = true;
+            next();
+        } else {
+            // type is found
+            myHasMore = true;
+            myTrsf = theRoot->nodeTransformation();
+        }
+    }
+
+    /**
+     * Return true, if iterator points to the valid node.
+     */
+    bool more() const { return myHasMore; }
+
+    /**
+     * Return the current node.
+     */
+    const Handle(StDocNode)& value() const {
+        if(!myHasMore) {
+            //
+        }
+        if(myTop >= 0) {
+            return myNodeStack.Value(myTop).Value();
+        } else {
+            return myRoot;
+        }
+    }
+
+    /**
+     * Return transformation to the current node.
+     */
+    const gp_Trsf& location() const {
+        return myTrsf;
+    }
+
+    /**
+     * Go to the next node.
+     */
+    void next() {
+        if(!myHasMore) {
+            // assert
+            return;
+        }
+
+        if(myTop < 0) {
+            const StDocNodeType aNodeType = myRoot->nodeType();
+            if(isSameNodeType(myToFind, aNodeType)) {
+                // already visited once
+                myHasMore = false;
+                return;
+            } else if(toAvoidNodeType(myToAvoid, aNodeType)) {
+                // avoid the top-level
+                myHasMore = false;
+                return;
+            } else {
+                // push and try to find
+                myTop = 0;
+                myNodeStack.SetValue(0, NCollection_Sequence<Handle(StDocNode)>::Iterator(myRoot->Children()));
+            }
+        } else {
+            myNodeStack.ChangeValue(myTop).Next();
+        }
+
+        for(;;) {
+            if(myNodeStack.Value(myTop).More()) {
+                const Handle(StDocNode)& aNodeTop = myNodeStack.Value(myTop).Value();
+                const StDocNodeType aNodeType = aNodeTop->nodeType();
+                if(isSameNodeType(myToFind, aNodeType)) {
+                    myHasMore = true;
+
+                    myTrsf = gp_Trsf();
+                    for(int aStackIter = 0; aStackIter <= myTop; ++aStackIter) {
+                        const Handle(StDocNode)& aNode = myNodeStack.Value(aStackIter).Value();
+                        myTrsf = myTrsf * aNode->nodeTransformation();
+                    }
+                    return;
+                } else if(isLessComplexNodeType(myToFind, aNodeType)
+                      && !toAvoidNodeType(myToAvoid, aNodeType)) {
+                    ++myTop;
+                    myNodeStack.SetValue(myTop, NCollection_Sequence<Handle(StDocNode)>::Iterator(aNodeTop->Children()));
+                } else {
+                    myNodeStack.ChangeValue(myTop).Next();
+                }
+            } else {
+                myNodeStack.SetValue(myTop, NCollection_Sequence<Handle(StDocNode)>::Iterator());
+                --myTop;
+                if(myTop < 0) {
+                    break;
+                }
+
+                myNodeStack.ChangeValue(myTop).Next();
+            }
+        }
+        myHasMore = false;
+    }
+
+        protected:
+
+    //! Function to compare two types of nodes
+    static bool isSameNodeType(StDocNodeType theType1, StDocNodeType theType2) {
+        return theType1 == theType2;
+    }
+
+    static bool toAvoidNodeType(StDocNodeType theType1, StDocNodeType theType2) {
+        return theType1 != StDocNodeType_Unknown
+            && theType1 == theType2;
+    }
+
+    static bool isLessComplexNodeType(StDocNodeType theType1, StDocNodeType theType2) {
+        return theType1 > theType2;
+    }
+
+        protected:
+
+    Handle(StDocNode) myRoot;
+    NCollection_Vector<NCollection_Sequence<Handle(StDocNode)>::Iterator> myNodeStack;
+    int           myTop;
+    StDocNodeType myToFind;
+    StDocNodeType myToAvoid;
+    bool          myHasMore;
+    gp_Trsf       myTrsf;
+
+};
+
+#endif // __StAssetNodeIterator_h_

sview-17_04.tar.gz/StCADViewer/StAssetPresentation.cpp Added

@@ -0,0 +1,152 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#include "StAssetPresentation.h"
+
+#include <Graphic3d_ArrayOfTriangles.hxx>
+#include <NCollection_IndexedDataMap.hxx>
+
+/**
+ * Auxiliary structure for grouping primitive arrays by common material.
+ */
+struct StLocatedPrimArray {
+    Handle(StPrimArray) PrimArray;
+    gp_Trsf             NodeTrsf;
+
+    StLocatedPrimArray() {}
+    StLocatedPrimArray(const Handle(StPrimArray)& thePrimArray,
+                       const gp_Trsf& theNodeTrsf) : PrimArray(thePrimArray), NodeTrsf(theNodeTrsf) {}
+};
+
+/**
+ * Auxiliary structure for grouping primitive arrays by common material.
+ */
+struct StPrsPart {
+    NCollection_Sequence<StLocatedPrimArray> PrimArrays;
+    size_t NbNodes;
+    size_t NbTris;
+    bool   HasTexCoord0;
+
+    StPrsPart() : NbNodes(0), NbTris(0), HasTexCoord0(false) {}
+};
+
+void StAssetPresentation::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+                                   const Handle(Prs3d_Presentation)& thePrs,
+                                   const int theMode) {
+    (void )thePrsMgr;
+    if(theMode != 0) {
+        return;
+    }
+
+    const StPrsPart anEmptyPart;
+    NCollection_IndexedDataMap<Handle(StGLMaterial), StPrsPart, StGLMaterial> aStyleMap;
+
+    for(NCollection_Sequence<StDocLocatedMeshNode>::Iterator aDocNodeIter(myDocNodes); aDocNodeIter.More(); aDocNodeIter.Next()) {
+        const Handle(StDocMeshNode)& aDocNode = aDocNodeIter.Value().Mesh;
+        const gp_Trsf& aMeshTrsf = aDocNodeIter.Value().Trsf;
+        for(NCollection_Sequence<Handle(StPrimArray)>::Iterator aPrimIter(aDocNode->PrimitiveArrays()); aPrimIter.More(); aPrimIter.Next()) {
+            const Handle(StPrimArray)& aPrims = aPrimIter.Value();
+            const int anIndex = aStyleMap.Add(aPrims->Material, anEmptyPart);
+            StPrsPart& aPrsPart = aStyleMap.ChangeFromIndex(anIndex);
+            aPrsPart.NbNodes += aPrims->Positions.size();
+            aPrsPart.NbTris  += aPrims->Indices.size() / 3;
+            aPrsPart.HasTexCoord0 = aPrsPart.HasTexCoord0 || !aPrims->TexCoords0.empty();
+            aPrsPart.PrimArrays.Append(StLocatedPrimArray(aPrims, aMeshTrsf));
+        }
+    }
+
+    for(NCollection_IndexedDataMap<Handle(StGLMaterial), StPrsPart, StGLMaterial>::Iterator aStyleIter(aStyleMap); aStyleIter.More(); aStyleIter.Next()) {
+        const StPrsPart& aPrsPart = aStyleIter.Value();
+        Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles(int(aPrsPart.NbNodes), int(aPrsPart.NbTris * 3), true, false, aPrsPart.HasTexCoord0);
+        for(NCollection_Sequence<StLocatedPrimArray>::Iterator aPrimIter(aPrsPart.PrimArrays); aPrimIter.More(); aPrimIter.Next()) {
+            const Handle(StPrimArray)& aPrims = aPrimIter.Value().PrimArray;
+            const gp_Trsf& aMeshTrsf = aPrimIter.Value().NodeTrsf;
+
+            const int aLowerVertex = aTris->VertexNumber() + 1;
+
+            const size_t aNbPrimNodes = aPrims->Positions.size();
+            const gp_Trsf aTrsf = aMeshTrsf * aPrims->Trsf;
+            if(aTrsf.Form() != gp_Identity) {
+                for(size_t aNodeIter = 0; aNodeIter < aNbPrimNodes; ++aNodeIter) {
+                    const StGLVec3& aPos = aPrims->Positions[aNodeIter];
+                    StGLVec3 aNorm = aPrims->Normals[aNodeIter];
+                    if(aNorm.modulus() != 0.0f) {
+                        gp_Dir aNormTrsf(aNorm.x(), aNorm.y(), aNorm.z());
+                        aNormTrsf.Transform(aTrsf);
+                        aNorm.x() = (float )aNormTrsf.X();
+                        aNorm.y() = (float )aNormTrsf.Y();
+                        aNorm.z() = (float )aNormTrsf.Z();
+                    }
+
+                    gp_Pnt aPosTrsf(aPos.x(),  aPos.y(),  aPos.z());
+                    aPosTrsf.Transform(aTrsf);
+                    aTris->AddVertex((float )aPosTrsf.X(), (float )aPosTrsf.Y(), (float )aPosTrsf.Z(),
+                                     aNorm.x(), aNorm.y(), aNorm.z());
+                }
+            } else {
+                for(size_t aNodeIter = 0; aNodeIter < aNbPrimNodes; ++aNodeIter) {
+                    const StGLVec3& aPos  = aPrims->Positions[aNodeIter];
+                    const StGLVec3& aNorm = aPrims->Normals  [aNodeIter];
+                    aTris->AddVertex(aPos.x(),  aPos.y(),  aPos.z(),
+                                     aNorm.x(), aNorm.y(), aNorm.z());
+                }
+            }
+
+            if(aPrsPart.HasTexCoord0
+            && aPrims->TexCoords0.size() == aPrims->Positions.size()) {
+                for(size_t aNodeIter = 0; aNodeIter < aNbPrimNodes; ++aNodeIter) {
+                    const StGLVec2& aTexCoord = aPrims->TexCoords0[aNodeIter];
+                    aTris->SetVertexTexel(aLowerVertex + int(aNodeIter), aTexCoord.x(), aTexCoord.y());
+                }
+            }
+
+            const size_t aNbPrimIndices = aPrims->Indices.size();
+            for(size_t anIndexIter = 0; anIndexIter < aNbPrimIndices; ++anIndexIter) {
+                aTris->AddEdge(aLowerVertex + aPrims->Indices[anIndexIter]);
+            }
+        }
+
+        const Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
+        Graphic3d_MaterialAspect aMat(Graphic3d_NOM_SILVER);
+        const Handle(StGLMaterial)& anStMat = aStyleIter.Key();
+        if(!anStMat.IsNull()) {
+            aMat = Graphic3d_MaterialAspect();
+            aMat.SetMaterialType(Graphic3d_MATERIAL_PHYSIC);
+            aMat.SetDiffuse (1.0f);
+            aMat.SetAmbient (1.0f);
+            aMat.SetSpecular(1.0f);
+            aMat.SetEmissive(1.0f);
+            if(anStMat->EmissiveColor.rgb() != StGLVec3(0.0f, 0.0f, 0.0f)) {
+                aMat.SetReflectionModeOn(Graphic3d_TOR_EMISSION);
+            }
+            aMat.SetDiffuseColor (Quantity_Color(anStMat->DiffuseColor.r(),  anStMat->DiffuseColor.g(),  anStMat->DiffuseColor.b(),  Quantity_TOC_RGB));
+            aMat.SetTransparency (float(1.0 - anStMat->DiffuseColor.a()));
+            aMat.SetAmbientColor (Quantity_Color(anStMat->AmbientColor.r(),  anStMat->AmbientColor.g(),  anStMat->AmbientColor.b(),  Quantity_TOC_RGB));
+            aMat.SetSpecularColor(Quantity_Color(anStMat->SpecularColor.r(), anStMat->SpecularColor.g(), anStMat->SpecularColor.b(), Quantity_TOC_RGB));
+            aMat.SetEmissiveColor(Quantity_Color(anStMat->EmissiveColor.r(), anStMat->EmissiveColor.g(), anStMat->EmissiveColor.b(), Quantity_TOC_RGB));
+            aMat.SetShininess(anStMat->Shine());
+            aMat.SetMaterialName(anStMat->Name.toCString());
+        }
+
+        Handle(Graphic3d_AspectFillArea3d) anAspect = new Graphic3d_AspectFillArea3d(Aspect_IS_SOLID, aMat.Color(), aMat.Color(), Aspect_TOL_EMPTY, 1.0, aMat, aMat);
+        if(!anStMat.IsNull()) {
+            if(!anStMat->Texture.IsNull()) {
+                anAspect->SetTextureMap(anStMat->Texture);
+                anAspect->SetTextureMapOn();
+            }
+            anAspect->SetSuppressBackFaces(anStMat->ToCullBackFaces());
+            if(anStMat->ToCullBackFaces()) {
+                aGroup->SetClosed(true);
+            }
+        }
+
+        aGroup->SetGroupPrimitivesAspect(anAspect);
+        aGroup->AddPrimitiveArray(aTris);
+    }
+}
+
+void StAssetPresentation::ComputeSelection (const Handle(SelectMgr_Selection)& ,
+                                            const int ) {}

sview-17_04.tar.gz/StCADViewer/StAssetPresentation.h Added

@@ -0,0 +1,58 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StAssetPresentation_h_
+#define __StAssetPresentation_h_
+
+#include "StAssetDocument.h"
+
+#include <AIS_InteractiveObject.hxx>
+
+/**
+ * Document node with cumulative transformation (including parent nodes).
+ */
+struct StDocLocatedMeshNode {
+    Handle(StDocMeshNode) Mesh;
+    gp_Trsf               Trsf;
+
+    StDocLocatedMeshNode(const Handle(StDocMeshNode)& theMesh, const gp_Trsf& theTrsf) : Mesh(theMesh), Trsf(theTrsf) {}
+    StDocLocatedMeshNode() {}
+};
+
+/**
+ * Custom interactive object for mesh data.
+ */
+class StAssetPresentation : public AIS_InteractiveObject {
+
+    DEFINE_STANDARD_RTTI_INLINE(StAssetPresentation, AIS_InteractiveObject)
+
+        public:
+
+    StAssetPresentation() {
+        SetDisplayMode(0);
+    }
+
+    virtual bool AcceptDisplayMode(const int theMode) const Standard_OVERRIDE { return theMode == 0; }
+
+    //! Redefined method to compute presentation.
+    ST_LOCAL virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+                                  const Handle(Prs3d_Presentation)& thePrs,
+                                  const int theMode) Standard_OVERRIDE;
+
+    //! Compute selection.
+    ST_LOCAL virtual void ComputeSelection(const Handle(SelectMgr_Selection)& theSelection,
+                                           const int theMode) Standard_OVERRIDE;
+
+    void AddMeshNode(const Handle(StDocMeshNode)& theNode,
+                     const gp_Trsf& theTrsf) { myDocNodes.Append(StDocLocatedMeshNode(theNode, theTrsf)); }
+
+        protected:
+
+    NCollection_Sequence<StDocLocatedMeshNode> myDocNodes;
+
+};
+
+#endif // __StAssetPresentation_h_

sview-17_04.tar.gz/StCADViewer/StAssetTexture.cpp Added

sview-17_04.tar.gz/StCADViewer/StAssetTexture.h Added

@@ -0,0 +1,68 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StAssetTexture_h_
+#define __StAssetTexture_h_
+
+#include <Graphic3d_Texture2Dmanual.hxx>
+
+#include <StStrings/StString.h>
+
+/**
+ * Image texture provide with equality check.
+ */
+class StAssetTexture : public Graphic3d_Texture2Dmanual {
+
+    DEFINE_STANDARD_RTTI_INLINE(StAssetTexture, Graphic3d_Texture2Dmanual)
+
+        public:
+
+    /**
+     * Constructor.
+     */
+    StAssetTexture(const StString& theUri)
+    : Graphic3d_Texture2Dmanual(theUri.toCString()),
+      myImageUri(theUri) {
+        if(!theUri.isEmpty()) {
+            myTexId = TCollection_AsciiString("texture://") + theUri.toCString();
+        }
+    }
+
+    /**
+     * Image getter.
+     */
+    ST_LOCAL virtual Handle(Image_PixMap) GetImage() const Standard_OVERRIDE;
+
+    /**
+     * Compare with another texture.
+     */
+    virtual bool isEqual(const StAssetTexture& theOther) const {
+        return myImageUri == theOther.myImageUri;
+    }
+
+        public:
+
+    /**
+     * Compare to textures.
+     */
+    static bool IsEqual(const Handle(StAssetTexture)& theTex1,
+                        const Handle(StAssetTexture)& theTex2) {
+        if(theTex1 == theTex2) {
+            return true;
+        }
+
+        return !theTex1.IsNull()
+            && !theTex2.IsNull()
+            &&  theTex1->isEqual(*theTex2);
+    }
+
+        protected:
+
+    StString myImageUri;
+
+};
+
+#endif // __StAssetTexture_h_

sview-16_06.tar.gz/StCADViewer/StCADLoader.cpp -> sview-17_04.tar.gz/StCADViewer/StCADLoader.cpp Changed

@@ -4,62 +4,25 @@
  * Copyright © Kirill Gavrilov, 2011-2016
  */
 
+#include "StAssetImportGltf.h"
+
 #ifdef ST_HAVE_STCONFIG
     #include <stconfig.conf>
 #endif
 
 #include "StCADLoader.h"
 #include "StCADPluginInfo.h"
+#include "StAssetPresentation.h"
+#include "StAssetImportShape.h"
+#include "StAssetNodeIterator.h"
 
 #include <StStrings/StLangMap.h>
-
-#include <AIS_Shape.hxx>
-#include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepTools.hxx>
-#include <BRepBuilderAPI_Sewing.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepMesh.hxx>
-#include <BRepLProp_SLProps.hxx>
-#include <IGESControl_Reader.hxx>
-#include <STEPControl_Reader.hxx>
-#include <XSControl_WorkSession.hxx>
-#include <ShapeFix_Shape.hxx>
-
-#include <Prs3d.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopExp_Explorer.hxx>
+#include <StFile/StRawFile.h>
 
 const StString StCADLoader::ST_CAD_MIME_STRING(ST_CAD_PLUGIN_MIME_CHAR);
 const StMIMEList StCADLoader::ST_CAD_MIME_LIST(StCADLoader::ST_CAD_MIME_STRING);
 const StArrayList<StString> StCADLoader::ST_CAD_EXTENSIONS_LIST(StCADLoader::ST_CAD_MIME_LIST.getExtensionsList());
 
-StCADDocument::StCADDocument()
-: myXCAFApp(XCAFApp_Application::GetApplication()) {
-    reset();
-}
-
-void StCADDocument::reset() {
-    // close old document
-    if(!myXCAFDoc.IsNull()) {
-        if(myXCAFDoc->HasOpenCommand()) {
-            myXCAFDoc->AbortCommand();
-        }
-
-        myXCAFDoc->Main().Root().ForgetAllAttributes(Standard_True);
-        myXCAFApp->Close(myXCAFDoc);
-        myXCAFDoc.Nullify();
-    }
-
-    // create new document
-    myXCAFApp->NewDocument(TCollection_ExtendedString("BinXCAF"), myXCAFDoc);
-    if(!myXCAFDoc.IsNull()) {
-        // Set the maximum number of available "undo" actions
-        myXCAFDoc->SetUndoLimit(10);
-    }
-}
-
 StCADLoader::StCADLoader(const StHandle<StLangMap>&  theLangMap,
                          const StHandle<StPlayList>& thePlayList,
                          const bool                  theToStartThread)
@@ -83,152 +46,54 @@
     ///ST_DEBUG_LOG_AT("Destructor done");
 }
 
-static StString formatError(const StString& theFilePath,
-                            const StString& theLibDescr) {
-    StString aFileName, aFolderName;
-    StFileNode::getFolderAndFile(theFilePath, aFolderName, aFileName);
-    ST_ERROR_LOG("Can not load CAD model from file \"" + theFilePath + "\" (" + theLibDescr + ')');
-    return StString("Can not load CAD model from file\n\"") + aFileName + "\"\n" + theLibDescr;
-}
-
-TopoDS_Shape StCADLoader::loadIGES(const StString& theFileToLoadPath) {
-    TopoDS_Shape aShape;
-    IGESControl_Reader aReader;
-    IFSelect_ReturnStatus aReadStatus = IFSelect_RetFail;
-    StString aFilePath = StFileNode::getCompatibleName(theFileToLoadPath);
-
-    try {
-        aReadStatus = aReader.ReadFile(aFilePath.toCString());
-    } catch(Standard_Failure) {
-        signals.onError(formatError(theFileToLoadPath, "IGES reader, computation error"));
-        return aShape;
-    }
-    if(aReadStatus != IFSelect_RetDone) {
-        signals.onError(formatError(theFileToLoadPath, "IGES reader, bad file format"));
-        return aShape;
-    }
-
-    // now perform the translation
-    aReader.TransferRoots();
-    if(aReader.NbShapes() <= 0) {
-        Handle(XSControl_WorkSession) aWorkSession = new XSControl_WorkSession();
-        aWorkSession->SelectNorm("IGES");
-        aReader.SetWS(aWorkSession, Standard_True);
-        aReader.SetReadVisible(Standard_False);
-        aReader.TransferRoots();
-    }
-    if(aReader.NbShapes() <= 0) {
-        signals.onError(formatError(theFileToLoadPath, "No shapes found in the IGES file"));
-        return aShape;
-    }
-    TopoDS_Shape anImportedShape = aReader.OneShape();
-
-    // apply sewing on the imported shape
-    BRepBuilderAPI_Sewing aTool(0.0);
-    aTool.SetNonManifoldMode(Standard_False);
-    aTool.SetFloatingEdgesMode(Standard_True);
-    aTool.Load(anImportedShape);
-    aTool.Perform();
-    TopoDS_Shape aSewedShape = aTool.SewedShape();
-
-    if(aSewedShape.IsNull()) {
-        signals.onError(formatError(theFileToLoadPath, "Sewing result is empty"));
-        return aShape;
-    }
-    if(aSewedShape.IsSame(anImportedShape)) {
-        aShape = anImportedShape;
-    } else {
-        // apply shape healing
-        ShapeFix_Shape aShapeFixer(aSewedShape);
-        aShapeFixer.FixSolidMode() = 1;
-        aShapeFixer.FixFreeShellMode() = 1;
-        aShapeFixer.FixFreeFaceMode() = 1;
-        aShapeFixer.FixFreeWireMode() = 0;
-        aShapeFixer.FixSameParameterMode() = 0;
-        aShapeFixer.FixVertexPositionMode() = 0;
-        aShape = aShapeFixer.Perform() ? aShapeFixer.Shape() : aSewedShape;
-    }
-    return aShape;
-}
-
-TopoDS_Shape StCADLoader::loadSTEP(const StString& theFileToLoadPath) {
-    STEPControl_Reader aReader;
-    IFSelect_ReturnStatus aReadStatus = IFSelect_RetFail;
-    StString aFilePath = StFileNode::getCompatibleName(theFileToLoadPath);
-    try {
-        aReadStatus = aReader.ReadFile(aFilePath.toCString());
-    } catch(Standard_Failure) {
-        signals.onError(formatError(theFileToLoadPath, "STEP reader, computation error"));
-        return TopoDS_Shape();
-    }
-    if(aReadStatus != IFSelect_RetDone) {
-        signals.onError(formatError(theFileToLoadPath, "STEP reader, bad file format"));
-        return TopoDS_Shape();
-    } else if(aReader.NbRootsForTransfer() <= 0) {
-        signals.onError(formatError(theFileToLoadPath, "STEP reader, shape is empty"));
-        return TopoDS_Shape();
-    }
-    // now perform the translation
-    aReader.TransferRoots();
-    return aReader.OneShape();
-}
-
 bool StCADLoader::loadModel(const StHandle<StFileNode>& theSource) {
     const StMIME stMIMEType = theSource->getMIME();
     const StString aFileToLoadPath = theSource->getPath();
     const StString anExt = !stMIMEType.isEmpty() ? stMIMEType.getExtension() : StFileNode::getExtension(aFileToLoadPath);
-
-    StHandle<StGLMesh> aMesh;
-    TopoDS_Shape aShape;
-    if(anExt.isEqualsIgnoreCase(stCString(ST_IGS_EXT)) || anExt.isEqualsIgnoreCase(stCString(ST_IGES_EXT))) {
-        aShape = loadIGES(aFileToLoadPath);
-    } else if(anExt.isEqualsIgnoreCase(stCString(ST_STP_EXT)) || anExt.isEqualsIgnoreCase(stCString(ST_STEP_EXT))) {
-        aShape = loadSTEP(aFileToLoadPath);
-    } else if(anExt.isEqualsIgnoreCase(stCString(ST_BREP_EXT)) || anExt.isEqualsIgnoreCase(stCString(ST_RLE_EXT))) {
-        StString aFilePath = StFileNode::getCompatibleName(aFileToLoadPath);
-        BRep_Builder aBuilder;
-        if(!BRepTools::Read(aShape, aFilePath.toCString(), aBuilder)) {
-            signals.onError(formatError(aFileToLoadPath, "BREP loading failed"));
-        } else if(aShape.IsNull()) {
-            signals.onError(formatError(aFileToLoadPath, "No shapes found in the BREP file"));
-        }
+    bool isGltf = false;
+    StAssetImportShape::FileFormat aShapeFormat = StAssetImportShape::FileFormat_UNKNOWN;
+    {
+      StRawFile aRawFile;
+      if(aRawFile.readFile(aFileToLoadPath, -1, 2048)) {
+          aShapeFormat = StAssetImportShape::probeFormatFromHeader((const char* )aRawFile.getBuffer(), anExt);
+      }
+      isGltf = StAssetImportGltf::probeFormatFromHeader((const char* )aRawFile.getBuffer(), anExt);
+    }
+
+    myDoc = new StAssetDocument();
+    bool isRead = false;
+    if(isGltf) {
+        StAssetImportGltf aReader;
+        aReader.signals.onError.connect(this, &StCADLoader::doOnErrorRedirect);
+        isRead = aReader.load(myDoc, aFileToLoadPath);
     } else {
-        signals.onError(formatError(aFileToLoadPath, "Format doesn't supported"));
+        StAssetImportShape aReader;
+        aReader.signals.onError.connect(this, &StCADLoader::doOnErrorRedirect);
+        isRead = aReader.load(myDoc, aFileToLoadPath, aShapeFormat);
     }
 
-    bool hasShape = !aShape.IsNull();
-    computeMesh(aShape);
-    Handle(AIS_Shape) aShapePrs = new AIS_Shape(aShape);
+    NCollection_Sequence<Handle(AIS_InteractiveObject)> aPrsList;
+    if(isRead) {
+        Handle(StAssetPresentation) aShapePrs = new StAssetPresentation();
+        for(StAssetNodeIterator aMeshNodeIter(myDoc, StDocNodeType_Mesh); aMeshNodeIter.more(); aMeshNodeIter.next()) {
+            Handle(StDocMeshNode) aMeshNode = Handle(StDocMeshNode)::DownCast(aMeshNodeIter.value());
+            aShapePrs->AddMeshNode(aMeshNode, aMeshNodeIter.location());
+        }
+        aPrsList.Append(aShapePrs);
+    }
 
     // setup new output shape
     myResultLock.lock();
-        myPrsList.Append(aShapePrs);
-        aShape.Nullify();
+        const bool isEmpty = aPrsList.IsEmpty();
+        myPrsList.Assign(aPrsList);
+        aPrsList.Clear();
         myIsLoaded = true;
     myResultLock.unlock();
-    return hasShape;
-}
-
-bool StCADLoader::computeMesh(const TopoDS_Shape& theShape) {
-    if(theShape.IsNull()) {
-        return false;
-    }
-
-    Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer();
-    Standard_Real aDeflection = Prs3d::GetDeflection(theShape, aDrawer);
-    if(!BRepTools::Triangulation(theShape, aDeflection)) {
-        BRepMesh_IncrementalMesh anAlgo;
-        anAlgo.ChangeParameters().Deflection = aDeflection;
-        anAlgo.ChangeParameters().Angle      = aDrawer->HLRAngle();
-        anAlgo.ChangeParameters().InParallel = Standard_True;
-        anAlgo.SetShape(theShape);
-        anAlgo.Perform();
-    }
-    return true;
+    return !isEmpty;
 }
 
 bool StCADLoader::getNextDoc(NCollection_Sequence<Handle(AIS_InteractiveObject)>& thePrsList,
-                             StHandle<StCADDocument>& theDoc) {
+                             Handle(StAssetDocument)& theDoc) {
     if(!myResultLock.tryLock()) {
         return false;
     }
@@ -238,7 +103,7 @@
         thePrsList.Append(myPrsList);
         theDoc = myDoc;
         myPrsList.Clear();
-        myDoc.nullify();
+        myDoc.Nullify();
         hasNewShape = true;
         myIsLoaded = false;
     }
@@ -249,6 +114,9 @@
 void StCADLoader::mainLoop() {
     StHandle<StFileNode> aFileToLoad;
     StHandle<StStereoParams> aFileParams;
+
+    StAssetImportShape::initStatic();
+
     for(;;) {
         myEvLoadNext.wait();
         if(myToQuit) {

sview-16_06.tar.gz/StCADViewer/StCADLoader.h -> sview-17_04.tar.gz/StCADViewer/StCADLoader.h Changed

@@ -13,9 +13,6 @@
 
 #include <AIS_InteractiveObject.hxx>
 #include <NCollection_Sequence.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TDocStd_Document.hxx>
-#include <XCAFApp_Application.hxx>
 
 #include <StStrings/StString.h>
 #include <StFile/StMIMEList.h>
@@ -24,27 +21,11 @@
 #include <StSlots/StSignal.h>
 #include <StThreads/StThread.h>
 
+#include "StAssetDocument.h"
+
 class StLangMap;
 class StThread;
 
-class StCADDocument {
-
-        public:
-
-    ST_LOCAL StCADDocument();
-    ST_LOCAL void reset();
-
-    const Handle(XCAFApp_Application)& getXCAFApp() const { return myXCAFApp; }
-    const Handle(TDocStd_Document)&    getXCAFDoc() const { return myXCAFDoc; }
-    Handle(TDocStd_Document)&          changeXCAFDoc()    { return myXCAFDoc; }
-
-        protected:
-
-    Handle(XCAFApp_Application) myXCAFApp;
-    Handle(TDocStd_Document)    myXCAFDoc;
-
-};
-
 class StCADLoader {
 
         public:
@@ -65,7 +46,7 @@
     }
 
     ST_LOCAL virtual bool getNextDoc(NCollection_Sequence<Handle(AIS_InteractiveObject)>& thePrsList,
-                                     StHandle<StCADDocument>& theDoc);
+                                     Handle(StAssetDocument)& theDoc);
 
         public:  //!< Signals
 
@@ -79,11 +60,14 @@
 
         protected:
 
-    ST_LOCAL TopoDS_Shape loadIGES(const StString& theFileToLoadPath);
-    ST_LOCAL TopoDS_Shape loadSTEP(const StString& theFileToLoadPath);
-
     ST_LOCAL virtual bool loadModel(const StHandle<StFileNode>& theSource);
-    ST_LOCAL virtual bool computeMesh(const TopoDS_Shape& theShape);
+
+    /**
+     * Just redirect callback slot.
+     */
+    ST_LOCAL void doOnErrorRedirect(const StCString& theMsgText) {
+        signals.onError(theMsgText);
+    }
 
     static SV_THREAD_FUNCTION threadFunction(void* theLoader) {
         StCADLoader* aCADLoader = (StCADLoader* )theLoader;
@@ -97,7 +81,7 @@
     StHandle<StLangMap>  myLangMap;
     StHandle<StPlayList> myPlayList;
     StCondition          myEvLoadNext;
-    StHandle<StCADDocument>  myDoc;
+    Handle(StAssetDocument) myDoc;
     NCollection_Sequence<Handle(AIS_InteractiveObject)> myPrsList;
     Graphic3d_MaterialAspect myDefaultMat;
     StMutex              myResultLock;

sview-16_06.tar.gz/StCADViewer/StCADPluginInfo.h -> sview-17_04.tar.gz/StCADViewer/StCADPluginInfo.h Changed

@@ -41,6 +41,27 @@
 #define ST_RLE_MIME_STRING  ST_RLE_MIME  ":" ST_RLE_EXT  ":" ST_BREP_DESC
 
 /**
+ *.xbf - OCAF Binary model file
+ */
+#define ST_XBF_MIME "model/xbf"
+#define ST_XBF_EXT  "xbf"
+#define ST_XBF_DESC "XBF - CAD model file (OCCT framework)"
+#define ST_XBF_MIME_STRING ST_XBF_MIME ":" ST_XBF_EXT ":" ST_XBF_DESC
+
+/**
+ *.gltf, *.glb - glTF mesh format
+ */
+#define ST_GLTF_MIME "model/gltf+json"
+#define ST_GLTF_DESC "glTF - GL Transmission Format"
+#define ST_GLTF_EXT  "gltf"
+#define ST_GLTF_MIME_STRING ST_GLTF_MIME ":" ST_GLTF_EXT ":" ST_GLTF_DESC
+
+#define ST_GLB_MIME "model/gltf.binary"
+#define ST_GLB_DESC "glTF - GL Transmission Format (Binary)"
+#define ST_GLB_EXT  "glb"
+#define ST_GLB_MIME_STRING  ST_GLB_MIME ":" ST_GLB_EXT  ":" ST_GLB_DESC
+
+/**
  *.obj - simplest triangulation exchange format
  */
 /*#define ST_OBJ_MIME "model/obj"
@@ -70,6 +91,8 @@
 #define ST_CAD_PLUGIN_MIME_CHAR ST_IGS_MIME_STRING ";" ST_IGES_MIME_STRING ";" \
 ST_STP_MIME_STRING  ";" ST_STEP_MIME_STRING ";" \
 ST_BREP_MIME_STRING ";" ST_RLE_MIME_STRING  ";" \
+ST_XBF_MIME_STRING ";" \
+ST_GLTF_MIME_STRING ";" ST_GLB_MIME_STRING ";" \
 "\000"
 
 #endif //__StCADPluginInfo_h_

sview-16_06.tar.gz/StCADViewer/StCADViewer.cbp -> sview-17_04.tar.gz/StCADViewer/StCADViewer.cbp Changed

@@ -262,6 +262,17 @@
 			<Add directory="../bin/$(TARGET_NAME)" />
 		</Linker>
 		<Unit filename="main.cpp" />
+		<Unit filename="StAssetDocument.cpp" />
+		<Unit filename="StAssetDocument.h" />
+		<Unit filename="StAssetTexture.cpp" />
+		<Unit filename="StAssetTexture.h" />
+		<Unit filename="StAssetImportGltf.cpp" />
+		<Unit filename="StAssetImportGltf.h" />
+		<Unit filename="StAssetImportShape.cpp" />
+		<Unit filename="StAssetImportShape.h" />
+		<Unit filename="StAssetNodeIterator.h" />
+		<Unit filename="StAssetPresentation.cpp" />
+		<Unit filename="StAssetPresentation.h" />
 		<Unit filename="StCADLoader.cpp" />
 		<Unit filename="StCADLoader.h" />
 		<Unit filename="StCADMsgPrinter.cpp" />
@@ -279,6 +290,10 @@
 		<Unit filename="StCADViewerGUI.h" />
 		<Unit filename="StCADViewerStrings.cpp" />
 		<Unit filename="StCADViewerStrings.h" />
+		<Unit filename="StGLMaterial.h" />
+		<Unit filename="StImageOcct.cpp" />
+		<Unit filename="StImageOcct.h" />
+		<Unit filename="StPrimArray.h" />
 		<Unit filename="lang/english/StCADViewer.lng">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>

sview-16_06.tar.gz/StCADViewer/StCADViewer.cpp -> sview-17_04.tar.gz/StCADViewer/StCADViewer.cpp Changed

@@ -119,6 +119,17 @@
     addRenderer(new StOutPageFlipExt(myResMgr, theParentWin));
 #endif
 
+    // need Depth buffer
+    const StWinAttr anAttribs[] = {
+        StWinAttr_GlDepthSize,   (StWinAttr )24,
+        StWinAttr_GlStencilSize, (StWinAttr )8,
+        StWinAttr_NULL
+    };
+    for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
+        StHandle<StWindow>& aRend = myRenderers[aRendIter];
+        aRend->setAttributes(anAttribs);
+    }
+
     // create actions
     StHandle<StAction> anAction;
     anAction = new StActionBool(stCString("DoFullscreen"), params.IsFullscreen);
@@ -312,9 +323,8 @@
     }
 #endif
 
-    myViewer = new V3d_Viewer(aDriver, TCollection_ExtendedString("Viewer").ToExtString(), "", 1000.0,
-                              V3d_XposYnegZpos, Quantity_NOC_BLACK, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
-                              Standard_True, Standard_False);
+    myViewer = new V3d_Viewer(aDriver);
+    myViewer->SetDefaultBackgroundColor(Quantity_NOC_BLACK);
     Handle(V3d_DirectionalLight) aLightDir = new V3d_DirectionalLight(myViewer, V3d_Zneg, Quantity_NOC_WHITE, Standard_True);
     Handle(V3d_AmbientLight)     aLightAmb = new V3d_AmbientLight(myViewer);
     aLightDir->SetDirection ( 1.0, -2.0, -10.0);
@@ -322,10 +332,8 @@
     myViewer->SetLightOn (aLightAmb);
 
     myAisContext = new AIS_InteractiveContext(myViewer);
-    myAisContext->SetDisplayMode(AIS_Shaded);
+    myAisContext->SetDisplayMode(0, false);
     myAisContext->SetAutoActivateSelection(Standard_False);
-    myAisContext->SetHilightColor(Quantity_NOC_CYAN1);
-    myAisContext->SelectionColor (Quantity_NOC_WHITE);
     const Handle(Prs3d_Drawer)& aDrawer = myAisContext->DefaultDrawer();
     aDrawer->SetAutoTriangulation (Standard_False);
 #ifdef __ANDROID__
@@ -349,7 +357,6 @@
     myView->SetWindow(aWindow, (Aspect_RenderingContext )aRendCtx);
 #endif
 
-    myView->SetSurfaceDetail(V3d_TEX_ALL);
     return true;
 }
 
@@ -371,7 +378,7 @@
     mySettings->loadParam(params.ProjectMode);
 
     myGUI->stglInit();
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
 
     registerHotKeys();
     return true;
@@ -421,8 +428,7 @@
         myGUI.nullify();
         return false;
     }
-
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
 
     // create working threads
     if(!isReset) {
@@ -488,9 +494,9 @@
         return;
     }
 
-    const StGLBoxPx aWinRect = myWindow->stglViewport(ST_WIN_MASTER);
-    myGUI->stglResize(aWinRect);
-    myProjection.resize(*myContext, aWinRect.width(), aWinRect.height());
+    const double anAspect = myWindow->stglAspectRatio();
+    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )anAspect);
+    myProjection.resize((float )anAspect);
 }
 
 void StCADViewer::doMouseDown(const StClickEvent& theEvent) {
@@ -547,7 +553,7 @@
         }
         case ST_MOUSE_MIDDLE: {
             if(!myIsCtrlPressed && !isItemUnclicked) {
-                params.IsFullscreen->reverse();
+                //params.IsFullscreen->reverse();
             }
             myIsMiddleHold = false;
             break;
@@ -617,17 +623,18 @@
         return;
     }
 
+    const StPointD_t aCursor(theEvent.PointX, theEvent.PointY);
     if(theEvent.StepsY >= 1) {
         if(myIsCtrlPressed) {
             doStereoZFocusCloser(0.05);
         } else {
-            doZoomIn(0.1);
+            scaleAt(aCursor, 10);
         }
     } else if(theEvent.StepsY <= -1) {
         if(myIsCtrlPressed) {
             doStereoZFocusFarther(0.05);
         } else {
-            doZoomOut(0.1);
+            scaleAt(aCursor, -10);
         }
     }
 }
@@ -714,11 +721,11 @@
     }
 
     const StString aFilePath = theEvent.Files[0];
-    if(myPlayList->checkExtension(aFilePath)) {
+    //if(myPlayList->checkExtension(aFilePath)) {
         myPlayList->open(aFilePath);
         doUpdateStateLoading();
         myCADLoader->doLoadNext();
-    }
+    //}
 }
 
 void StCADViewer::doNavigate(const StNavigEvent& theEvent) {
@@ -738,7 +745,8 @@
     Handle(Graphic3d_Camera) aCam = !myView.IsNull()
                                   ?  myView->Camera()
                                   : Handle(Graphic3d_Camera)();
-    if(myIsMiddleHold && myIsCtrlPressed && !aCam.IsNull()) {
+    //if(myIsMiddleHold && myIsCtrlPressed && !aCam.IsNull()) {
+    if(myIsMiddleHold && !aCam.IsNull()) {
         // move
         StPointD_t aPt = myWindow->getMousePos();
         gp_Vec2d aFlatMove( 2.0 * (aPt.x() - myPrevMouse.x()),
@@ -772,20 +780,9 @@
     if(!myAisContext.IsNull()) {
         NCollection_Sequence<Handle(AIS_InteractiveObject)> aNewPrsList;
         if(myCADLoader->getNextDoc(aNewPrsList, myDoc)) {
-            myAisContext->RemoveAll(Standard_False);
+            myAisContext->RemoveAll(false);
             for(NCollection_Sequence<Handle(AIS_InteractiveObject)>::Iterator aPrsIter(aNewPrsList); aPrsIter.More(); aPrsIter.Next()) {
-                Handle(AIS_Shape)                aShapePrs     = Handle(AIS_Shape)::DownCast (aPrsIter.Value());
-                Handle(AIS_ConnectedInteractive) aConnectedPrs = Handle(AIS_ConnectedInteractive)::DownCast (aPrsIter.Value());
-                if(!aConnectedPrs.IsNull()) {
-                    aShapePrs = Handle(AIS_Shape)::DownCast (aConnectedPrs->ConnectedTo());
-                }
-                if(!aShapePrs.IsNull()) {
-                    aShapePrs->SetDisplayMode(1);
-                    if(!aConnectedPrs.IsNull()) {
-                        aConnectedPrs->SetDisplayMode(1);
-                    }
-                }
-                myAisContext->Display(aPrsIter.Value(), aPrsIter.Value()->DisplayMode(), 0, Standard_False);
+                myAisContext->Display(aPrsIter.Value(), aPrsIter.Value()->DisplayMode(), -1, false);
             }
 
             doFitAll();
@@ -794,7 +791,7 @@
     }
 
     myGUI->setVisibility(myWindow->getMousePos(), true);
-    myGUI->stglUpdate(myWindow->getMousePos());
+    myGUI->stglUpdate(myWindow->getMousePos(), myWindow->isPreciseCursor());
 
     // recreate menu event
     if(myToRecreateMenu) {
@@ -819,7 +816,7 @@
         }
 
         if(params.ToShowTrihedron->getValue()) {
-          myView->TriedronDisplay(Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_WHITE, 0.08, V3d_ZBUFFER);
+          myView->TriedronDisplay(Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_WHITE, 0.1, V3d_ZBUFFER);
         } else {
           myView->TriedronErase();
         }
@@ -846,8 +843,7 @@
         if(anFboWrapper->GetVPSizeX() > 0
         && anFboWrapper->GetVPSizeY() > 0
         && aWindow->SetSize(anFboWrapper->GetVPSizeX(), anFboWrapper->GetVPSizeY())) {
-            StRectI_t aWinRect = myWindow->getPlacement();
-            Standard_Real aRatio = double(aWinRect.width()) / double(aWinRect.height());
+            const double aRatio = myWindow->stglAspectRatio();
             myView->Camera()->SetAspect(aRatio);
             myView->View()->Resized();
         }
@@ -872,7 +868,7 @@
         myContext->core11fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 
-    myGUI->getCamera()->setView(theView);
+    myGUI->changeCamera()->setView(theView);
     myProjection.setView(theView);
 
     // draw GUI
@@ -980,6 +976,21 @@
     }
 }
 
+void StCADViewer::scaleAt(const StPointD_t& thePoint,
+                          const float       theStep) {
+    if(myView.IsNull()) {
+        return;
+    }
+
+    int aWinSizeX = 0;
+    int aWinSizeY = 0;
+    myView->Window()->Size(aWinSizeX, aWinSizeY);
+
+    myView->StartZoomAtPoint(int(thePoint.x() * aWinSizeX),
+                             int(thePoint.y() * aWinSizeY));
+    myView->ZoomAtPoint(0, 0, (int )theStep, (int )theStep);
+}
+
 void StCADViewer::doZoomIn(const double theValue) {
     if(myView.IsNull()) {
         return;

sview-16_06.tar.gz/StCADViewer/StCADViewer.h -> sview-17_04.tar.gz/StCADViewer/StCADViewer.h Changed

sview-16_06.tar.gz/StCADViewer/StCADViewer.rc -> sview-17_04.tar.gz/StCADViewer/StCADViewer.rc Changed

sview-16_06.tar.gz/StCADViewer/StCADViewer.vcxproj -> sview-17_04.tar.gz/StCADViewer/StCADViewer.vcxproj Changed

@@ -100,7 +100,7 @@
       <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKBinXCAF.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_x86;..\lib\WIN_vc_x86;$(StOcctLib32);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
@@ -109,16 +109,7 @@
       <EnableDpiAwareness>false</EnableDpiAwareness>
     </Manifest>
     <PostBuildEvent>
-      <Command>xcopy /Y "$(StOcctRes)\UnitsAPI\Lexi_Expr.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\UnitsAPI\Units.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\SHMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\XSMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\Shaders\*.*" "$(TargetDir)\shaders\StCADViewer\"
-xcopy /Y "$(StOcctRes)\TObj\*.msg" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\StdResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XSTEPResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XmlOcafResource\*.*" "$(TargetDir)\res\"
-cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
+      <Command>cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -150,7 +141,7 @@
       <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;_DEBUG;ST_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKBinXCAF.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_x86_DEBUG;..\lib\WIN_vc_x86_DEBUG;$(StOcctLib32d);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -160,16 +151,7 @@
       <EnableDpiAwareness>false</EnableDpiAwareness>
     </Manifest>
     <PostBuildEvent>
-      <Command>xcopy /Y "$(StOcctRes)\UnitsAPI\Lexi_Expr.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\UnitsAPI\Units.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\SHMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\XSMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\Shaders\*.*" "$(TargetDir)\shaders\StCADViewer\"
-xcopy /Y "$(StOcctRes)\TObj\*.msg" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\StdResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XSTEPResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XmlOcafResource\*.*" "$(TargetDir)\res\"
-cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
+      <Command>cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -200,7 +182,7 @@
       <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKBinXCAF.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_AMD64;..\lib\WIN_vc_AMD64;$(StOcctLib64);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
@@ -209,16 +191,7 @@
       <EnableDpiAwareness>false</EnableDpiAwareness>
     </Manifest>
     <PostBuildEvent>
-      <Command>xcopy /Y "$(StOcctRes)\UnitsAPI\Lexi_Expr.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\UnitsAPI\Units.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\SHMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\XSMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\Shaders\*.*" "$(TargetDir)\shaders\StCADViewer\"
-xcopy /Y "$(StOcctRes)\TObj\*.msg" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\StdResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XSTEPResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XmlOcafResource\*.*" "$(TargetDir)\res\"
-cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
+      <Command>cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -250,7 +223,7 @@
       <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;_DEBUG;ST_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;TKBinXCAF.lib;TKMeshVS.lib;TKXDESTEP.lib;TKSTEP.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKSTEPBase.lib;TKXDEIGES.lib;TKIGES.lib;TKXSBase.lib;TKOpenGl.lib;TKXCAF.lib;TKCAF.lib;TKV3d.lib;TKHLR.lib;TKMesh.lib;TKService.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKBool.lib;TKBO.lib;TKPrim.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBRep.lib;TKGeomBase.lib;TKG3d.lib;TKG2d.lib;TKMath.lib;TKLCAF.lib;TKCDF.lib;TKernel.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_AMD64_DEBUG;..\lib\WIN_vc_AMD64_DEBUG;$(StOcctLib64d);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -260,29 +233,32 @@
       <EnableDpiAwareness>false</EnableDpiAwareness>
     </Manifest>
     <PostBuildEvent>
-      <Command>xcopy /Y "$(StOcctRes)\UnitsAPI\Lexi_Expr.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\UnitsAPI\Units.dat" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\SHMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\XSMessage\*.*" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\Shaders\*.*" "$(TargetDir)\shaders\StCADViewer\"
-xcopy /Y "$(StOcctRes)\TObj\*.msg" "$(TargetDir)\lang\"
-xcopy /Y "$(StOcctRes)\StdResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XSTEPResource\*" "$(TargetDir)\res\"
-xcopy /Y "$(StOcctRes)\XmlOcafResource\*.*" "$(TargetDir)\res\"
-cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
+      <Command>cmd /c call ..\copy_res.bat $(TargetDir) $(TargetName)
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="StAssetImportGltf.cpp" />
+    <ClCompile Include="StAssetImportShape.cpp" />
+    <ClCompile Include="StAssetPresentation.cpp" />
+    <ClCompile Include="StAssetDocument.cpp" />
+    <ClCompile Include="StAssetTexture.cpp" />
     <ClCompile Include="StCADFrameBuffer.cpp" />
     <ClCompile Include="StCADLoader.cpp" />
     <ClCompile Include="StCADMsgPrinter.cpp" />
     <ClCompile Include="StCADViewer.cpp" />
     <ClCompile Include="StCADViewerGUI.cpp" />
     <ClCompile Include="StCADViewerStrings.cpp" />
+    <ClCompile Include="StImageOcct.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="StAssetImportGltf.h" />
+    <ClInclude Include="StAssetImportShape.h" />
+    <ClInclude Include="StAssetNodeIterator.h" />
+    <ClInclude Include="StAssetPresentation.h" />
+    <ClInclude Include="StAssetDocument.h" />
+    <ClInclude Include="StAssetTexture.h" />
     <ClInclude Include="StCADFrameBuffer.h" />
     <ClInclude Include="StCADLoader.h" />
     <ClInclude Include="StCADMsgPrinter.h" />
@@ -291,6 +267,9 @@
     <ClInclude Include="StCADViewerGUI.h" />
     <ClInclude Include="StCADViewerStrings.h" />
     <ClInclude Include="StCADWindow.h" />
+    <ClInclude Include="StGLMaterial.h" />
+    <ClInclude Include="StImageOcct.h" />
+    <ClInclude Include="StPrimArray.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="StCADViewer.rc" />

sview-16_06.tar.gz/StCADViewer/StCADViewer.vcxproj.filters -> sview-17_04.tar.gz/StCADViewer/StCADViewer.vcxproj.filters Changed

@@ -20,4 +20,127 @@
   <ItemGroup>
     <Manifest Include="..\dpiAware.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADFrameBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADLoader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADMsgPrinter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADViewer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADViewerGUI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StCADViewerStrings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StAssetPresentation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StAssetImportShape.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StAssetDocument.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StAssetImportGltf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StImageOcct.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StAssetTexture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="StCADFrameBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADLoader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADMsgPrinter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADPluginInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADViewer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADViewerGUI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADViewerStrings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StCADWindow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetPresentation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetImportShape.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetDocument.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetNodeIterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetImportGltf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StImageOcct.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StAssetTexture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StGLMaterial.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StPrimArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="lang\chinese\language.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\chinese\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\czech\language.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\czech\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\english\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\french\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\german\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\korean\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lang\russian\StCADViewer.lng">
+      <Filter>Translation Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file

sview-16_06.tar.gz/StCADViewer/StCADViewerGUI.cpp -> sview-17_04.tar.gz/StCADViewer/StCADViewerGUI.cpp Changed

@@ -1,7 +1,7 @@
 /**
  * This source is a part of sView program.
  *
- * Copyright © Kirill Gavrilov, 2011-2016
+ * Copyright © Kirill Gavrilov, 2011-2017
  */
 
 #include "StCADViewerGUI.h"
@@ -42,8 +42,7 @@
     const int      anIconStep = scale(56);
     aButtonMargins.extend(scale(12));
 
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelUpper = new StGLContainer(this, aRootMargins.left, aRootMargins.top, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
+    myPanelUpper = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     // left side
     {
@@ -73,8 +72,7 @@
     const int      anIconStep = scale(56);
     aButtonMargins.extend(scale(12));
 
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelBottom = new StGLContainer(this, aRootMargins.left, -aRootMargins.bottom, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
+    myPanelBottom = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     // left side
     {
@@ -285,7 +283,6 @@
     const GLfloat aScale = myPlugin->myWindow->getScaleFactor();
     setScale(aScale, StGLRootWidget::ScaleAdjust_Normal);
     setMobile(StWindow::isMobile());
-    changeRootMargins() = myPlugin->myWindow->getMargins();
 
     myPlugin->params.ToShowFps->signals.onChanged.connect(this, &StCADViewerGUI::doShowFPS);
 
@@ -308,7 +305,6 @@
     myZFocusBar->setCorner(StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT));
     myZFocusBar->signals.onSeekClick  = stSlot(this, &StCADViewerGUI::doZFocusSet);
     myZFocusBar->signals.onSeekScroll = stSlot(this, &StCADViewerGUI::doZFocusScroll);
-    myZFocusBar->setMoveTolerance(1);
     myZFocusBar->changeMargins().left  = scale(8);
     myZFocusBar->changeMargins().right = scale(8);
 
@@ -327,7 +323,6 @@
     myStereoIODBar->setCorner(StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT));
     myStereoIODBar->signals.onSeekClick  = stSlot(this, &StCADViewerGUI::doStereoIODSet);
     myStereoIODBar->signals.onSeekScroll = stSlot(this, &StCADViewerGUI::doStereoIODScroll);
-    myStereoIODBar->setMoveTolerance(1);
     myStereoIODBar->changeMargins().left  = scale(8);
     myStereoIODBar->changeMargins().right = scale(8);
 
@@ -380,8 +375,9 @@
     }
 }
 
-void StCADViewerGUI::stglUpdate(const StPointD_t& theCursorZo) {
-    StGLRootWidget::stglUpdate(theCursorZo);
+void StCADViewerGUI::stglUpdate(const StPointD_t& theCursorZo,
+                                bool theIsPreciseInput) {
+    StGLRootWidget::stglUpdate(theCursorZo, theIsPreciseInput);
     if(myMouseDescr != NULL) {
         myMouseDescr->setPoint(theCursorZo);
     }
@@ -401,37 +397,18 @@
     }
 }
 
-void StCADViewerGUI::stglResize(const StGLBoxPx& theRectPx) {
-    const int aSizeX = theRectPx.width();
-    const StMarginsI& aMargins = myPlugin->getMainWindow()->getMargins();
-    const bool areNewMargins = aMargins != getRootMargins();
-    if(areNewMargins) {
-        changeRootMargins() = aMargins;
-    }
-
+void StCADViewerGUI::stglResize(const StGLBoxPx&  theViewPort,
+                                const StMarginsI& theMargins,
+                                float theAspect) {
+    const int aNewSizeX  = theViewPort.width();
+    const int aWorkRight = stMax(aNewSizeX - theMargins.right, 2);
     if(myPanelUpper != NULL) {
-        myPanelUpper->changeRectPx().right() = aSizeX;
+        myPanelUpper->changeRectPx().right() = aWorkRight;
     }
     if(myPanelBottom != NULL) {
-        myPanelBottom->changeRectPx().right() = aSizeX;
+        myPanelBottom->changeRectPx().right() = aWorkRight;
     }
-    if(areNewMargins) {
-        if(myPanelUpper != NULL) {
-            myPanelUpper->changeRectPx().left() = aMargins.left;
-            myPanelUpper->changeRectPx().top()  = aMargins.top;
-        }
-        if(myPanelBottom != NULL) {
-            myPanelBottom->changeRectPx().left() = aMargins.left;
-            myPanelBottom->changeRectPx().top()  = aMargins.top;
-        }
-        if(myMenu0Root != NULL) {
-            myMenu0Root->changeRectPx().left() = aMargins.left;
-            myMenu0Root->changeRectPx().top()  = aMargins.top;
-            myMenu0Root->stglUpdateSubmenuLayout();
-        }
-    }
-
-    StGLRootWidget::stglResize(theRectPx);
+    StGLRootWidget::stglResize(theViewPort, theMargins, theAspect);
 }
 
 void StCADViewerGUI::stglDraw(unsigned int theView) {
@@ -449,7 +426,7 @@
     const StGLVec3 THE_WHITE(1.0f, 1.0f, 1.0f);
     const StString anAbout = tr(ABOUT_DPLUGIN_NAME) + '\n'
                            + tr(ABOUT_VERSION) + " " + StVersionInfo::getSDKVersionString()
-                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2011-2016", "kirill@sview.ru", "www.sview.ru");
+                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2011-2017", "kirill@sview.ru", "www.sview.ru");
 
     StArgumentsMap anInfo;
     anInfo.add(StDictEntry("CPU cores", StString(StThread::countLogicalProcessors()) + StString(" logical processor(s)")));

sview-16_06.tar.gz/StCADViewer/StCADViewerGUI.h -> sview-17_04.tar.gz/StCADViewer/StCADViewerGUI.h Changed

@@ -1,7 +1,7 @@
 /**
  * This source is a part of sView program.
  *
- * Copyright © Kirill Gavrilov, 2011-2016
+ * Copyright © Kirill Gavrilov, 2011-2017
  */
 
 #ifndef __StCADViewerGUI_h_
@@ -54,8 +54,11 @@
                             StTranslations* theLangMap,
                             const StHandle<StPlayList>& thePlayList);
     ST_LOCAL virtual ~StCADViewerGUI();
-    ST_LOCAL virtual void stglUpdate(const StPointD_t& theCursorZo) ST_ATTR_OVERRIDE;
-    ST_LOCAL virtual void stglResize(const StGLBoxPx&  theRectPx) ST_ATTR_OVERRIDE;
+    ST_LOCAL virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                     bool theIsPreciseInput) ST_ATTR_OVERRIDE;
+    ST_LOCAL virtual void stglResize(const StGLBoxPx&  theViewPort,
+                                     const StMarginsI& theMargins,
+                                     float theAspect) ST_ATTR_OVERRIDE;
     ST_LOCAL virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
 
     ST_LOCAL void setVisibility(const StPointD_t& theCursorZo, bool );

sview-17_04.tar.gz/StCADViewer/StGLMaterial.h Added

@@ -0,0 +1,110 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StGLMaterial_h_
+#define __StGLMaterial_h_
+
+#include "StAssetTexture.h"
+
+#include <StStrings/StString.h>
+#include <StGL/StGLVec.h>
+
+/**
+ * Material definition.
+ */
+class StGLMaterial : public Standard_Transient {
+
+    DEFINE_STANDARD_RTTI_INLINE(StGLMaterial, Standard_Transient)
+
+        public:
+
+    StGLVec4 DiffuseColor;
+    StGLVec4 AmbientColor;
+    StGLVec4 SpecularColor;
+    StGLVec4 EmissiveColor;
+    StGLVec4 Params;
+    Handle(StAssetTexture) Texture;
+    StString Name;
+
+        public:
+
+    float  Shine()        const { return Params.x(); }
+    float& ChangeShine()        { return Params.x(); }
+
+    float  Transparency() const { return Params.y(); }
+    float& ChangeTransparency() { return Params.y(); }
+
+    bool ToCullBackFaces() const { return Params.z() != 0.0f; }
+    void SetCullBackFaces(bool theToCull) { Params.z() = theToCull ? 1.0f : 0.0f; }
+
+    StGLMaterial()
+    : DiffuseColor (0.8f, 0.8f, 0.8f, 1.0f),
+      AmbientColor (0.1f, 0.1f, 0.1f, 1.0f),
+      SpecularColor(0.2f, 0.2f, 0.2f, 1.0f),
+      EmissiveColor(0.0f, 0.0f, 0.0f, 1.0f),
+      Params(0.039f, 0.0f, 0.0f, 0.0f) {}
+
+        public:
+
+    /**
+     * Check this vector with another material for equality.
+     */
+    bool isEqual(const StGLMaterial& theOther) const {
+        return DiffuseColor  == theOther.DiffuseColor
+            && AmbientColor  == theOther.AmbientColor
+            && SpecularColor == theOther.SpecularColor
+            && EmissiveColor == theOther.EmissiveColor
+            && Params        == theOther.Params
+            && StAssetTexture::IsEqual(Texture, theOther.Texture);
+    }
+
+    /**
+     * Check this vector with another vector for equality.
+     */
+    bool operator==(const StGLMaterial& theOther)       { return isEqual(theOther); }
+    bool operator==(const StGLMaterial& theOther) const { return isEqual(theOther); }
+
+    /**
+     * Check this vector with another vector for non-equality.
+     */
+    bool operator!=(const StGLMaterial& theOther)       { return !isEqual(theOther); }
+    bool operator!=(const StGLMaterial& theOther) const { return !isEqual(theOther); }
+
+        public:
+
+    /**
+     * Compute hash code for data map.
+     */
+    static int HashCode(const Handle(StGLMaterial)& theKey,
+                        const int theUpper) {
+        if(theKey.IsNull()) {
+            return 0;
+        }
+
+        int aHashCode = ::HashCode(::HashCodes((Standard_CString )theKey.get(), sizeof(StGLVec4) * 5), theUpper);
+        if(!theKey->Texture.IsNull()) {
+            aHashCode = aHashCode ^ ::HashCode(theKey->Texture->GetId(), theUpper);
+        }
+        return ::HashCode(aHashCode, theUpper);
+    }
+
+    /**
+     * Compare two materials
+     */
+    static bool IsEqual(const Handle(StGLMaterial)& theKey1,
+                        const Handle(StGLMaterial)& theKey2) {
+        if(theKey1 == theKey2) {
+            return true;
+        }
+
+        return !theKey1.IsNull()
+            && !theKey2.IsNull()
+            && theKey1->isEqual(*theKey2);
+    }
+
+};
+
+#endif // __StGLMaterial_h_

sview-17_04.tar.gz/StCADViewer/StImageOcct.cpp Added

@@ -0,0 +1,64 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#include "StImageOcct.h"
+
+StImageOcct::StImageOcct() {
+    //
+}
+
+StImageOcct::~StImageOcct() {
+    //
+}
+
+void StImageOcct::Clear() {
+    Image_PixMap::Clear();
+    myStImage.nullify();
+}
+
+bool StImageOcct::Load(const StString& theFileName,
+                       const StMIME& theMime,
+                       uint8_t* theDataPtr, int theDataSize) {
+    Clear();
+
+    const StImageFile::ImageType anImgType = StImageFile::guessImageType(theFileName, theMime);
+    StHandle<StImageFile> anStImage = StImageFile::create(StImageFile::ST_LIBAV, anImgType);
+    if(anStImage.isNull()) {
+        return false;
+    }
+
+    if(!anStImage->loadExtra(theFileName, anImgType, theDataPtr, theDataSize, true)) {
+        return false;
+    }
+
+    SetTopDown(true);
+    Image_PixMap::ImgFormat aFormat = Image_PixMap::ImgUNKNOWN;
+    switch(anStImage->getPlane().getFormat()) {
+        case StImagePlane::ImgBGR:   aFormat = Image_PixMap::ImgBGR;   break;
+        case StImagePlane::ImgBGR32: aFormat = Image_PixMap::ImgBGR32; break;
+        case StImagePlane::ImgRGB:   aFormat = Image_PixMap::ImgRGB;   break;
+        case StImagePlane::ImgRGB32: aFormat = Image_PixMap::ImgRGB32; break;
+        case StImagePlane::ImgBGRA:  aFormat = Image_PixMap::ImgBGRA;  break;
+        case StImagePlane::ImgRGBA:  aFormat = Image_PixMap::ImgRGBA;  break;
+        case StImagePlane::ImgBGRF:  aFormat = Image_PixMap::ImgBGRF;  break;
+        case StImagePlane::ImgRGBF:  aFormat = Image_PixMap::ImgRGBF;  break;
+        case StImagePlane::ImgBGRAF: aFormat = Image_PixMap::ImgBGRAF; break;
+        case StImagePlane::ImgRGBAF: aFormat = Image_PixMap::ImgRGBAF; break;
+        case StImagePlane::ImgGray:  aFormat = Image_PixMap::ImgGray;  break;
+        case StImagePlane::ImgGrayF: aFormat = Image_PixMap::ImgGrayF; break;
+        default: {
+            Clear();
+            return false;
+        }
+    }
+
+    if(!Image_PixMap::InitWrapper(aFormat, anStImage->changePlane().changeData(), anStImage->getSizeX(), anStImage->getSizeY(), anStImage->getPlane().getSizeRowBytes())) {
+        return false;
+    }
+
+    myStImage = anStImage;
+    return true;
+}

sview-17_04.tar.gz/StCADViewer/StImageOcct.h Added

@@ -0,0 +1,65 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StImageOcct_h_
+#define __StImageOcct_h_
+
+#include <StImage/StImageFile.h>
+
+#include <Image_PixMap.hxx>
+
+/**
+ * OCCT image wrapper over StImage.
+ */
+class StImageOcct : public Image_PixMap {
+
+    DEFINE_STANDARD_RTTI_INLINE(StImageOcct, Image_PixMap)
+
+        public:
+
+    /**
+     * Empty constructor.
+     */
+    ST_LOCAL StImageOcct();
+
+    /**
+     * Destructor.
+     */
+    ST_LOCAL virtual ~StImageOcct();
+
+    /**
+     * Clear the image.
+     */
+    ST_LOCAL virtual void Clear() Standard_OVERRIDE;
+
+    /**
+     * Initialize image plane with required dimensions.
+     * theSizeRowBytes - will be ignored by this class and required alignment will be used instead!
+     */
+    virtual bool InitTrash(ImgFormat           thePixelFormat,
+                           const Standard_Size theSizeX,
+                           const Standard_Size theSizeY,
+                           const Standard_Size theSizeRowBytes = 0) Standard_OVERRIDE {
+        (void )thePixelFormat;
+        (void )theSizeX;
+        (void )theSizeY;
+        (void )theSizeRowBytes;
+        Clear();
+        return false;
+    }
+
+    //! Load image from file.
+    ST_LOCAL bool Load(const StString& theFileName,
+                       const StMIME& theMime,
+                       uint8_t* theDataPtr = NULL, int theDataSize = 0);
+
+        private:
+
+    StHandle<StImageFile> myStImage;
+
+};
+
+#endif // __StImageOcct_h_

sview-17_04.tar.gz/StCADViewer/StPrimArray.h Added

@@ -0,0 +1,77 @@
+/**
+ * This source is a part of sView program.
+ *
+ * Copyright © Kirill Gavrilov, 2016
+ */
+
+#ifndef __StPrimArray_h_
+#define __StPrimArray_h_
+
+#include "StGLMaterial.h"
+
+#include <gp_Trsf.hxx>
+
+#include <vector>
+
+/**
+ * Definition of primitive array within the document.
+ */
+class StPrimArray : public Standard_Transient {
+
+    DEFINE_STANDARD_RTTI_INLINE(StPrimArray, Standard_Transient)
+
+        public:
+
+    std::vector<StGLVec3> Positions;
+    std::vector<StGLVec3> Normals;
+    std::vector<StGLVec2> TexCoords0;
+    std::vector<GLuint>   Indices;
+    Handle(StGLMaterial)  Material;
+    gp_Trsf               Trsf;
+
+        public:
+
+    StPrimArray() {}
+
+        public:
+
+    /**
+     * Generate normals from triangles.
+     * Considers the normals are initialized by ZEROs.
+     */
+    void reconstructNormals() {
+        const size_t aNbNodes = Positions.size();
+        if(Normals.size() != Positions.size()) {
+            Normals.resize(aNbNodes);
+        }
+
+        const size_t aNbTris = Indices.size() / 3;
+        int anElem[3] = {0, 0, 0};
+        for(size_t aTriIter = 0; aTriIter < aNbTris; ++aTriIter) {
+            anElem[0] = Indices[aTriIter * 3 + 0];
+            anElem[1] = Indices[aTriIter * 3 + 1];
+            anElem[2] = Indices[aTriIter * 3 + 2];
+            const StGLVec3& aNode0 = Positions[anElem[0]];
+            const StGLVec3& aNode1 = Positions[anElem[1]];
+            const StGLVec3& aNode2 = Positions[anElem[2]];
+
+            const StGLVec3 aVec01 = aNode1 - aNode0;
+            const StGLVec3 aVec02 = aNode2 - aNode0;
+            const StGLVec3 aTriNorm = StGLVec3::cross(aVec01, aVec02);
+            for(int aNodeIter = 0; aNodeIter < 3; ++aNodeIter) {
+                const int aNodeIndex = anElem[aNodeIter];
+                StGLVec3& aNorm = Normals[aNodeIndex];
+                aNorm += aTriNorm;
+            }
+        }
+
+        // normalize
+        for(int aNodeIter = 0; aNodeIter < aNbNodes; ++aNodeIter) {
+            StGLVec3& aNorm = Normals[aNodeIter];
+            aNorm.normalize();
+        }
+    }
+
+};
+
+#endif // __StPrimArray_h_

sview-16_06.tar.gz/StCADViewer/main.cpp -> sview-17_04.tar.gz/StCADViewer/main.cpp Changed

@@ -4,6 +4,29 @@
  * Copyright © Kirill Gavrilov, 2016
  */
 
+namespace
+{
+  /**
+   * The list of OCCT environment variable to be reset.
+   */
+  const char* THE_OCCT_ENV_DEF[] =
+  {
+    "CSF_ShadersDirectory",
+    "CSF_SHMessage",
+    "CSF_XSMessage",
+    "CSF_StandardDefaults",
+    "CSF_PluginDefaults",
+    "CSF_XCAFDefaults",
+    "CSF_TObjDefaults",
+    "CSF_StandardLiteDefaults",
+    "CSF_IGESDefaults",
+    "CSF_STEPDefaults",
+    "CSF_XmlOcafResource",
+    "CSF_MIGRATION_TYPES",
+    0
+  };
+}
+
 #if defined(__APPLE__)
     //
 #elif defined(__ANDROID__)
@@ -29,34 +52,6 @@
     : StAndroidGlue(theActivity, theSavedState, theSavedStateSize) {}
 
     /**
-     * Copy OCCT resource file.
-     */
-    ST_LOCAL bool copyResource(const StHandle<StResourceManager>& theResMgr,
-                               const StString& theResFolder,
-                               const StString& theDestFolder,
-                               const StString& theFileName) {
-        StString aFileResPath = theResFolder + SYS_FS_SPLITTER + theFileName;
-        StHandle<StResource> aRes = theResMgr->getResource(aFileResPath);
-        if( aRes.isNull()
-        || !aRes->read()) {
-            ST_ERROR_LOG(StString("Can not read resource file ") + aFileResPath);
-            return false;
-        }
-
-        StRawFile aFileOut;
-        StString  aFileOutPath = theDestFolder + SYS_FS_SPLITTER + theFileName;
-        if(!aFileOut.openFile(StRawFile::WRITE, aFileOutPath)) {
-            ST_ERROR_LOG(StString("Can not create resource file ") + aFileOutPath);
-            return false;
-        }
-        if(!aFileOut.write((const char* )aRes->getData(), aRes->getSize()) != aRes->getSize()) {
-            ST_ERROR_LOG(StString("Can not write resource file ") + aFileOutPath);
-            return false;
-        }
-        return true;
-    }
-
-    /**
      * Instantiate StApplication.
      */
     ST_LOCAL virtual void createApplication() override {
@@ -78,32 +73,10 @@
         aResMgr->setFolder(StResourceManager::FolderId_Photos,
                            getStoragePath(myThJniEnv, "DCIM"));
 
-        StString anOcctResFolder = aResMgr->getUserDataFolder();
-        copyResource(aResMgr, "lang", anOcctResFolder, "IGES.us");
-        copyResource(aResMgr, "lang", anOcctResFolder, "IGES.fr");
-        copyResource(aResMgr, "lang", anOcctResFolder, "SHAPE.us");
-        copyResource(aResMgr, "lang", anOcctResFolder, "SHAPE.fr");
-        copyResource(aResMgr, "lang", anOcctResFolder, "XSTEP.us");
-        copyResource(aResMgr, "lang", anOcctResFolder, "XSTEP.fr");
-        copyResource(aResMgr, "lang", anOcctResFolder, "TObj.msg");
-
-        copyResource(aResMgr, "res",  anOcctResFolder, "Units.dat");
-        copyResource(aResMgr, "res",  anOcctResFolder, "Lexi_Expr.dat");
-        copyResource(aResMgr, "res",  anOcctResFolder, "IGES");
-        copyResource(aResMgr, "res",  anOcctResFolder, "STEP");
-        //copyResource(aResMgr, "res",  anOcctResFolder, "TObj");
-        //copyResource(aResMgr, "res",  anOcctResFolder, "XCAF");
-        //copyResource(aResMgr, "res",  anOcctResFolder, "Plugin");
-        //copyResource(aResMgr, "res",  anOcctResFolder, "Standard");
-        //copyResource(aResMgr, "res",  anOcctResFolder, "StandardLite");
-
-        copyResource(aResMgr, "shaders/occt", anOcctResFolder, "Declarations.glsl");
-        copyResource(aResMgr, "shaders/occt", anOcctResFolder, "DeclarationsImpl.glsl");
-
-        StProcess::setEnv("CSF_UnitsLexicon",     anOcctResFolder + "/Lexi_Expr.dat");
-        StProcess::setEnv("CSF_UnitsDefinition",  anOcctResFolder + "/Units.dat");
-        StProcess::setEnv("CSF_ShadersDirectory", anOcctResFolder);
-        StProcess::setEnv("CSF_SHMessage",        anOcctResFolder);
+        // force using embedded OCCT resources
+        for(const char** anEnvIter = THE_OCCT_ENV_DEF; *anEnvIter != NULL; ++anEnvIter) {
+            StProcess::setEnv(*anEnvIter, "");
+        }
 
         if(myStAppClass.isEmpty()) {
             myStAppClass = "cad";
@@ -184,12 +157,10 @@
         StProcess::setEnv("StShare", aProcessUpPath);
     }
 
-    StString aResDir = StProcess::getStShareFolder();
-    StProcess::setEnv("CSF_UnitsLexicon",          aResDir + "UnitsAPI" ST_FILE_SPLITTER "Lexi_Expr.dat");
-    StProcess::setEnv("CSF_UnitsDefinition",       aResDir + "UnitsAPI" ST_FILE_SPLITTER "Units.dat");
-    StProcess::setEnv("CSF_ShadersDirectory",      aResDir + "shaders" ST_FILE_SPLITTER "StCADViewer");
-    StProcess::setEnv("CSF_SHMessage",             aResDir + "lang");
-    StProcess::setEnv("CSF_MDTVTexturesDirectory", aResDir + "textures");
+    // force using embedded OCCT resources
+    for(const char** anEnvIter = THE_OCCT_ENV_DEF; *anEnvIter != NULL; ++anEnvIter) {
+        StProcess::setEnv(*anEnvIter, "");
+    }
 
     StHandle<StOpenInfo> anInfo;
     if(anInfo.isNull()

sview-16_06.tar.gz/StCore/StAndroidGlue.cpp -> sview-17_04.tar.gz/StCore/StAndroidGlue.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2014-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -184,6 +184,9 @@
   myHasOrientSensor(false),
   myIsPoorOrient(false),
   myToTrackOrient(false),
+  myToHideStatusBar(true),
+  myToHideNavBar(true),
+  myToSwapEyesHW(false),
   myIsRunning(false),
   myIsStateSaved(false),
   myToDestroy(false) {
@@ -291,9 +294,11 @@
 }
 
 void StAndroidGlue::fetchState(StString&             theNewFile,
-                               StQuaternion<double>& theQuaternion) {
+                               StQuaternion<double>& theQuaternion,
+                               bool&                 theToSwapEyes) {
     StMutexAuto aLock(myFetchLock);
     theQuaternion = myQuaternion;
+    theToSwapEyes = myToSwapEyesHW;
     if(!myDndPath.isEmpty()) {
         theNewFile = myDndPath;
         myDndPath.clear();
@@ -855,6 +860,23 @@
     myToTrackOrient = theToTrack;
 }
 
+void StAndroidGlue::setHideSystemBars(bool theToHideStatusBar,
+                                      bool theToHideNavBar) {
+    if((myToHideStatusBar == theToHideStatusBar && myToHideNavBar == theToHideNavBar)
+    || myActivity == NULL
+    || myThJniEnv == NULL) {
+        return;
+    }
+
+    jclass    aJClassActivity = myThJniEnv->GetObjectClass(myActivity->clazz);
+    jmethodID aJMet           = myThJniEnv->GetMethodID(aJClassActivity, "setHideSystemBars", "(ZZ)V");
+    myThJniEnv->CallVoidMethod(myActivity->clazz, aJMet,
+                               (jboolean )(theToHideStatusBar ? JNI_TRUE : JNI_FALSE),
+                               (jboolean )(theToHideNavBar    ? JNI_TRUE : JNI_FALSE));
+    myToHideStatusBar = theToHideStatusBar;
+    myToHideNavBar    = theToHideNavBar;
+}
+
 void StAndroidGlue::setQuaternion(const StQuaternion<float>& theQ, const float theScreenRotDeg) {
     // do the magic - convert quaternion from Android coordinate system to sView coordinate system
     const StQuaternion<double> anOriPitch = StQuaternion<double>(StVec3<double>::DX(), stToRadians(90.0));
@@ -878,6 +900,11 @@
     myQuaternion = anOri;
 }
 
+void StAndroidGlue::setSwapEyes(bool theToSwapLR) {
+    StMutexAuto aLock(myFetchLock);
+    myToSwapEyesHW = theToSwapLR;
+}
+
 jexp void JNICALL Java_com_sview_StActivity_cppSetOpenPath(JNIEnv* theEnv, jobject theObj, jlong theCppPtr,
                                                            jstring theOpenPath, jstring theMimeType, jboolean theIsLaunchedFromHistory) {
     ((StAndroidGlue* )theCppPtr)->setOpenPath(theOpenPath, theMimeType, theIsLaunchedFromHistory);
@@ -908,4 +935,9 @@
     ((StAndroidGlue* )theCppPtr)->setOrientation(theAzimuthDeg, thePitchDeg, theRollDeg, theScreenRotDeg);
 }
 
+jexp void JNICALL Java_com_sview_StActivity_cppSetSwapEyes(JNIEnv* theEnv, jobject theObj, jlong theCppPtr,
+                                                           jboolean theToSwap) {
+    ((StAndroidGlue* )theCppPtr)->setSwapEyes(theToSwap == JNI_TRUE);
+}
+
 #endif // __ANDROID__

sview-16_06.tar.gz/StCore/StApplication.cpp -> sview-17_04.tar.gz/StCore/StApplication.cpp Changed

sview-16_06.tar.gz/StCore/StCore.rc -> sview-17_04.tar.gz/StCore/StCore.rc Changed

sview-16_06.tar.gz/StCore/StWinHandles.ObjC.mm -> sview-17_04.tar.gz/StCore/StWinHandles.ObjC.mm Changed

sview-16_06.tar.gz/StCore/StWinHandles.cpp -> sview-17_04.tar.gz/StCore/StWinHandles.cpp Changed

@@ -21,7 +21,8 @@
 
 StWinGlrc::StWinGlrc(EGLDisplay theDisplay,
                      const bool theDebugCtx,
-                     int8_t     theGlDepthSize)
+                     int8_t     theGlDepthSize,
+                     int8_t     theGlStencilSize)
 : myDisplay(theDisplay),
   myConfig(NULL),
   myRC(EGL_NO_CONTEXT) {
@@ -41,12 +42,13 @@
                + "  Client APIs: " + eglQueryString(myDisplay, EGL_CLIENT_APIS) + "\n"
                + "  Extensions:  " + eglQueryString(myDisplay, EGL_EXTENSIONS));
 
-    const EGLint aConfigAttribs[] = {
+    EGLint aConfigAttribs[] = {
         EGL_RED_SIZE,   8,
         EGL_GREEN_SIZE, 8,
         EGL_BLUE_SIZE,  8,
         EGL_ALPHA_SIZE, 0,
-        EGL_DEPTH_SIZE, theGlDepthSize,
+        EGL_DEPTH_SIZE,   theGlDepthSize,
+        EGL_STENCIL_SIZE, theGlStencilSize,
     #if defined(GL_ES_VERSION_2_0)
         EGL_CONFORMANT,      EGL_OPENGL_ES2_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
@@ -58,9 +60,21 @@
     };
 
     EGLint aNbConfigs = 0;
-    if(eglChooseConfig(myDisplay, aConfigAttribs, &myConfig, 1, &aNbConfigs) != EGL_TRUE) {
-        ST_ERROR_LOG("EGL, eglChooseConfig FAILED");
-        return;
+    if(eglChooseConfig(myDisplay, aConfigAttribs, &myConfig, 1, &aNbConfigs) != EGL_TRUE
+    || myConfig == NULL) {
+        if(theGlDepthSize <= 16) {
+            ST_ERROR_LOG("EGL, eglChooseConfig FAILED");
+            return;
+        }
+
+        eglGetError();
+        aConfigAttribs[4 * 2 + 1] = 16; // try config with smaller depth buffer
+        aConfigAttribs[5 * 2 + 1] = 0;
+        if(eglChooseConfig(myDisplay, aConfigAttribs, &myConfig, 1, &aNbConfigs) != EGL_TRUE
+        || myConfig == NULL) {
+            ST_ERROR_LOG("EGL, eglChooseConfig FAILED");
+            return;
+        }
     }
 
     /*EGLenum aEglApi = eglQueryAPI();
@@ -359,8 +373,10 @@
 int StWinHandles::glCreateContext(StWinHandles*    theSlave,
                                   const StRectI_t& theRect,
                                   const int        theDepthSize,
+                                  const int        theStencilSize,
                                   const bool       theIsQuadStereo,
                                   const bool       theDebugCtx) {
+    (void )theRect;
 #ifdef _WIN32
     ThreadGL = StThread::getCurrentThreadId();
     ST_DEBUG_LOG("WinAPI, glCreateContext, ThreadGL= " + ThreadGL + ", ThreadWnd= " + ThreadWnd);
@@ -374,97 +390,113 @@
                           "WinAPI, Can't create Slave GL Device Context");
     }
 
-    PIXELFORMATDESCRIPTOR aPixFrmtDesc = THE_PIXELFRMT_DOUBLE;
-    aPixFrmtDesc.cDepthBits = (BYTE )theDepthSize;
-    if(theIsQuadStereo) {
-        aPixFrmtDesc.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL
-                             | PFD_DOUBLEBUFFER | PFD_STEREO;
-    }
-    int aPixFrmtId = ChoosePixelFormat(hDC, &aPixFrmtDesc);
-    ST_GL_ERROR_CHECK(aPixFrmtId != 0, STWIN_ERROR_WIN32_PIXELFORMATF,
-                      "WinAPI, Can't find a suitable PixelFormat for Master");
-    if(theSlave != NULL
-    && ChoosePixelFormat(theSlave->hDC, &aPixFrmtDesc) != aPixFrmtId) {
-        ST_ERROR_LOG("Slave window returns another pixel format! Try to ignore...");
-    }
-
-    if(theIsQuadStereo) {
-        DescribePixelFormat(hDC, aPixFrmtId, sizeof(PIXELFORMATDESCRIPTOR), &aPixFrmtDesc);
-        if((aPixFrmtDesc.dwFlags & PFD_STEREO) == 0) {
-            ST_ERROR_LOG("WinAPI, Quad Buffered stereo not supported");
-        } else {
-            //bool isVistaPlus = StSys::isVistaPlus();
-            //bool isWin8Plus  = StSys::isWin8Plus();
-            ///myNeedsFullscr
-        }
-    }
-
-    HMODULE aModule = GetModuleHandleW(NULL);
-    hWinTmp = CreateWindowExW(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE,
-                              ClassTmp.toCString(), L"TmpWnd",
-                              WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_DISABLED,
-                              theRect.left() + 2, theRect.top() + 2, 4, 4,
-                              NULL, NULL, aModule, NULL);
-    ST_GL_ERROR_CHECK(hWinTmp != NULL, STWIN_ERROR_WIN32_GLDC,
-                      "WinAPI, Temporary window creation error");
-
-    HDC aDevCtxTmp = GetDC(hWinTmp);
-    ST_GL_ERROR_CHECK(aPixFrmtId != 0, STWIN_ERROR_WIN32_PIXELFORMATF,
-                      "WinAPI, Can't find a suitable PixelFormat for Tmp");
-
-    ST_GL_ERROR_CHECK(SetPixelFormat(aDevCtxTmp, aPixFrmtId, &aPixFrmtDesc),
-                      STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Master");
-    StWinGlrcH aRendCtxTmp = new StWinGlrc(aDevCtxTmp, NULL);
-    ST_GL_ERROR_CHECK(aRendCtxTmp->isValid(),
-                      STWIN_ERROR_WIN32_GLRC_CREATE, "WinAPI, Can't create GL Rendering Context");
-    ST_GL_ERROR_CHECK(aRendCtxTmp->makeCurrent(aDevCtxTmp),
-                      STWIN_ERROR_WIN32_GLRC_ACTIVATE, "WinAPI, Can't activate Tmp GL Rendering Context");
-
-    StGLContext aCtx(false);
-    ST_GL_ERROR_CHECK(aCtx.stglInit(),
-                      STWIN_ERROR_WIN32_GLRC_ACTIVATE, "WinAPI, Broken Tmp GL Rendering Context");
-
-    if(aCtx.extAll->wglChoosePixelFormatARB != NULL) {
-        const int aPixAttribs[] = {
-            WGL_DRAW_TO_WINDOW_ARB, GL_TRUE,
-            WGL_SUPPORT_OPENGL_ARB, GL_TRUE,
-            WGL_DOUBLE_BUFFER_ARB,  GL_TRUE,
-            WGL_STEREO_ARB,         theIsQuadStereo ? GL_TRUE : GL_FALSE,
-            WGL_PIXEL_TYPE_ARB,     WGL_TYPE_RGBA_ARB,
-            //WGL_SAMPLE_BUFFERS_ARB, 1,
-            //WGL_SAMPLES_ARB,        8,
-            // WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB       0x00000004
-            WGL_COLOR_BITS_ARB,     24,
-            WGL_DEPTH_BITS_ARB,     theDepthSize,
-            WGL_STENCIL_BITS_ARB,   0,
-            0, 0,
-        };
-        unsigned int aFrmtsNb = 0;
-        aCtx.extAll->wglChoosePixelFormatARB(hDC, aPixAttribs, NULL, 1, &aPixFrmtId, &aFrmtsNb);
-    }
-    ST_GL_ERROR_CHECK(SetPixelFormat(hDC, aPixFrmtId, &aPixFrmtDesc),
-                      STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Master");
-    ST_GL_ERROR_CHECK(theSlave == NULL || SetPixelFormat(theSlave->hDC, aPixFrmtId, &aPixFrmtDesc),
-                      STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Slave");
-
     HGLRC aRendCtx = NULL;
-    if(aCtx.extAll->wglCreateContextAttribsARB != NULL) {
-        // Beware! NVIDIA drivers reject context creation when WGL_CONTEXT_PROFILE_MASK_ARB are specified
-        // but not WGL_CONTEXT_MAJOR_VERSION_ARB/WGL_CONTEXT_MINOR_VERSION_ARB
-        int aCtxAttribs[] = {
-            //WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-            //WGL_CONTEXT_MINOR_VERSION_ARB, 2,
-            //WGL_CONTEXT_PROFILE_MASK_ARB,  WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-            WGL_CONTEXT_FLAGS_ARB,         theDebugCtx ? WGL_CONTEXT_DEBUG_BIT_ARB : 0,
-            0, 0
-        };
-
-        aRendCtx = aCtx.extAll->wglCreateContextAttribsARB(hDC, NULL, aCtxAttribs);
+    {
+      PIXELFORMATDESCRIPTOR aPixFrmtDesc = THE_PIXELFRMT_DOUBLE;
+      aPixFrmtDesc.cDepthBits   = (BYTE )theDepthSize;
+      aPixFrmtDesc.cStencilBits = (BYTE )theStencilSize;
+      if(theIsQuadStereo) {
+          aPixFrmtDesc.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL
+                               | PFD_DOUBLEBUFFER | PFD_STEREO;
+      }
+
+      HMODULE aModule = GetModuleHandleW(NULL);
+      hWinTmp = CreateWindowExW(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE,
+                                ClassTmp.toCString(), L"TmpWnd",
+                                WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_DISABLED,
+                                // always create temporary window on main screen
+                                // to workaround sporadic bugs (access violation) in AMD Catalyst drivers
+                                2, 2, 4, 4, //theRect.left() + 2, theRect.top() + 2, 4, 4,
+                                NULL, NULL, aModule, NULL);
+      ST_GL_ERROR_CHECK(hWinTmp != NULL, STWIN_ERROR_WIN32_GLDC,
+                        "WinAPI, Temporary window creation error");
+
+      HDC aDevCtxTmp = GetDC(hWinTmp);
+      int aPixFrmtIdTmp = ChoosePixelFormat(aDevCtxTmp, &aPixFrmtDesc);
+      ST_GL_ERROR_CHECK(aPixFrmtIdTmp != 0, STWIN_ERROR_WIN32_PIXELFORMATF,
+                        "WinAPI, Can't find a suitable PixelFormat for Tmp");
+
+      ST_GL_ERROR_CHECK(SetPixelFormat(aDevCtxTmp, aPixFrmtIdTmp, &aPixFrmtDesc),
+                        STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Master");
+      StWinGlrcH aRendCtxTmp = new StWinGlrc(aDevCtxTmp, NULL);
+      ST_GL_ERROR_CHECK(aRendCtxTmp->isValid(),
+                        STWIN_ERROR_WIN32_GLRC_CREATE, "WinAPI, Can't create GL Rendering Context");
+      ST_GL_ERROR_CHECK(aRendCtxTmp->makeCurrent(aDevCtxTmp),
+                        STWIN_ERROR_WIN32_GLRC_ACTIVATE, "WinAPI, Can't activate Tmp GL Rendering Context");
+
+      StGLContext aCtx(false);
+      ST_GL_ERROR_CHECK(aCtx.stglInit(),
+                        STWIN_ERROR_WIN32_GLRC_ACTIVATE, "WinAPI, Broken Tmp GL Rendering Context");
+
+      int aPixFrmtId = 0;
+      if(aCtx.extAll->wglChoosePixelFormatARB != NULL) {
+          for(bool toTryQuadBuffer = theIsQuadStereo;;) {
+              const int aPixAttribs[] = {
+                  WGL_DRAW_TO_WINDOW_ARB, GL_TRUE,
+                  WGL_SUPPORT_OPENGL_ARB, GL_TRUE,
+                  WGL_DOUBLE_BUFFER_ARB,  GL_TRUE,
+                  WGL_STEREO_ARB,         toTryQuadBuffer ? GL_TRUE : GL_FALSE,
+                  WGL_PIXEL_TYPE_ARB,     WGL_TYPE_RGBA_ARB,
+                  //WGL_SAMPLE_BUFFERS_ARB, 1,
+                  //WGL_SAMPLES_ARB,        8,
+                  // WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB       0x00000004
+                  WGL_COLOR_BITS_ARB,     24,
+                  WGL_DEPTH_BITS_ARB,     theDepthSize,
+                  WGL_STENCIL_BITS_ARB,   theStencilSize,
+                  0, 0,
+              };
+              unsigned int aFrmtsNb = 0;
+              aCtx.extAll->wglChoosePixelFormatARB(hDC, aPixAttribs, NULL, 1, &aPixFrmtId, &aFrmtsNb);
+              if(toTryQuadBuffer && aPixFrmtId == 0) {
+                  toTryQuadBuffer = false;
+                  continue;
+              }
+              if(theSlave != NULL) {
+                  int aPixFrmtIdSlave = 0;
+                  aCtx.extAll->wglChoosePixelFormatARB(theSlave->hDC, aPixAttribs, NULL, 1, &aPixFrmtIdSlave, &aFrmtsNb);
+                  if(aPixFrmtIdSlave != aPixFrmtId) {
+                      ST_ERROR_LOG("Slave window returns another pixel format! Try to ignore...");
+                  }
+              }
+              break;
+          }
+      } else {
+          aPixFrmtId = ChoosePixelFormat(hDC, &aPixFrmtDesc);
+          if(theSlave != NULL
+          && ChoosePixelFormat(theSlave->hDC, &aPixFrmtDesc) != aPixFrmtId) {
+              ST_ERROR_LOG("Slave window returns another pixel format! Try to ignore...");
+          }
+      }
+      ST_GL_ERROR_CHECK(aPixFrmtId != 0, STWIN_ERROR_WIN32_PIXELFORMATF,
+                        "WinAPI, Can't find a suitable PixelFormat for Master");
+      DescribePixelFormat(hDC, aPixFrmtId, sizeof(PIXELFORMATDESCRIPTOR), &aPixFrmtDesc);
+      if(theIsQuadStereo) {
+          if((aPixFrmtDesc.dwFlags & PFD_STEREO) == 0) {
+              ST_ERROR_LOG("WinAPI, Quad Buffered stereo is not supported");
+          }
+      }
+      ST_GL_ERROR_CHECK(SetPixelFormat(hDC, aPixFrmtId, &aPixFrmtDesc),
+                        STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Master");
+      ST_GL_ERROR_CHECK(theSlave == NULL || SetPixelFormat(theSlave->hDC, aPixFrmtId, &aPixFrmtDesc),
+                        STWIN_ERROR_WIN32_PIXELFORMATS, "WinAPI, Can't set the PixelFormat for Slave");
+      if(aCtx.extAll->wglCreateContextAttribsARB != NULL) {
+          // Beware! NVIDIA drivers reject context creation when WGL_CONTEXT_PROFILE_MASK_ARB are specified
+          // but not WGL_CONTEXT_MAJOR_VERSION_ARB/WGL_CONTEXT_MINOR_VERSION_ARB
+          int aCtxAttribs[] = {
+              //WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+              //WGL_CONTEXT_MINOR_VERSION_ARB, 2,
+              //WGL_CONTEXT_PROFILE_MASK_ARB,  WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+              WGL_CONTEXT_FLAGS_ARB,         theDebugCtx ? WGL_CONTEXT_DEBUG_BIT_ARB : 0,
+              0, 0
+          };
+
+          aRendCtx = aCtx.extAll->wglCreateContextAttribsARB(hDC, NULL, aCtxAttribs);
+      }
+
+      aRendCtxTmp.nullify();
+      destroyWindow(hWinTmp);
     }
 
-    aRendCtxTmp.nullify();
-    destroyWindow(hWinTmp);
-
     hRC = new StWinGlrc(hDC, aRendCtx);
     ST_GL_ERROR_CHECK(hRC->isValid(),
                       STWIN_ERROR_WIN32_GLRC_CREATE, "WinAPI, Can't create GL Rendering Context");
@@ -623,7 +655,10 @@
 
 namespace {
     static StAtomic<int32_t> ST_CLASS_COUNTER(0);
-};
+    static LRESULT CALLBACK wndProcDummy(HWND theWin, UINT theMsg, WPARAM theParamW, LPARAM theParamL) {
+        return DefWindowProcW(theWin, theMsg, theParamW, theParamL);
+    }
+}
 
 StStringUtfWide StWinHandles::getNewClassName() {
     return StStringUtfWide(L"StWindowClass") + StStringUtfWide(ST_CLASS_COUNTER.increment());
@@ -667,7 +702,7 @@
     }
     ClassGL = aNameGl;
 
-    if(!registerClass(aNameTmp, theProc)) {
+    if(!registerClass(aNameTmp, wndProcDummy)) {
         return false;
     }
     ClassTmp = aNameTmp;

sview-16_06.tar.gz/StCore/StWinHandles.h -> sview-17_04.tar.gz/StCore/StWinHandles.h Changed

sview-16_06.tar.gz/StCore/StWindow.cpp -> sview-17_04.tar.gz/StCore/StWindow.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -120,6 +120,10 @@
     //
 }
 
+bool StWindow::isStereoFullscreenOnly() const {
+    return false;
+}
+
 bool StWindow::isStereoOutput() const {
     return myIsForcedStereo || myWin->isStereoOutput();
 }
@@ -205,14 +209,18 @@
     myWin->setPlacement(theRect, theMoveToScreen);
 }
 
-const StMarginsI& StWindow::getMargins() const {
-    return myMargins;
+StMarginsI StWindow::getMargins() const {
+    return StMarginsI();
 }
 
 StPointD_t StWindow::getMousePos() const {
     return myWin->getMousePos();
 }
 
+bool StWindow::isPreciseCursor() const {
+    return myWin->isPreciseCursor();
+}
+
 bool StWindow::create() {
     myWasUsed = true;
     return myWin->create();
@@ -339,6 +347,19 @@
     return aRect;
 }
 
+double StWindow::stglAspectRatio() const {
+    if(myWin->myForcedAspect > 0.0) {
+        return myWin->myForcedAspect;
+    }
+
+    const StGLBoxPx aVPMaster = StWindow::stglViewport(ST_WIN_MASTER);
+    return double(aVPMaster.width() != 0 ? aVPMaster.width() : 1) / double(aVPMaster.height() != 0 ? aVPMaster.height() : 1);
+}
+
+void StWindow::setForcedAspect(double theAspect) {
+    myWin->myForcedAspect = theAspect;
+}
+
 void* StWindow::getNativeOglWin() const {
 #ifdef _WIN32
     return (void* )myWin->myMaster.hWindowGl;
@@ -398,6 +419,12 @@
     }
 }
 
+void StWindow::setHideSystemBars(bool theToHideStatusBar,
+                                 bool theToHideNavBar) {
+    myWin->myToHideStatusBar = theToHideStatusBar;
+    myWin->myToHideNavBar    = theToHideNavBar;
+}
+
 StQuaternion<double> StWindow::getDeviceOrientation() const {
     if(myWin->myToTrackOrient
     && myWin->myHasOrientSensor) {
@@ -405,3 +432,7 @@
     }
     return StQuaternion<double>();
 }
+
+bool StWindow::toSwapEyesHW() const {
+    return myWin->myToSwapEyesHW;
+}

sview-16_06.tar.gz/StCore/StWindowImpl.cpp -> sview-17_04.tar.gz/StCore/StWindowImpl.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -51,7 +51,11 @@
   myHasOrientSensor(false),
   myIsPoorOrient(false),
   myToTrackOrient(false),
+  myToHideStatusBar(true),
+  myToHideNavBar(true),
+  myToSwapEyesHW(false),
   myMousePt(0.5, 0.5),
+  myIsPreciseCursor(true),
   myNbTouchesMax(0),
   myRectNorm(128, 512, 128, 512),
   myRectFull(128, 512, 128, 512),
@@ -61,6 +65,7 @@
   myWinOnMonitorId(0),
   myWinMonScaleId(0),
   myTiledCfg(TiledCfg_Separate),
+  myForcedAspect(-1.0),
 #ifdef _WIN32
   myRegisterTouchWindow(NULL),
   myUnregisterTouchWindow(NULL),
@@ -73,7 +78,6 @@
   myEventQuit(false),
   myEventCursorShow(false),
   myEventCursorHide(false),
-  myIsVistaPlus(StSys::isVistaPlus()),
 #elif (defined(__APPLE__))
   mySleepAssert(0),
 #endif
@@ -84,6 +88,10 @@
   myBlockSleep(BlockSleep_OFF),
   myIsSystemLocked(false),
   myIsDispChanged(false),
+  myAlignDL(0),
+  myAlignDR(0),
+  myAlignDT(0),
+  myAlignDB(0),
   myLastEventsTime(0.0),
   myEventsThreaded(false),
   myIsMouseMoved(false) {
@@ -94,6 +102,7 @@
     attribs.IsGlStereo     = false;
     attribs.IsGlDebug      = false;
     attribs.GlDepthSize    = 16;
+    attribs.GlStencilSize  = 0;
 #if defined(__ANDROID__)
     attribs.IsFullScreen   = true;
 #else
@@ -128,15 +137,6 @@
 #ifdef _WIN32
     myEventsThreaded = true; // events loop is always performed in dedicated thread
 
-    HMODULE aUser32Module = GetModuleHandleW(L"User32");
-    if(aUser32Module != NULL) {
-        // User32 should be already loaded
-        myRegisterTouchWindow   = (RegisterTouchWindow_t   )GetProcAddress(aUser32Module, "RegisterTouchWindow");
-        myUnregisterTouchWindow = (UnregisterTouchWindow_t )GetProcAddress(aUser32Module, "UnregisterTouchWindow");
-        myGetTouchInputInfo     = (GetTouchInputInfo_t     )GetProcAddress(aUser32Module, "GetTouchInputInfo");
-        myCloseTouchInputHandle = (CloseTouchInputHandle_t )GetProcAddress(aUser32Module, "CloseTouchInputHandle");
-    }
-
     // Adjust system timer
     // By default Windows2K+ timer has ugly precision
     // Thus - Sleep(1) may be long 14ms!
@@ -164,19 +164,13 @@
 
 void StWindowImpl::StSyncTimer::initUpTime() {
 #if defined(_WIN32)
-    myGetTick64 = NULL;
-    if(StSys::isVistaPlus()) {
-        HMODULE aKern32 = GetModuleHandleW(L"kernel32");
-        myGetTick64 = (GetTickCount64_t )GetProcAddress(aKern32, "GetTickCount64");
-    }
-
     // Spin waiting for a change in system time (should take up to 15 ms on modern systems).
     // Alternatively timeGetTime() might be used instead which handle time in 1 ms precision
     // when used in combination with timeBeginPeriod(1).
-    const uint64_t anUptime0 = (myGetTick64 != NULL) ? myGetTick64() : (uint64_t )GetTickCount();
+    const uint64_t anUptime0 = GetTickCount64();
     uint64_t anUptime1 = 0;
     do {
-        anUptime1 = (myGetTick64 != NULL) ? myGetTick64() : (uint64_t )GetTickCount();
+        anUptime1 = GetTickCount64();
         fillCounter(myCounterStart);
     } while(anUptime0 == anUptime1);
     myTimeInMicroSec = anUptime1 * 1000.0; // convert to microseconds
@@ -195,11 +189,11 @@
 void StWindowImpl::StSyncTimer::resyncUpTime() {
 #if defined(_WIN32)
     // spin waiting for a change in system time (should take up to 15 ms on modern systems)
-    const uint64_t anUptime0 = (myGetTick64 != NULL) ? myGetTick64() : (uint64_t )GetTickCount();
+    const uint64_t anUptime0 = GetTickCount64();
     uint64_t anUptime1 = 0;
     double aTimerValue = 0.0;
     do {
-        anUptime1   = (myGetTick64 != NULL) ? myGetTick64() : (uint64_t )GetTickCount();
+        anUptime1   = GetTickCount64();
         aTimerValue = getElapsedTimeInMicroSec();
     } while(anUptime0 == anUptime1);
     mySyncMicroSec     = float(anUptime1 * 1000.0 - aTimerValue);
@@ -363,6 +357,9 @@
             case StWinAttr_GlDepthSize:
                 anIter[1] = (StWinAttr )attribs.GlDepthSize;
                 break;
+            case StWinAttr_GlStencilSize:
+                anIter[1] = (StWinAttr )attribs.GlStencilSize;
+                break;
             case StWinAttr_ToBlockSleepSystem:
                 anIter[1] = (StWinAttr )attribs.ToBlockSleepSystem;
                 break;
@@ -408,6 +405,9 @@
             case StWinAttr_GlDepthSize:
                 attribs.GlDepthSize = (int8_t )anIter[1];
                 break;
+            case StWinAttr_GlStencilSize:
+                attribs.GlStencilSize = (int8_t )anIter[1];
+                break;
             case StWinAttr_ToBlockSleepSystem:
                 attribs.ToBlockSleepSystem = (anIter[1] == 1);
                 break;
@@ -429,17 +429,39 @@
                 if(attribs.Split != (StWinSplit )anIter[1]
                 && attribs.IsFullScreen) {
                     switch(attribs.Split) {
-                        case StWinSlave_splitHorizontal:   myRectFull.right()  += myRectFull.width();  break;
-                        case StWinSlave_splitVertical:     myRectFull.bottom() += myRectFull.height(); break;
-                        case StWinSlave_splitVertHdmi720:  myRectFull.bottom() += 720  + 30; break;
-                        case StWinSlave_splitVertHdmi1080: myRectFull.bottom() += 1080 + 45; break;
-                        default: break;
+                        case StWinSlave_splitHorizontal:
+                        case StWinSlave_splitVertical:
+                        case StWinSlave_splitVertHdmi720:
+                        case StWinSlave_splitVertHdmi1080: {
+                            if(myRectFullInit.width() != 0) {
+                                // restore rectangle
+                                myRectFull = myRectFullInit;
+                            }
+                            break;
+                        }
+                        case StWinSlave_splitOff: {
+                            // remember rectangle
+                            myRectFullInit = myRectFull;
+                            break;
+                        }
                     }
 
                     switch((StWinSplit )anIter[1]) {
                         case StWinSlave_splitHorizontal: {
                             myTiledCfg = TiledCfg_MasterSlaveX;
-                            myRectFull.right() -= myRectFull.width() / 2;
+                            if(myForcedAspect > 0.0) {
+                                const int aNewSizeY = int(double(myRectFull.width()) / myForcedAspect);
+                                const int aDY       = aNewSizeY - myRectFull.height();
+                                if(aDY <= 0) {
+                                    myRectFull.bottom() += aDY;
+                                } else {
+                                    const int aNewSizeX = int(double(myRectFull.height()) * myForcedAspect);
+                                    const int aDX       = aNewSizeX - myRectFull.width();
+                                    myRectFull.right() += aDX;
+                                }
+                            } else {
+                                myRectFull.right() -= myRectFull.width() / 2;
+                            }
                             break;
                         }
                         case StWinSlave_splitVertical: {
@@ -462,10 +484,7 @@
                             break;
                         }
                     }
-                    myStEventAux.Type       = stEvent_Size;
-                    myStEventAux.Size.Time  = getEventTime();
-                    myStEventAux.Size.SizeX = myRectFull.width();
-                    myStEventAux.Size.SizeY = myRectFull.height();
+                    myStEventAux.Size.init(getEventTime(), myRectFull.width(), myRectFull.height(), myForcedAspect);
                     signals.onResize->emit(myStEventAux.Size);
                 }
                 attribs.Split = (StWinSplit )anIter[1];
@@ -499,10 +518,8 @@
     if(attribs.ToBlockSleepDisplay
     && !myIsSystemLocked) {
         // prevent display sleep - call this periodically
-        EXECUTION_STATE aState = ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED;
-        if(myIsVistaPlus) {
-            aState = aState | ES_AWAYMODE_REQUIRED;
-        }
+        EXECUTION_STATE aState = ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED
+                               | ES_AWAYMODE_REQUIRED;
         SetThreadExecutionState(aState);
 
         if(myBlockSleep == BlockSleep_DISPLAY) {
@@ -523,10 +540,8 @@
         myBlockSleep = BlockSleep_DISPLAY;
     } else if(attribs.ToBlockSleepSystem) {
         // prevent system sleep - call this periodically
-        EXECUTION_STATE aState = ES_CONTINUOUS | ES_SYSTEM_REQUIRED;
-        if(myIsVistaPlus) {
-            aState = aState | ES_AWAYMODE_REQUIRED;
-        }
+        EXECUTION_STATE aState = ES_CONTINUOUS | ES_SYSTEM_REQUIRED
+                               | ES_AWAYMODE_REQUIRED;
         SetThreadExecutionState(aState);
 
         if(myBlockSleep == BlockSleep_SYSTEM) {

sview-16_06.tar.gz/StCore/StWindowImpl.h -> sview-17_04.tar.gz/StCore/StWindowImpl.h Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -67,6 +67,7 @@
     ST_LOCAL void setPlacement(const StRectI_t& theRect,
                                const bool       theMoveToScreen);
     ST_LOCAL StPointD_t getMousePos();
+    ST_LOCAL bool isPreciseCursor() const { return myIsPreciseCursor; }
     ST_LOCAL bool create();
     ST_LOCAL void stglSwap(const int& theWinId);
     ST_LOCAL bool stglMakeCurrent(const int theWinId);
@@ -277,13 +278,18 @@
     bool               myHasOrientSensor; //!< flag indicating that device has orientation sensors
     bool               myIsPoorOrient;    //!< flag indicating that available orientation sensor provides imprecise values
     bool               myToTrackOrient;   //!< track device orientation
+    bool               myToHideStatusBar; //!< hide system-provided status bar
+    bool               myToHideNavBar;    //!< hide system-provided navigation bar
+    bool               myToSwapEyesHW;    //!< flag to swap LR views on external event
 
     StPointD_t         myMousePt;         //!< mouse coordinates to track activity
+    bool               myIsPreciseCursor; //!< flag indicating that last mouse cursor position was updated by precise input device
     StTouchEvent       myTouches;         //!< current state of touch screen
     StTouchEvent       myTap1Touch;       //!< previous tap touch
     int                myNbTouchesMax;    //!< maximum touches within current sequence
     StRectI_t          myRectNorm;        //!< master window coordinates in normal     state
     StRectI_t          myRectFull;        //!< master window coordinates in fullscreen state
+    StRectI_t          myRectFullInit;    //!< fullscreen rectangle before applying tiling
     StRectI_t          myRectNormPrev;    //!< window rectangle to track changes
     StMarginsI         myDecMargins;      //!< decoration margins
 
@@ -294,6 +300,7 @@
     int                myWinOnMonitorId;  //!< monitor id where window is placed
     int                myWinMonScaleId;   //!< monitor id from which scale factor is applied
     TiledCfg           myTiledCfg;        //!< tiles configuration (multiple viewports within the same window)
+    double             myForcedAspect;    //!< forced window aspect ratio (negative number if not forced)
 
 #ifdef _WIN32
     // available since Win7 (not in Vista!)
@@ -320,7 +327,6 @@
     StCondition        myEventCursorShow;
     StCondition        myEventCursorHide;
     MSG                myEvent;           //!< message for windows' message loop
-    bool               myIsVistaPlus;     //!< system is Vista+
 #elif defined(__APPLE__)
     StCocoaCoords      myCocoaCoords;
     IOPMAssertionLevel mySleepAssert;     //!< prevent system going to sleep
@@ -349,6 +355,7 @@
         bool       IsGlStereo;         //!< request OpenGL hardware accelerated QuadBuffer
         bool       IsGlDebug;          //!< request OpenGL debug context
         int8_t     GlDepthSize;        //!< OpenGL Depth Buffer size
+        int8_t     GlStencilSize;      //!< OpenGL Stencil Buffer size
         bool       IsFullScreen;       //!< to show in fullscreen mode
         bool       IsExclusiveFullScr; //!< use exclusive fullscreen mode (improve performance, prevent other applications)
         bool       IsHidden;           //!< to hide the window
@@ -392,9 +399,7 @@
         : StTimer(),
           myLastSyncMicroSec(0.0),
           mySyncMicroSec(0.0f) {
-        #if defined(_WIN32)
-            myGetTick64 = NULL;
-        #elif defined(__APPLE__)
+        #if defined(__APPLE__)
             (void )::mach_timebase_info(&myTimebaseInfo);
         #endif
         }
@@ -444,7 +449,7 @@
          */
         ST_LOCAL double getUpTimeFromSystem() const {
         #ifdef _WIN32
-            const uint64_t anUptime = (myGetTick64 != NULL) ? myGetTick64() : (uint64_t )GetTickCount();
+            const uint64_t anUptime = GetTickCount64();
             return double(anUptime) * 0.001;
         #elif defined(__APPLE__)
             // use function from CoreServices to retrieve system uptime
@@ -458,10 +463,7 @@
         #endif
         }
 
-    #ifdef _WIN32
-        typedef ULONGLONG (WINAPI *GetTickCount64_t)();
-        GetTickCount64_t   myGetTick64;
-    #elif defined(__APPLE__)
+    #if defined(__APPLE__)
         mach_timebase_info_data_t myTimebaseInfo;
     #endif
         double             myLastSyncMicroSec; //!< timestamp of last synchronization
@@ -475,6 +477,10 @@
     StEvent        myStEvent;          //!< temporary event object (to be used in message loop thread)
     StEvent        myStEvent2;         //!< temporary event object (to be used in message loop thread)
     StEvent        myStEventAux;       //!< extra temporary event object (to be used in StWindow creation thread)
+    int            myAlignDL;          //!< extra window shift applied for alignment (left)
+    int            myAlignDR;          //!< extra window shift applied for alignment (right)
+    int            myAlignDT;          //!< extra window shift applied for alignment (top)
+    int            myAlignDB;          //!< extra window shift applied for alignment (bottom)
     double         myLastEventsTime;   //!< time when processEvents() was last called
     bool           myEventsThreaded;
     bool           myIsMouseMoved;

sview-16_06.tar.gz/StCore/StWindowImplAnd.cpp -> sview-17_04.tar.gz/StCore/StWindowImplAnd.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2014-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -88,10 +88,7 @@
             myIsUpdated    = true;
 
             const StRectI_t& aRect = attribs.IsFullScreen ? myRectFull : myRectNorm;
-            myStEvent.Type       = stEvent_Size;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = aRect.width();
-            myStEvent.Size.SizeY = aRect.height();
+            myStEvent.Size.init(getEventTime(), aRect.width(), aRect.height(), myForcedAspect);
             signals.onResize->emit(myStEvent.Size);
         }
     }
@@ -128,10 +125,7 @@
     myRectNorm.bottom() = myRectNorm.top()  + aHeight;
     myRectFull = myRectNorm;
 
-    myStEvent.Type       = stEvent_Size;
-    myStEvent.Size.Time  = getEventTime();
-    myStEvent.Size.SizeX = myRectNorm.width();
-    myStEvent.Size.SizeY = myRectNorm.height();
+    myStEvent.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
     signals.onResize->emit(myStEvent.Size);
 }
 
@@ -219,6 +213,7 @@
                             if(aNbTouches == 1) {
                                 // simulate mouse click
                                 myMousePt = aPos0;
+                                myIsPreciseCursor = false;
                                 myStEvent.Type = stEvent_MouseDown;
                                 myStEvent.Button.Button  = ST_MOUSE_LEFT;
                                 myStEvent.Button.Buttons = 0;
@@ -241,6 +236,7 @@
                             if(aNbTouches == 1) {
                                 // simulate mouse move
                                 myMousePt = aPos0;
+                                myIsPreciseCursor = false;
                             }
                             doTouch(myStEvent.Touch);
                             break;
@@ -252,6 +248,7 @@
                             if(aNbTouches == 1) {
                                 // simulate mouse unclick
                                 myMousePt = aPos0;
+                                myIsPreciseCursor = false;
                                 myStEvent.Type = stEvent_MouseUp;
                                 myStEvent.Button.Button  = ST_MOUSE_LEFT;
                                 myStEvent.Button.Buttons = 0;
@@ -272,6 +269,7 @@
             }
 
             myMousePt = aPos0;
+            myIsPreciseCursor = aSource == AINPUT_SOURCE_MOUSE; // || AINPUT_SOURCE_STYLUS
 
             StVirtButton aMouseBtn = ST_MOUSE_LEFT;
             myStEvent.Button.Button  = aMouseBtn;
@@ -336,16 +334,13 @@
 
         myInitState = STWIN_INIT_SUCCESS;
         if(isResized) {
-            myStEvent.Type       = stEvent_Size;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = myRectNorm.width();
-            myStEvent.Size.SizeY = myRectNorm.height();
+            myStEvent.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
             signals.onResize->emit(myStEvent.Size);
         }
         return true;
     }
 
-    myMaster.hRC = new StWinGlrc(eglGetDisplay(EGL_DEFAULT_DISPLAY), attribs.IsGlDebug, attribs.GlDepthSize);
+    myMaster.hRC = new StWinGlrc(eglGetDisplay(EGL_DEFAULT_DISPLAY), attribs.IsGlDebug, attribs.GlDepthSize, attribs.GlStencilSize);
     if(!myMaster.hRC->isValid()) {
         myMaster.close();
         mySlave.close();
@@ -354,7 +349,7 @@
     }
 
     myMaster.hWindowGl = myParentWin->getWindow();
-    myInitState = myMaster.glCreateContext(NULL, myRectNorm, attribs.GlDepthSize, attribs.IsGlStereo, attribs.IsGlDebug);
+    myInitState = myMaster.glCreateContext(NULL, myRectNorm, attribs.GlDepthSize, attribs.GlStencilSize, attribs.IsGlStereo, attribs.IsGlDebug);
     if(myInitState != STWIN_INIT_SUCCESS) {
         return false;
     }
@@ -454,10 +449,8 @@
             // do not handle resize event here - screen might be not yet resized
             updateMonitors();
 
+            myStEvent.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
             myStEvent.Type  = stEvent_NewMonitor;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = myRectNorm.width();
-            myStEvent.Size.SizeY = myRectNorm.height();
             //myWinOnMonitorId = 0;
             signals.onAnotherMonitor->emit(myStEvent.Size);
             return;
@@ -484,7 +477,8 @@
     StString aDndFile;
     myParentWin->setHardwareStereoOn(myToEnableStereoHW);
     myParentWin->setTrackOrientation(myToTrackOrient);
-    myParentWin->fetchState(aDndFile, myQuaternion);
+    myParentWin->setHideSystemBars(myToHideStatusBar, myToHideNavBar);
+    myParentWin->fetchState(aDndFile, myQuaternion, myToSwapEyesHW);
     if(!aDndFile.isEmpty()) {
         std::vector<const char*> aDndList;
         aDndList.push_back(aDndFile.toCString());

sview-16_06.tar.gz/StCore/StWindowImplLin.cpp -> sview-17_04.tar.gz/StCore/StWindowImplLin.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -109,7 +109,7 @@
     Display* hDisplay = stXDisplay->hDisplay;
 
 #if defined(ST_HAVE_EGL)
-    myMaster.hRC = new StWinGlrc(eglGetDisplay(hDisplay), attribs.IsGlDebug, attribs.GlDepthSize);
+    myMaster.hRC = new StWinGlrc(eglGetDisplay(hDisplay), attribs.IsGlDebug, attribs.GlDepthSize, attribs.GlStencilSize);
     if(!myMaster.hRC->isValid()) {
         myMaster.close();
         mySlave.close();
@@ -153,7 +153,7 @@
         GLX_BLUE_SIZE,     8,
         GLX_ALPHA_SIZE,    0,
         GLX_DEPTH_SIZE,    attribs.GlDepthSize,
-        GLX_STENCIL_SIZE,  0,
+        GLX_STENCIL_SIZE,  attribs.GlStencilSize,
         GLX_DOUBLEBUFFER,  True,
         //GLX_SAMPLE_BUFFERS, 1,
         //GLX_SAMPLES,        4,
@@ -320,6 +320,7 @@
     int isGlCtx = myMaster.glCreateContext(attribs.Slave != StWinSlave_slaveOff ? &mySlave : NULL,
                                            myRectNorm,
                                            attribs.GlDepthSize,
+                                           attribs.GlStencilSize,
                                            attribs.IsGlStereo,
                                            attribs.IsGlDebug);
     if(isGlCtx != STWIN_INIT_SUCCESS) {
@@ -426,10 +427,7 @@
             myIsUpdated    = true;
 
             const StRectI_t& aRect = attribs.IsFullScreen ? myRectFull : myRectNorm;
-            myStEvent.Type       = stEvent_Size;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = aRect.width();
-            myStEvent.Size.SizeY = aRect.height();
+            myStEvent.Size.init(getEventTime(), aRect.width(), aRect.height(), myForcedAspect);
             signals.onResize->emit(myStEvent.Size);
         }
     }
@@ -584,10 +582,7 @@
     XSetInputFocus(hDisplay, myMaster.hWindowGl, RevertToParent, CurrentTime);
 
     const StRectI_t& aRect = attribs.IsFullScreen ? myRectFull : myRectNorm;
-    myStEvent.Type       = stEvent_Size;
-    myStEvent.Size.Time  = getEventTime();
-    myStEvent.Size.SizeX = aRect.width();
-    myStEvent.Size.SizeY = aRect.height();
+    myStEvent.Size.init(getEventTime(), aRect.width(), aRect.height(), myForcedAspect);
     signals.onResize->emit(myStEvent.Size);
 
     // flushes the output buffer, most client apps needn't use this cause buffer is automatically flushed as needed by calls to XNextEvent()...
@@ -786,10 +781,7 @@
     }
 
     const StRectI_t& aRect = attribs.IsFullScreen ? myRectFull : myRectNorm;
-    myStEvent.Type       = stEvent_Size;
-    myStEvent.Size.Time  = getEventTime();
-    myStEvent.Size.SizeX = aRect.width();
-    myStEvent.Size.SizeY = aRect.height();
+    myStEvent.Size.init(getEventTime(), aRect.width(), aRect.height(), myForcedAspect);
     signals.onResize->emit(myStEvent.Size);
 
     // force input focus to Master
@@ -799,10 +791,8 @@
     if(!attribs.IsFullScreen && myMonitors.size() > 1) {
         int aNewMonId = myMonitors[myRectNorm.center()].getId();
         if(myWinOnMonitorId != aNewMonId) {
-            myStEventAux.Type  = stEvent_NewMonitor;
-            myStEventAux.Size.Time  = getEventTime();
-            myStEventAux.Size.SizeX = myRectNorm.width();
-            myStEventAux.Size.SizeY = myRectNorm.height();
+            myStEventAux.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
+            myStEventAux.Type = stEvent_NewMonitor;
             myWinOnMonitorId = aNewMonId;
             signals.onAnotherMonitor->emit(myStEventAux.Size);
         }

sview-16_06.tar.gz/StCore/StWindowImplMac.mm -> sview-17_04.tar.gz/StCore/StWindowImplMac.mm Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2011-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2011-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -448,10 +448,8 @@
     if(!attribs.IsFullScreen && myMonitors.size() > 1) {
         int aNewMonId = myMonitors[myRectNorm.center()].getId();
         if(myWinOnMonitorId != aNewMonId) {
-            myStEventAux.Type  = stEvent_NewMonitor;
-            myStEventAux.Size.Time  = getEventTime();
-            myStEventAux.Size.SizeX = myRectNorm.width();
-            myStEventAux.Size.SizeY = myRectNorm.height();
+            myStEventAux.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
+            myStEventAux.Type = stEvent_NewMonitor;
             myWinOnMonitorId = aNewMonId;
             signals.onAnotherMonitor->emit(myStEventAux.Size);
         }
@@ -475,10 +473,7 @@
             myRectNormPrev = myRectFull;
             myIsUpdated    = true;
 
-            myStEvent.Type       = stEvent_Size;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = myRectFull.width();
-            myStEvent.Size.SizeY = myRectFull.height();
+            myStEvent.Size.init(getEventTime(), myRectFull.width(), myRectFull.height(), myForcedAspect);
             signals.onResize->emit(myStEvent.Size);
         }
     } else {
@@ -488,10 +483,7 @@
             myRectNormPrev = aWinRectNew;
             myIsUpdated    = true;
 
-            myStEvent.Type       = stEvent_Size;
-            myStEvent.Size.Time  = getEventTime();
-            myStEvent.Size.SizeX = myRectNorm.width();
-            myStEvent.Size.SizeY = myRectNorm.height();
+            myStEvent.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
             signals.onResize->emit(myStEvent.Size);
         }
     }

sview-16_06.tar.gz/StCore/StWindowImplWin.cpp -> sview-17_04.tar.gz/StCore/StWindowImplWin.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -28,6 +28,20 @@
                                          UINT   theMsg,
                                          WPARAM theParamW,
                                          LPARAM theParamL) {
+    if(theMsg == WM_NCCREATE) {
+        HMODULE aUser32Module = GetModuleHandleW(L"User32"); // User32 should be already loaded
+        if(aUser32Module != NULL) {
+            // available since Win10 (update from '2016)
+            typedef BOOL (WINAPI *EnableNonClientDpiScaling_t)(HWND hwnd);
+            EnableNonClientDpiScaling_t aEnableNonClientDpiScaling = (EnableNonClientDpiScaling_t )GetProcAddress(aUser32Module, "EnableNonClientDpiScaling");
+            if(aEnableNonClientDpiScaling != NULL) {
+                // ask Windows 10 to resize title bar... awkward thing
+                BOOL aRes = aEnableNonClientDpiScaling(theWnd);
+                (void )aRes;
+            }
+        }
+    }
+
     if(theMsg == WM_CREATE) {
         // save pointer to our class instance (sent on window create) to window storage
         CREATESTRUCTW* aCreateInfo = (CREATESTRUCTW* )theParamL;
@@ -48,6 +62,17 @@
 }
 
 bool StWindowImpl::create() {
+    if(myRegisterTouchWindow == NULL) {
+        HMODULE aUser32Module = GetModuleHandleW(L"User32");
+        if(aUser32Module != NULL) {
+            // User32 should be already loaded
+            myRegisterTouchWindow   = (RegisterTouchWindow_t   )GetProcAddress(aUser32Module, "RegisterTouchWindow");
+            myUnregisterTouchWindow = (UnregisterTouchWindow_t )GetProcAddress(aUser32Module, "UnregisterTouchWindow");
+            myGetTouchInputInfo     = (GetTouchInputInfo_t     )GetProcAddress(aUser32Module, "GetTouchInputInfo");
+            myCloseTouchInputHandle = (CloseTouchInputHandle_t )GetProcAddress(aUser32Module, "CloseTouchInputHandle");
+        }
+    }
+
     myKeysState.reset();
     myInitState = STWIN_INITNOTSTART;
 
@@ -64,6 +89,7 @@
     int isGlCtx = myMaster.glCreateContext(attribs.Slave != StWinSlave_slaveOff ? &mySlave : NULL,
                                            myRectNorm,
                                            attribs.GlDepthSize,
+                                           attribs.GlStencilSize,
                                            attribs.IsGlStereo,
                                            attribs.IsGlDebug);
     myEventInitGl.set();
@@ -411,24 +437,11 @@
         myRectNorm.right()  = aRect.right;
         myRectNorm.bottom() = aRect.bottom;
 
-        myStEventAux.Type       = stEvent_Size;
-        myStEventAux.Size.Time  = getEventTime();
-        myStEventAux.Size.SizeX = myRectNorm.width();
-        myStEventAux.Size.SizeY = myRectNorm.height();
+        myStEventAux.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
         signals.onResize->emit(myStEventAux.Size);
     }
 }
 
-/**
- * @return normalized delta (-1 or 0 or +1)
- */
-inline int getDirNorm(const int theFrom,
-                      const int theTo) {
-    return theFrom > theTo
-         ? -1
-         : (theFrom < theTo ? 1 : 0);
-}
-
 LRESULT StWindowImpl::stWndProc(HWND theWin, UINT uMsg, WPARAM wParam, LPARAM lParam) {
     switch(uMsg) {                 // Check For Windows Messages
         case WM_ACTIVATE: {        // Watch For Window Activate Message
@@ -513,6 +526,123 @@
             }
             break;
         }
+        case WM_WINDOWPOSCHANGED: {
+            if(attribs.IsFullScreen || myParentWin != NULL) {
+                //return 0;
+                break;
+            } else if(theWin != myMaster.hWindow) {
+                break;
+            }
+
+            RECT aRect;
+            GetClientRect(theWin, &aRect);
+            ClientToScreen(theWin,  (POINT* )&aRect);
+            ClientToScreen(theWin, ((POINT* )&aRect) + 1);
+
+            // update decoration margins - AdjustWindowRectEx() does not work with per-monitor DPI and EnableNonClientDpiScaling()
+            WINDOWPOS* aPos = (WINDOWPOS* )lParam;
+            myDecMargins.left   = aRect.left - aPos->x;
+            myDecMargins.right  = (aPos->x + aPos->cx) - aRect.right;
+            myDecMargins.top    = aRect.top  - aPos->y;
+            myDecMargins.bottom = (aPos->y + aPos->cy) - aRect.bottom;
+
+            // WM_WINDOWPOSCHANGED is no good for checking client size changes
+            // just ask DefWindowProcW() to generate WM_MOVE and WM_SIZE events
+            break;
+
+            /*StRectI_t aNewRect;
+            aNewRect.left()   = aRect.left;
+            aNewRect.top()    = aRect.top;
+            aNewRect.right()  = aRect.right;
+            aNewRect.bottom() = aRect.bottom;
+
+            const bool isMoved = aNewRect.left()   != myRectNorm.left()
+                              || aNewRect.top()    != myRectNorm.top();
+            const bool isSized = aNewRect.width()  != myRectNorm.width()
+                              || aNewRect.height() != myRectNorm.height();
+            if(!isMoved && !isSized) {
+                // nothing has changed
+                return 0;
+            }
+
+            myRectNorm = aNewRect;
+            myIsUpdated = true;
+            if(isSized) {
+                myStEvent.Size.init(getEventTime(myEvent.time), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
+                myEventsBuffer.append(myStEvent);
+            }
+            return 0; // we don't want to receive also WM_MOVE and WM_SIZE events generated by DefWindowProcW()
+            */
+        }
+        // WM_WINDOWPOSCHANGING can be used only within WM_WINDOWPOSCHANGED
+        /*case WM_WINDOWPOSCHANGING: {
+            if(attribs.IsFullScreen || myParentWin != NULL) {
+                return 0;
+            } else if(theWin != myMaster.hWindow) {
+                break;
+            }
+
+            WINDOWPOS* aDragRect = (WINDOWPOS* )lParam;
+            StRectI_t aNewRect;
+            aNewRect.left()   = aDragRect->x                 + myDecMargins.left;
+            aNewRect.right()  = aDragRect->x + aDragRect->cx - myDecMargins.right;
+            aNewRect.top()    = aDragRect->y                 + myDecMargins.top;
+            aNewRect.bottom() = aDragRect->y + aDragRect->cy - myDecMargins.bottom;
+            const StRectI_t aPrevRect = myRectNorm;
+            if(attribs.ToAlignEven) {
+                // adjust window position to ensure alignment
+                const int aDL = getDirNorm(aPrevRect.left(),   aNewRect.left());
+                const int aDR = getDirNorm(aPrevRect.right(),  aNewRect.right());
+                const int aDT = getDirNorm(aPrevRect.top(),    aNewRect.top());
+                const int aDB = getDirNorm(aPrevRect.bottom(), aNewRect.bottom());
+                if(isOddNumber(aNewRect.left())) {
+                    aNewRect.left() += aDL;
+                    aDragRect->x    += aDL;
+                    aDragRect->cx   -= aDL;
+                }
+                if(isEvenNumber(aNewRect.right())) {
+                    aNewRect.right()  += aDR;
+                    aDragRect->cx     += aDR;
+                }
+                if(isOddNumber(aNewRect.top())) {
+                    aNewRect.top()    += aDT;
+                    aDragRect->y      += aDT;
+                    aDragRect->cy     -= aDT;
+                }
+                if(isEvenNumber(aNewRect.bottom())) {
+                    aNewRect.bottom() += aDB;
+                    aDragRect->cy     += aDB;
+                }
+            }
+
+            // determine monitor scale factor change
+            const bool isMoved   = myRectNorm.left()   != aNewRect.left()
+                                || myRectNorm.top()    != aNewRect.top();
+            const bool isResized = myRectNorm.width()  != aNewRect.width()
+                                || myRectNorm.height() != aNewRect.height();
+            myRectNorm = aNewRect;
+            if(isMoved || isResized) {
+                myIsUpdated = true;
+            }
+            if(isResized) {
+                myStEvent.Size.init(getEventTime(myEvent.time), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
+                myEventsBuffer.append(myStEvent);
+            }
+            return 0;
+        }*/
+        case 0x02E0: { // WM_DPICHANGED
+            if(attribs.IsFullScreen || myParentWin != NULL) {
+                break;
+            } else if(theWin != myMaster.hWindow) {
+                break;
+            }
+
+            RECT* aNewRect = (RECT* )lParam;
+            SetWindowPos(theWin, NULL,
+                         aNewRect->left, aNewRect ->top, aNewRect->right - aNewRect->left, aNewRect->bottom - aNewRect->top,
+                         SWP_NOZORDER | SWP_NOACTIVATE);
+            break;
+        }
         case WM_MOVE: {
             if(attribs.IsFullScreen || myParentWin != NULL) {
                 break;
@@ -550,10 +680,7 @@
                 myRectNorm.bottom() = myRectNorm.top()  + aNewHeight;
 
                 myIsUpdated = true;
-                myStEvent.Type       = stEvent_Size;
-                myStEvent.Size.Time  = getEventTime(myEvent.time);
-                myStEvent.Size.SizeX = myRectNorm.width();
-                myStEvent.Size.SizeY = myRectNorm.height();
+                myStEvent.Size.init(getEventTime(myEvent.time), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
                 myEventsBuffer.append(myStEvent);
                 break;
             }
@@ -563,85 +690,86 @@
         case WM_SIZING: {
             if(attribs.IsFullScreen || myParentWin != NULL) {
                 break;
-            } else if(theWin == myMaster.hWindow) {
-                RECT* aDragRect = (RECT* )(LPARAM )lParam;
-
-                StRectI_t aNewRect;
-                aNewRect.left()   = aDragRect->left   + myDecMargins.left;
-                aNewRect.right()  = aDragRect->right  - myDecMargins.right;
-                aNewRect.top()    = aDragRect->top    + myDecMargins.top;
-                aNewRect.bottom() = aDragRect->bottom - myDecMargins.bottom;
-                const StRectI_t aPrevRect = myRectNorm;
-                if(attribs.ToAlignEven) {
-                    // adjust window position to ensure alignment
-                    const int aDL = getDirNorm(aPrevRect.left(),   aNewRect.left());
-                    const int aDR = getDirNorm(aPrevRect.right(),  aNewRect.right());
-                    const int aDT = getDirNorm(aPrevRect.top(),    aNewRect.top());
-                    const int aDB = getDirNorm(aPrevRect.bottom(), aNewRect.bottom());
-                    if(isOddNumber(aNewRect.left())) {
-                        aNewRect.left()   += aDL;
-                        aDragRect->left   += aDL;
-                    }
-                    if(isEvenNumber(aNewRect.right())) {
-                        aNewRect.right()  += aDR;
-                        aDragRect->right  += aDR;
-                    }
-                    if(isOddNumber(aNewRect.top())) {
-                        aNewRect.top()    += aDT;
-                        aDragRect->top    += aDT;
+            } else if(theWin != myMaster.hWindow) {
+                break;
+            }
+
+            RECT* aDragRect = (RECT* )lParam;
+            StRectI_t aNewRect;
+            aNewRect.left()   = aDragRect->left   + myDecMargins.left;
+            aNewRect.right()  = aDragRect->right  - myDecMargins.right;
+            aNewRect.top()    = aDragRect->top    + myDecMargins.top;
+            aNewRect.bottom() = aDragRect->bottom - myDecMargins.bottom;
+            const StRectI_t aPrevRect = myRectNorm;
+            if(attribs.ToAlignEven) {
+                // revert extra shift applied on the previous step
+                aNewRect.left()   -= myAlignDL;
+                aDragRect->left   -= myAlignDL;
+                aNewRect.right()  -= myAlignDR;
+                aDragRect->right  -= myAlignDR;
+                aNewRect.top()    -= myAlignDT;
+                aDragRect->top    -= myAlignDT;
+                aNewRect.bottom() -= myAlignDB;
+                aDragRect->bottom -= myAlignDB;
+                myAlignDL = 0;
+                myAlignDR = 0;
+                myAlignDT = 0;
+                myAlignDB = 0;
+
+                // adjust window position to ensure alignment
+                if(!isOddNumber(aNewRect.bottom())) {
+                    if(isOddNumber(aPrevRect.bottom())) {
+                        myAlignDB = 1;
                     }
-                    if(isEvenNumber(aNewRect.bottom())) {
-                        aNewRect.bottom() += aDB;
-                        aDragRect->bottom += aDB;
+                    aNewRect.bottom() += 1;
+                    aDragRect->bottom += 1;
+                }
+                if(uMsg == WM_MOVING) {
+                    int aNewTop = aNewRect.bottom() - aPrevRect.height();
+                    myAlignDT = aNewTop - aNewRect.top();
+                    aNewRect.top() += myAlignDT;
+                    aDragRect->top += myAlignDT;
+                } else if(!isEvenNumber(aNewRect.top())) {
+                    if(isEvenNumber(aPrevRect.top())) {
+                        myAlignDT = 1;
                     }
+                    aNewRect.top() += 1;
+                    aDragRect->top += 1;
                 }
 
-                // determine monitor scale factor change
-                const StMonitor& aMonTo    = myMsgMonitors[aNewRect.center()];
-                const int        aNewMonId = aMonTo.getId();
-                if(myWinMonScaleId != aNewMonId) {
-                    const StMonitor& aMonFrom = myMsgMonitors[myWinMonScaleId];
-                    if(!stAreEqual(aMonTo.getScale(), aMonFrom.getScale(), 0.1f)) {
-                        StRectI_t aRectScaled = aNewRect;
-                        const double aCoeff = double(aMonTo.getScale()) / double(aMonFrom.getScale());
-                        const int aWidth  = int(double(aNewRect.width())  * aCoeff);
-                        const int aHeight = int(double(aNewRect.height()) * aCoeff);
-                        aRectScaled.right()  = aRectScaled.left() + aWidth;
-                        aRectScaled.bottom() = aRectScaled.top()  + aHeight;
-                        const StMonitor& aMonMon = myMsgMonitors[aRectScaled.center()];
-                        if(aMonMon.getId() == aNewMonId) {
-                            // process only if resized window is still on the same monitor (protect against cascade scaling)
-                            aNewRect = aRectScaled;
-                            aDragRect->top    = aNewRect.top();
-                            aDragRect->bottom = aNewRect.bottom();
-                            aDragRect->left   = aNewRect.left();
-                            aDragRect->right  = aNewRect.right();
-                            // take into account decorations
-                            const DWORD aWinStyle   = (!attribs.IsNoDecor ? WS_OVERLAPPEDWINDOW : WS_POPUP) | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
-                            const DWORD aWinStyleEx = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE | WS_EX_ACCEPTFILES;
-                            AdjustWindowRectEx(aDragRect, aWinStyle, FALSE, aWinStyleEx);
-                            myWinMonScaleId = aNewMonId;
-                        }
-                    } else {
-                        myWinMonScaleId = aNewMonId;
+                if(!isEvenNumber(aNewRect.left())) {
+                    if(isEvenNumber(aPrevRect.left())) {
+                        myAlignDL = 1;
                     }
+                    aNewRect.left() += 1;
+                    aDragRect->left += 1;
                 }
-                const bool isMoved   = myRectNorm.left()   != aNewRect.left()
-                                    || myRectNorm.top()    != aNewRect.top();
-                const bool isResized = myRectNorm.width()  != aNewRect.width()
-                                    || myRectNorm.height() != aNewRect.height();
-                myRectNorm = aNewRect;
-                if(isMoved || isResized) {
-                    myIsUpdated = true;
-                }
-                if(isResized) {
-                    myStEvent.Type       = stEvent_Size;
-                    myStEvent.Size.Time  = getEventTime(myEvent.time);
-                    myStEvent.Size.SizeX = myRectNorm.width();
-                    myStEvent.Size.SizeY = myRectNorm.height();
-                    myEventsBuffer.append(myStEvent);
+                if(uMsg == WM_MOVING) {
+                    int aNewRight = aNewRect.left() + aPrevRect.width();
+                    myAlignDR = aNewRight - aNewRect.right();
+                    aNewRect.right() += myAlignDR;
+                    aDragRect->right += myAlignDR;
+                } else if(!isOddNumber(aNewRect.right())) {
+                    if(isOddNumber(aPrevRect.right())) {
+                        myAlignDR = 1;
+                    }
+                    aNewRect.right() += 1;
+                    aDragRect->right += 1;
                 }
-                break;
+            }
+
+            // determine monitor scale factor change
+            const bool isMoved   = myRectNorm.left()   != aNewRect.left()
+                                || myRectNorm.top()    != aNewRect.top();
+            const bool isResized = myRectNorm.width()  != aNewRect.width()
+                                || myRectNorm.height() != aNewRect.height();
+            myRectNorm = aNewRect;
+            if(isMoved || isResized) {
+                myIsUpdated = true;
+            }
+            if(isResized) {
+                myStEvent.Size.init(getEventTime(myEvent.time), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
+                myEventsBuffer.append(myStEvent);
             }
             break;
         }
@@ -934,10 +1062,7 @@
 
     const StRectI_t& aRect = attribs.IsFullScreen ? myRectFull : myRectNorm;
     StEvent anEvent;
-    anEvent.Type       = stEvent_Size;
-    anEvent.Size.Time  = getEventTime();
-    anEvent.Size.SizeX = aRect.width();
-    anEvent.Size.SizeY = aRect.height();
+    anEvent.Size.init(getEventTime(), aRect.width(), aRect.height(), myForcedAspect);
     if(StThread::getCurrentThreadId() == myMaster.ThreadGL) {
         updateWindowPos();
         signals.onResize->emit(anEvent.Size);
@@ -1027,10 +1152,8 @@
         const StMonitor& aMonTo    = myMonitors[myRectNorm.center()];
         const int        aNewMonId = aMonTo.getId();
         if(myWinOnMonitorId != aNewMonId) {
+            myStEventAux.Size.init(getEventTime(), myRectNorm.width(), myRectNorm.height(), myForcedAspect);
             myStEventAux.Type = stEvent_NewMonitor;
-            myStEventAux.Size.Time  = getEventTime();
-            myStEventAux.Size.SizeX = myRectNorm.width();
-            myStEventAux.Size.SizeY = myRectNorm.height();
             myWinOnMonitorId = aNewMonId;
             signals.onAnotherMonitor->emit(myStEventAux.Size);
         }

sview-16_06.tar.gz/StDiagnostics/StDiagnostics.cpp -> sview-17_04.tar.gz/StDiagnostics/StDiagnostics.cpp Changed

sview-16_06.tar.gz/StDiagnostics/StDiagnostics.rc -> sview-17_04.tar.gz/StDiagnostics/StDiagnostics.rc Changed

sview-16_06.tar.gz/StDiagnostics/StDiagnosticsGUI.cpp -> sview-17_04.tar.gz/StDiagnostics/StDiagnosticsGUI.cpp Changed

sview-16_06.tar.gz/StDiagnostics/StDiagnosticsGUI.h -> sview-17_04.tar.gz/StDiagnostics/StDiagnosticsGUI.h Changed

sview-16_06.tar.gz/StGLWidgets/StGLCheckboxTextured.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLCheckboxTextured.cpp Changed

sview-16_06.tar.gz/StGLWidgets/StGLCombobox.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLCombobox.cpp Changed

@@ -13,6 +13,25 @@
 #include <StGLWidgets/StGLMessageBox.h>
 #include <StGLWidgets/StGLRootWidget.h>
 
+/**
+ * Auxiliary widget covering entire screen.
+ */
+class StGLContextBackground : public StGLMessageBox {
+
+        public:
+
+    StGLContextBackground(StGLRootWidget* theParent)
+    : StGLMessageBox(theParent) {
+        myIsContextual = true;
+        const int aWidth  = myRoot->getRootFullSizeX();
+        const int aHeight = myRoot->getRootFullSizeY();
+        changeRectPx().right()  = aWidth;
+        changeRectPx().bottom() = aHeight;
+        create(StString(), StString(), aWidth, aHeight);
+    }
+
+};
+
 StGLCombobox::StGLCombobox(StGLWidget* theParent,
                            const int   theLeft,
                            const int   theTop,
@@ -39,9 +58,7 @@
     StGLRootWidget* aRoot       = theParent->getRoot();
     StGLWidget*     aMenuParent = aRoot;
     if(aRoot->isMobile()) {
-        myBack = new StGLMessageBox(aRoot, "", "",
-                                    aRoot->getRectPx().width(), aRoot->getRectPx().height());
-        myBack->setContextual(true);
+        myBack = new StGLContextBackground(aRoot);
         aMenuParent = myBack;
     }
 
@@ -71,12 +88,12 @@
         const int aRootY = aRoot->getRectPx().height();
         if(aRect.width()  >= aRootX) {
             myMenu->changeRectPx().moveLeftTo(0);
-        } else if(aRect.right() > aRootX) {
+        } else if(aRect.right() > aRoot->getRectPx().right()) {
             myMenu->changeRectPx().moveRightTo(aRootX);
         }
         if(aRect.height() >= aRootY) {
             myMenu->changeRectPx().moveTopTo(0);
-        } else if(aRect.bottom() > aRootY) {
+        } else if(aRect.bottom() > aRoot->getRectPx().bottom()) {
             myMenu->changeRectPx().moveBottomTo(aRootY);
         }
 
@@ -90,8 +107,8 @@
             StRectI_t& aSubRectNew = anItem->getSubMenu()->changeRectPx();
             if(aSubRect.width() >= aRootX) {
                 aSubRectNew.moveLeftTo(0);
-            } else if(aSubRect.right() > aRootX) {
-                aSubRectNew.moveRightTo(myMenu->getRectPxAbsolute().left() + aRoot->scale(10));
+            } else if(aSubRect.right() > aRoot->getRectPx().right()) {
+                aSubRectNew.moveRightTo(myMenu->getRectPx().left() + aRoot->scale(10));
             }
         }
         aRoot->setFocus(myMenu); // take input focus

sview-16_06.tar.gz/StGLWidgets/StGLDescription.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLDescription.cpp Changed

@@ -10,7 +10,7 @@
 #include <StGLWidgets/StGLDescription.h>
 #include <StGLWidgets/StGLRootWidget.h>
 
-StGLDescription::StGLDescription(StGLWidget* theParent)
+StGLDescription::StGLDescription(StGLRootWidget* theParent)
 : StGLTextArea(theParent, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
                theParent->getRoot()->scale(256),
                theParent->getRoot()->scale(96)) {
@@ -19,8 +19,8 @@
     setBorder(true);
 }
 
-StGLDescription::StGLDescription(StGLWidget* theParent,
-                                 const int   theWidth)
+StGLDescription::StGLDescription(StGLRootWidget* theParent,
+                                 const int theWidth)
 : StGLTextArea(theParent, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
                theWidth,
                theParent->getRoot()->scale(96)) {
@@ -34,28 +34,29 @@
 }
 
 void StGLDescription::setPoint(const StPointD_t& thePointZo) {
-    const StRectI_t& aRootRectPx = StGLWidget::getParent()->getRectPx();
-    const int aRootSizeX = aRootRectPx.width();
-    const int aRootSizeY = aRootRectPx.height();
+    const StRectI_t& aRootRectPx = myRoot->getRectPx();
     const int aSizeX = StGLWidget::getRectPx().width();
     const int aSizeY = StGLWidget::getRectPx().height();
 
+    const int aPntInRootX = int(thePointZo.x() * (double )myRoot->getRectPx().width());
+    const int aPntInRootY = int(thePointZo.y() * (double )myRoot->getRectPx().height());
+
     StRectI_t aRect;
-    aRect.left()   = int(thePointZo.x() * (double )aRootSizeX) + 16;
+    aRect.left()   = aPntInRootX + 16;
     aRect.right()  = aRect.left() + aSizeX;
-    aRect.top()    = int(thePointZo.y() * (double )aRootSizeY) + 16;
+    aRect.top()    = aPntInRootY + 16;
     aRect.bottom() = aRect.top()  + aSizeY;
 
     StGLVCorner aCornerY = ST_VCORNER_TOP;
     StGLHCorner aCornerX = ST_HCORNER_LEFT;
     if(aRect.right() > aRootRectPx.width()) {
-        aRect.left()  -= aRootSizeX + 32;
-        aRect.right() -= aRootSizeX + 32;
+        aRect.left()  -= aRootRectPx.width() + 32;
+        aRect.right() -= aRootRectPx.width() + 32;
         aCornerX = ST_HCORNER_RIGHT;
     }
     if(aRect.bottom() > aRootRectPx.height()) {
-        aRect.top()    -= aRootSizeY + 32;
-        aRect.bottom() -= aRootSizeY + 32;
+        aRect.top()    -= aRootRectPx.height() + 32;
+        aRect.bottom() -= aRootRectPx.height() + 32;
         myFormatter.setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER,
                                    StGLTextFormatter::ST_ALIGN_Y_BOTTOM);
         aCornerY = ST_VCORNER_BOTTOM;

sview-16_06.tar.gz/StGLWidgets/StGLImageProgram.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLImageProgram.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -104,12 +104,12 @@
     // color conversion shaders
     registerFragmentShaderPart(FragSection_ToRgb, FragToRgb_FromXyz,
        // XYZ to sRGB matrix
-       "mat4 THE_XYZ2RGB_MAT = mat4(3.2404542, -0.9692660,  0.0556434, 0.0,"
-       "                           -1.5371385,  1.8760108, -0.2040259, 0.0,"
-       "                           -0.4985314,  0.0415560,  1.0572252, 0.0,"
-       "                                  0.0,        0.0,        0.0, 1.0);"
-       "vec4 THE_GAMMA_XYZ =       vec4(2.6, 2.6, 2.6, 1.0);"
-       "vec4 THE_GAMMA_RGB = 1.0 / vec4(2.2, 2.2, 2.2, 1.0);"
+       "const mat4 THE_XYZ2RGB_MAT = mat4(3.2404542, -0.9692660,  0.0556434, 0.0,"
+       "                                 -1.5371385,  1.8760108, -0.2040259, 0.0,"
+       "                                 -0.4985314,  0.0415560,  1.0572252, 0.0,"
+       "                                        0.0,        0.0,        0.0, 1.0);"
+       "const vec4 THE_GAMMA_XYZ =       vec4(2.6, 2.6, 2.6, 1.0);"
+       "const vec4 THE_GAMMA_RGB = 1.0 / vec4(2.2, 2.2, 2.2, 1.0);"
        "void convertToRGB(inout vec4 theColor, in vec3 texCoord) {\n"
        "    vec4 aColor = pow(theColor, THE_GAMMA_XYZ);"
        "    aColor = THE_XYZ2RGB_MAT * aColor;\n"
@@ -203,21 +203,26 @@
         + "const float TheRangeBits = 1.0;\n"
         + F_SHADER_YUVNV2RGB_MPEG);
 
-    params.gamma = new StFloat32Param(   1.0f,         // initial value
-                                        0.05f, 99.0f, // min, max values
-                                         1.0f,         // default value
-                                        0.05f,         // incremental step
-                                      0.0001f);        // equality tolerance
-    params.brightness = new StFloat32Param(   1.0f,         // initial value
-                                              0.0f, 99.0f, // min, max values
-                                              1.0f,         // default value
-                                             0.05f,         // incremental step
-                                           0.0001f);        // equality tolerance
-    params.saturation = new StFloat32Param(   1.0f,         // initial value
-                                            -10.0f, 99.0f, // min, max values
-                                              1.0f,         // default value
-                                             0.05f,         // incremental step
-                                           0.0001f);        // equality tolerance
+    params.gamma = new StFloat32Param(1.0f);
+    params.gamma->setMinMaxValues(0.05f, 99.0f);
+    params.gamma->setEffectiveMinMaxValues(0.05f, 2.0f);
+    params.gamma->setDefValue(1.0f);
+    params.gamma->setStep(0.05f);
+    params.gamma->setTolerance(0.0001f);
+
+    params.brightness = new StFloat32Param(1.0f);
+    params.brightness->setMinMaxValues(0.0f, 99.0f);
+    params.brightness->setDefValue(1.0f);
+    params.brightness->setEffectiveMinMaxValues(0.0f, 5.0f);
+    params.brightness->setStep(0.05f);
+    params.brightness->setTolerance(0.0001f);
+
+    params.saturation = new StFloat32Param(1.0f);
+    params.saturation->setMinMaxValues(-10.0f, 99.0f);
+    params.saturation->setEffectiveMinMaxValues(0.0f, 2.0f);
+    params.saturation->setDefValue(1.0f);
+    params.saturation->setStep(0.05f);
+    params.saturation->setTolerance(0.0001f);
 
     // main shader parts
     const char V_SHADER_FLAT[] =
@@ -243,6 +248,7 @@
        "uniform mat4 uModelMat;\n"
        "uniform vec4 uTexData;\n"
        "uniform vec4 uTexUVData;\n"
+       "uniform float uTexCubeFlipZ;\n"
 
        "attribute vec4 vVertex;\n"
        "attribute vec2 vTexCoord;\n"
@@ -252,8 +258,10 @@
 
        "void main(void) {\n"
        "    gl_Position = vec4(vVertex.x, vVertex.y, 0.0, 1.0);\n"
-       "    fTexCoord   = (uProjMat * gl_Position).xyz;"
-       "    fTexUVCoord = (uProjMat * gl_Position).xyz;"
+       "    vec3 aTCoord = (uProjMat * gl_Position).xyz;"
+       "    aTCoord.z  *= uTexCubeFlipZ;"
+       "    fTexCoord   = aTCoord;"
+       "    fTexUVCoord = aTCoord;"
        "}\n";
 
     const char F_SHADER_FLAT[] =
@@ -304,6 +312,11 @@
     theCtx.core20fwd->glUniform4fv(uniTexUVDataLoc, 1, theTexDataVec4);
 }
 
+void StGLImageProgram::setCubeTextureFlipZ(StGLContext& theCtx,
+                                           bool theToFlip) {
+    theCtx.core20fwd->glUniform1f(uniTexCubeFlipZLoc, theToFlip ? 1.0f : -1.0f);
+}
+
 void StGLImageProgram::setupCorrection(StGLContext& theCtx) {
     if(getFragmentShaderPart(FragSection_Correct) == FragCorrect_Off) {
         return;
@@ -383,6 +396,7 @@
         uniTexUVDataLoc       = myActiveProgram->getUniformLocation(theCtx, "uTexUVData");
         uniTexSizePxLoc       = myActiveProgram->getUniformLocation(theCtx, "uTexSizePx");
         uniTexelSizePxLoc     = myActiveProgram->getUniformLocation(theCtx, "uTexelSize");
+        uniTexCubeFlipZLoc    = myActiveProgram->getUniformLocation(theCtx, "uTexCubeFlipZ");
         uniColorProcessingLoc = myActiveProgram->getUniformLocation(theCtx, "uColorProcessing");
         uniGammaLoc           = myActiveProgram->getUniformLocation(theCtx, "uGamma");
         myActiveProgram->atrVVertexLoc  = myActiveProgram->getAttribLocation(theCtx, "vVertex");

sview-16_06.tar.gz/StGLWidgets/StGLImageRegion.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLImageRegion.cpp Changed

@@ -75,7 +75,7 @@
             || aParams->ViewingMode == theValue) {
                 return false;
             }
-            aParams->ViewingMode = (StStereoParams::ViewMode )theValue;
+            aParams->ViewingMode = (StViewSurface )theValue;
             signals.onChanged(theValue);
             return true;
         }
@@ -111,22 +111,22 @@
             const float THE_SEP_STEP_PX = 2.0f;
             switch(myParamId) {
                 case StereoParamId_SepDX: {
-                    setMinValue(-100.0f);
-                    setMaxValue( 100.0f);
+                    setMinMaxValues(-500.0f, 500.0f);
+                    setEffectiveMinMaxValues(-100.0f, 100.0f);
                     setStep(THE_SEP_STEP_PX);
                     setTolerance(0.5f);
                     break;
                 }
                 case StereoParamId_SepDY: {
-                    setMinValue(-100.0f);
-                    setMaxValue( 100.0f);
+                    setMinMaxValues(-500.0f, 500.0f);
+                    setEffectiveMinMaxValues(-100.0f, 100.0f);
                     setStep(THE_SEP_STEP_PX);
                     setTolerance(0.5f);
                     break;
                 }
                 case StereoParamId_SepRot: {
-                    setMinValue(-180.0f);
-                    setMaxValue( 180.0f);
+                    setMinMaxValues(-180.0f, 180.0f);
+                    setEffectiveMinMaxValues(-5.0f, 5.0f);
                     setStep(0.1f);
                     setTolerance(0.001f);
                     break;
@@ -201,8 +201,8 @@
     };
 
     // we use negative scale factor to show sphere inside out!
-    static const GLfloat SPHERE_RADIUS     = -10.0f;
-    static const GLfloat PANORAMA_DEF_ZOOM = 0.45f;
+    static const float THE_SPHERE_RADIUS     = -10.0f;
+    static const float THE_PANORAMA_DEF_ZOOM = 0.45f;
 
 }
 
@@ -412,8 +412,9 @@
     myTextureQueue->stglUpdateStTextures(getContext());
 }
 
-void StGLImageRegion::stglUpdate(const StPointD_t& pointZo) {
-    StGLWidget::stglUpdate(pointZo);
+void StGLImageRegion::stglUpdate(const StPointD_t& thePointZo,
+                                 bool theIsPreciseInput) {
+    StGLWidget::stglUpdate(thePointZo, theIsPreciseInput);
     if(myIsInitialized) {
         myHasVideoStream = myTextureQueue->stglUpdateStTextures(getContext()) || myTextureQueue->hasConnectedStream();
         StHandle<StStereoParams> aFileParams = myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).getSource();
@@ -434,6 +435,7 @@
     if(!myProgram.init(aCtx, StImage::ImgColor_RGB, StImage::ImgScale_Full, StGLImageProgram::FragGetColor_Normal)) {
         return false;
     } else if(!myQuad.initScreen(aCtx)) {
+        aCtx.pushError(StString("Fail to init StGLQuad"));
         ST_ERROR_LOG("Fail to init StGLQuad");
         return false;
     } else if(!myUVSphere.initVBOs(aCtx)) {
@@ -448,28 +450,71 @@
 }
 
 StGLVec2 StGLImageRegion::getMouseMoveFlat(const StPointD_t& theCursorZoFrom,
-                                           const StPointD_t& theCursorZoTo) {
-    return StGLVec2( 2.0f * GLfloat(theCursorZoTo.x() - theCursorZoFrom.x()),
-                    -2.0f * GLfloat(theCursorZoTo.y() - theCursorZoFrom.y()));
+                                           const StPointD_t& theCursorZoTo) const {
+    // apply scale factor in case of working area margins
+    const double aVrScale = 1.0 / myRoot->getVrZoomOut();
+    const double aScaleX  = double(myRoot->getRectPx().width())  / double(myRoot->getRootFullSizeX());
+    const double aScaleY  = double(myRoot->getRectPx().height()) / double(myRoot->getRootFullSizeY());
+    return StGLVec2(float( 2.0 * double(theCursorZoTo.x() - theCursorZoFrom.x()) * aScaleX * aVrScale),
+                    float(-2.0 * double(theCursorZoTo.y() - theCursorZoFrom.y()) * aScaleY * aVrScale));
 }
 
 StGLVec2 StGLImageRegion::getMouseMoveSphere(const StPointD_t& theCursorZoFrom,
-                                             const StPointD_t& theCursorZoTo) {
+                                             const StPointD_t& theCursorZoTo) const {
     StGLVec2 aVec = getMouseMoveFlat(theCursorZoFrom, theCursorZoTo);
-    GLfloat aSphereScale = SPHERE_RADIUS * PANORAMA_DEF_ZOOM * getSource()->ScaleFactor;
+    float aSphereScale = THE_SPHERE_RADIUS * THE_PANORAMA_DEF_ZOOM * params.stereoFile->ScaleFactor;
     StRectD_t aZParams;
     getCamera()->getZParams(getCamera()->getZNear(), aZParams);
-    aVec.x() *= -90.0f * GLfloat(aZParams.right() - aZParams.left()) / aSphereScale;
-    aVec.y() *=  90.0f * GLfloat(aZParams.bottom() - aZParams.top()) / aSphereScale;
+    aVec.x() *= -90.0f * float(aZParams.right() - aZParams.left()) / aSphereScale;
+    aVec.y() *=  90.0f * float(aZParams.bottom() - aZParams.top()) / aSphereScale;
     return aVec;
 }
 
-StGLVec2 StGLImageRegion::getMouseMoveSphere() {
+StGLVec2 StGLImageRegion::getMouseMoveSphere() const {
     return isClicked(ST_MOUSE_LEFT)
-         ? getMouseMoveSphere(myClickPntZo, getRoot()->getCursorZo())
+         ? getMouseMoveSphere(myClickPntZo, myRoot->getCursorZo())
          : StGLVec2();
 }
 
+bool StGLImageRegion::getHeadOrientation(StGLQuaternion& theOrient,
+                                         unsigned int theView,
+                                         const bool theToApplyDefShift) const {
+    StHandle<StStereoParams> aParams = params.stereoFile;
+    if(aParams.isNull()
+    || aParams->ViewingMode == StViewSurface_Plain) {
+        theOrient = StGLQuaternion();
+        return false;
+    }
+
+    const float aYawShift = theToApplyDefShift ? stToRadians(90.0f) : 0.0f;
+    StGLVec2 aMouseMove = getMouseMoveSphere();
+    float aYaw   = -stToRadians(aParams->getPanYaw() + aMouseMove.x()) + aYawShift;
+    float aPitch =  stToRadians(StStereoParams::clipPitch(aParams->getPanPitch() + aMouseMove.y()));
+    float aRoll  =  stToRadians(aParams->getZRotate());
+
+    // apply separation
+    const float aSepDeltaX = GLfloat(aParams->getSeparationDx()) * 0.05f;
+    const float aSepDeltaY = GLfloat(aParams->getSeparationDy()) * 0.05f;
+    if(theView == ST_DRAW_LEFT) {
+        aYaw   +=  stToRadians(aSepDeltaX);
+        aPitch += -stToRadians(aSepDeltaY);
+        aRoll  += -stToRadians(aParams->getSepRotation());
+    } else if(theView == ST_DRAW_RIGHT) {
+        aYaw   += -stToRadians(aSepDeltaX);
+        aPitch +=  stToRadians(aSepDeltaY);
+        aRoll  +=  stToRadians(aParams->getSepRotation());
+    }
+
+    const StGLQuaternion anOriYaw   = StGLQuaternion(StGLVec3::DY(), aYaw);
+    const StGLQuaternion anOriPitch = StGLQuaternion(StGLVec3::DX(), aPitch);
+    const StGLQuaternion anOriRoll  = StGLQuaternion(StGLVec3::DZ(), aRoll);
+    StGLQuaternion anOri = StGLQuaternion::multiply(anOriPitch, anOriYaw);
+    anOri = StGLQuaternion::multiply(anOriRoll,    anOri);
+    anOri = StGLQuaternion::multiply(myDeviceQuat, anOri);
+    theOrient = anOri;
+    return true;
+}
+
 void StGLImageRegion::stglDraw(unsigned int theView) {
     StHandle<StStereoParams> aParams = getSource();
     if(!myIsInitialized || !isVisible() || aParams.isNull()
@@ -635,11 +680,13 @@
     const GLfloat  aScaleBack = aParams->ScaleFactor;
     const StGLVec2 aPanBack   = aParams->PanCenter;
 
-    StStereoParams::ViewMode aViewMode = aParams->ViewingMode;
+    const float aVrScale = float(myRoot->getVrZoomOut());
+
+    StViewSurface aViewMode = aParams->ViewingMode;
     if(aTextures.getPlane(0).getTarget() == GL_TEXTURE_CUBE_MAP) {
-        aViewMode = StStereoParams::PANORAMA_CUBEMAP;
-    } else if(aViewMode == StStereoParams::PANORAMA_CUBEMAP) {
-        aViewMode = StStereoParams::FLAT_IMAGE;
+        aViewMode = StViewSurface_Cubemap;
+    } else if(aViewMode == StViewSurface_Cubemap) {
+        aViewMode = StViewSurface_Plain;
     }
 
     myProgram.setColorScale(aColorScale); // apply de-anaglyph color filter
@@ -647,8 +694,7 @@
                                                 ? StGLImageProgram::FragGetColor_Blend
                                                 : StGLImageProgram::FragGetColor_Normal;
     switch(aViewMode) {
-        default:
-        case StStereoParams::FLAT_IMAGE: {
+        case StViewSurface_Plain: {
             if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), aColorGetter)) {
                 break;
             }
@@ -660,14 +706,6 @@
             myProgram.setTextureMainDataSize(aCtx, aClampVec);
             myProgram.setTextureUVDataSize  (aCtx, aClampUV);
 
-            // lenses center correction
-            const GLfloat aLestDisp = getRoot()->getLensDist() * GLfloat(getRoot()->getRectPx().ratio());
-            if(theView == ST_DRAW_LEFT) {
-                aModelMat.translate(StGLVec3( aLestDisp, 0.0f, 0.0f));
-            } else {
-                aModelMat.translate(StGLVec3(-aLestDisp, 0.0f, 0.0f));
-            }
-
             // handle dragging timer
             if( isClicked(ST_MOUSE_LEFT)
             && !myIsClickAborted
@@ -710,7 +748,7 @@
             }
 
             // apply scale
-            aModelMat.scale(aParams->ScaleFactor, aParams->ScaleFactor, 1.0f);
+            aModelMat.scale(aParams->ScaleFactor * aVrScale, aParams->ScaleFactor * aVrScale, 1.0f);
 
             // apply position
             aModelMat.translate(StGLVec3(aParams->PanCenter));
@@ -793,7 +831,7 @@
             aParams->PanCenter   = aPanBack;
             break;
         }
-        case StStereoParams::PANORAMA_CUBEMAP: {
+        case StViewSurface_Cubemap: {
             if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), StGLImageProgram::FragGetColor_Cubemap)) {
                 break;
             }
@@ -804,36 +842,13 @@
             myProgram.setTextureSizePx      (aCtx, aTextureSize);
             myProgram.setTextureMainDataSize(aCtx, aClampVec);
             myProgram.setTextureUVDataSize  (aCtx, aClampUV);
+            myProgram.setCubeTextureFlipZ   (aCtx, aParams->ToFlipCubeZ);
 
-            const GLfloat aScale = aParams->ScaleFactor * PANORAMA_DEF_ZOOM;
+            const float aScale = THE_PANORAMA_DEF_ZOOM * aParams->ScaleFactor * aVrScale;
             aModelMat.scale(aScale, aScale, 1.0f);
 
             // compute orientation
-            StGLVec2 aMouseMove = getMouseMoveSphere();
-            float aYaw   = -stToRadians(aParams->PanPhi   + aMouseMove.x()) + stToRadians(90.0f);
-            float aPitch =  stToRadians(StStereoParams::clipPitch(aParams->PanTheta + aMouseMove.y()));
-            float aRoll  =  stToRadians(aParams->getZRotate());
-
-            // apply separation
-            const float aSepDeltaX = GLfloat(aParams->getSeparationDx()) * 0.05f;
-            const float aSepDeltaY = GLfloat(aParams->getSeparationDy()) * 0.05f;
-            if(theView == ST_DRAW_LEFT) {
-                aYaw   +=  stToRadians(aSepDeltaX);
-                aPitch += -stToRadians(aSepDeltaY);
-                aRoll  += -stToRadians(aParams->getSepRotation());
-            } else if(theView == ST_DRAW_RIGHT) {
-                aYaw   += -stToRadians(aSepDeltaX);
-                aPitch +=  stToRadians(aSepDeltaY);
-                aRoll  +=  stToRadians(aParams->getSepRotation());
-            }
-
-            const StGLQuaternion anOriYaw   = StGLQuaternion(StGLVec3::DY(), aYaw);
-            const StGLQuaternion anOriPitch = StGLQuaternion(StGLVec3::DX(), aPitch);
-            const StGLQuaternion anOriRoll  = StGLQuaternion(StGLVec3::DZ(), aRoll);
-            StGLQuaternion anOri = StGLQuaternion::multiply(anOriPitch, anOriYaw);
-            anOri = StGLQuaternion::multiply(anOriRoll,    anOri);
-            anOri = StGLQuaternion::multiply(myDeviceQuat, anOri);
-
+            const StGLQuaternion anOri = getHeadOrientation(theView, true);
             aModelMat = StGLMatrix::multiply(aModelMat, StGLMatrix(anOri));
 
             StGLMatrix aMatModelInv, aMatProjInv;
@@ -853,41 +868,17 @@
             aParams->PanCenter   = aPanBack;
             break;
         }
-        case StStereoParams::PANORAMA_SPHERE: {
+        case StViewSurface_Sphere: {
             if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), aColorGetter)) {
                 break;
             }
 
             // perform scaling
-            const GLfloat aScale = SPHERE_RADIUS * PANORAMA_DEF_ZOOM * aParams->ScaleFactor;
-            aModelMat.scale(aScale, aScale, SPHERE_RADIUS);
+            const float aScale = THE_SPHERE_RADIUS * THE_PANORAMA_DEF_ZOOM * aParams->ScaleFactor * aVrScale;
+            aModelMat.scale(aScale, aScale, THE_SPHERE_RADIUS);
 
             // compute orientation
-            StGLVec2 aMouseMove = getMouseMoveSphere();
-            float aYaw   = -stToRadians(aParams->PanPhi   + aMouseMove.x()) + stToRadians(90.0f);
-            float aPitch =  stToRadians(StStereoParams::clipPitch(aParams->PanTheta + aMouseMove.y()));
-            float aRoll  =  stToRadians(aParams->getZRotate());
-
-            // apply separation
-            const float aSepDeltaX = GLfloat(aParams->getSeparationDx()) * 0.05f;
-            const float aSepDeltaY = GLfloat(aParams->getSeparationDy()) * 0.05f;
-            if(theView == ST_DRAW_LEFT) {
-                aYaw   +=  stToRadians(aSepDeltaX);
-                aPitch += -stToRadians(aSepDeltaY);
-                aRoll  += -stToRadians(aParams->getSepRotation());
-            } else if(theView == ST_DRAW_RIGHT) {
-                aYaw   += -stToRadians(aSepDeltaX);
-                aPitch +=  stToRadians(aSepDeltaY);
-                aRoll  +=  stToRadians(aParams->getSepRotation());
-            }
-
-            const StGLQuaternion anOriYaw   = StGLQuaternion(StGLVec3::DY(), aYaw);
-            const StGLQuaternion anOriPitch = StGLQuaternion(StGLVec3::DX(), aPitch);
-            const StGLQuaternion anOriRoll  = StGLQuaternion(StGLVec3::DZ(), aRoll);
-            StGLQuaternion anOri = StGLQuaternion::multiply(anOriPitch, anOriYaw);
-            anOri = StGLQuaternion::multiply(anOriRoll,    anOri);
-            anOri = StGLQuaternion::multiply(myDeviceQuat, anOri);
-
+            const StGLQuaternion anOri = getHeadOrientation(theView, true);
             aModelMat = StGLMatrix::multiply(aModelMat, StGLMatrix(anOri));
 
             // perform drawing
@@ -917,7 +908,7 @@
 void StGLImageRegion::doRightUnclick(const StPointD_t& theCursorZo) {
     StHandle<StStereoParams> aParams = getSource();
     if(!myIsInitialized || aParams.isNull()
-     || aParams->ViewingMode != StStereoParams::FLAT_IMAGE) {
+     || aParams->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
@@ -982,19 +973,17 @@
     } else if(isClicked(ST_MOUSE_LEFT) && theEvent.Button == ST_MOUSE_LEFT) {
         // ignore out of window
         switch(aParams->ViewingMode) {
-            default:
-            case StStereoParams::FLAT_IMAGE: {
+            case StViewSurface_Plain: {
                 if(!myIsClickAborted) {
                     aParams->moveFlat(getMouseMoveFlat(myClickPntZo, aCursor), GLfloat(getRectPx().ratio()));
                 }
                 break;
             }
-            case StStereoParams::PANORAMA_CUBEMAP:
-            case StStereoParams::PANORAMA_SPHERE: {
+            case StViewSurface_Cubemap:
+            case StViewSurface_Sphere: {
                 aParams->moveSphere(getMouseMoveSphere(myClickPntZo, aCursor));
                 break;
             }
-
         }
         theIsItemUnclicked = true;
         setClicked(ST_MOUSE_LEFT, false);
@@ -1055,8 +1044,7 @@
 
     const StPointD_t aCenterCursor(0.5, 0.5);
     switch(aParams->ViewingMode) {
-        default:
-        case StStereoParams::FLAT_IMAGE: {
+        case StViewSurface_Plain: {
             if(theStep < 0.0f
             && aParams->ScaleFactor <= 0.05f) {
                 break;
@@ -1071,8 +1059,8 @@
             aParams->moveFlat(aVec, GLfloat(getRectPx().ratio()));
             break;
         }
-        case StStereoParams::PANORAMA_CUBEMAP:
-        case StStereoParams::PANORAMA_SPHERE: {
+        case StViewSurface_Cubemap:
+        case StViewSurface_Sphere: {
             if(theStep < 0.0f
             && aParams->ScaleFactor <= 0.24f) {
                 break;
@@ -1122,7 +1110,7 @@
                 // this gesture conflicts with scrolling on OS X
                 //return true;
             //}
-            if(aParams->ViewingMode == StStereoParams::FLAT_IMAGE) {
+            if(aParams->ViewingMode == StViewSurface_Plain) {
                 StPointD_t aPntFrom(theEvent.Point1X, theEvent.Point1Y);
                 StPointD_t aPntTo  (theEvent.Point2X, theEvent.Point2Y);
                 aParams->moveFlat(getMouseMoveFlat(aPntFrom, aPntTo), GLfloat(getRectPx().ratio()));
@@ -1179,7 +1167,7 @@
 
 void StGLImageRegion::doParamsRotYLeft(const double ) {
     if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StStereoParams::FLAT_IMAGE) {
+    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
@@ -1192,7 +1180,7 @@
 
 void StGLImageRegion::doParamsRotYRight(const double ) {
     if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StStereoParams::FLAT_IMAGE) {
+    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
@@ -1205,7 +1193,7 @@
 
 void StGLImageRegion::doParamsRotXUp(const double ) {
     if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StStereoParams::FLAT_IMAGE) {
+    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
@@ -1218,7 +1206,7 @@
 
 void StGLImageRegion::doParamsRotXDown(const double ) {
     if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StStereoParams::FLAT_IMAGE) {
+    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }

sview-16_06.tar.gz/StGLWidgets/StGLMenu.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLMenu.cpp Changed

@@ -137,13 +137,14 @@
         } else {
             myWidth = stMax(myWidth, anItemW);
         }
-        if(anItem->getSubMenu() != NULL) {
+        if(StGLMenu* aSubMenu = anItem->getSubMenu()) {
             if(myOrient == MENU_HORIZONTAL) {
-                anItem->getSubMenu()->changeRectPx().moveTopLeftTo(anItem->getRectPxAbsolute().left(), anItem->getRectPxAbsolute().bottom());
+                aSubMenu->changeRectPx().moveTopLeftTo(anItem->getRectPxAbsolute().left()   - myRoot->getRectPx().left(),
+                                                       anItem->getRectPxAbsolute().bottom() - myRoot->getRectPx().top());
             } else if(myOrient == MENU_VERTICAL
                    || myOrient == MENU_VERTICAL_COMPACT) {
-                anItem->getSubMenu()->changeRectPx().moveTopLeftTo(anItem->getRectPxAbsolute().right() - myRoot->scale(10),
-                                                                   anItem->getRectPxAbsolute().top());
+                aSubMenu->changeRectPx().moveTopLeftTo(anItem->getRectPxAbsolute().right() - myRoot->scale(10) - myRoot->getRectPx().left(),
+                                                       anItem->getRectPxAbsolute().top() - myRoot->getRectPx().top());
             }
         }
     }
@@ -163,8 +164,8 @@
             anItem->changeRectPx().right() = anItem->getRectPx().left() + aWidth;
             anItem->setTextWidth(aWidth);
             if(anItem->getSubMenu() != NULL) {
-                anItem->getSubMenu()->changeRectPx().moveTopLeftTo(getRectPxAbsolute().right() - myRoot->scale(10),
-                                                                   anItem->getRectPxAbsolute().top());
+                anItem->getSubMenu()->changeRectPx().moveTopLeftTo(getRectPxAbsolute().right() - myRoot->scale(10) - myRoot->getRectPx().left(),
+                                                                   anItem->getRectPxAbsolute().top() - myRoot->getRectPx().top());
             }
         }
         changeRectPx().bottom() = getRectPx().top() + anItemCount * myItemHeight;

sview-16_06.tar.gz/StGLWidgets/StGLMenuItem.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLMenuItem.cpp Changed

sview-16_06.tar.gz/StGLWidgets/StGLMsgStack.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLMsgStack.cpp Changed

sview-16_06.tar.gz/StGLWidgets/StGLOpenFile.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLOpenFile.cpp Changed

sview-16_06.tar.gz/StGLWidgets/StGLPlayList.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLPlayList.cpp Changed

@@ -114,7 +114,7 @@
         && anItem->isPointIn(myClickPntZo)) {
             // stick to the center
             const StRectI_t aRect = anItem->getRectPxAbsolute();
-            myClickPntZo.y() = double(aRect.top() + aRect.height() / 2) / double(myRoot->getRectPx().height());
+            myClickPntZo.y() = double(aRect.top() + aRect.height() / 2 - myRoot->getRectPx().top()) / double(myRoot->getRectPx().height());
             if(toAbort) {
                 anItem->setClicked(theBtnId, false);
             }
@@ -278,9 +278,10 @@
     aCtx.core20fwd->glDisable(GL_BLEND);
 }
 
-void StGLPlayList::stglUpdate(const StPointD_t& theCursorZo) {
+void StGLPlayList::stglUpdate(const StPointD_t& theCursorZo,
+                              bool theIsPreciseInput) {
     if(!isVisible()) {
-        StGLWidget::stglUpdate(theCursorZo);
+        StGLWidget::stglUpdate(theCursorZo, theIsPreciseInput);
         return;
     }
 
@@ -345,7 +346,7 @@
         }
     }
 
-    StGLWidget::stglUpdate(theCursorZo);
+    StGLWidget::stglUpdate(theCursorZo, theIsPreciseInput);
 }
 
 void StGLPlayList::stglDraw(unsigned int theView) {

sview-16_06.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -15,13 +15,27 @@
 
 StGLRangeFieldFloat32::StGLRangeFieldFloat32(StGLWidget* theParent,
                                              const StHandle<StFloat32Param>& theTrackedValue,
-                                             const int theLeft, const int theTop,
-                                             const StGLCorner theCorner)
-: StGLWidget(theParent, theLeft, theTop, theCorner),
+                                             int theLeft, int theTop,
+                                             StGLCorner theCorner,
+                                             RangeStyle theStyle,
+                                             int theMargin)
+: StGLSeekBar(theParent, theTop, theMargin, theCorner),
   myTrackValue(theTrackedValue),
   myValueText(NULL),
-  myFormat(stCString("%+01.3f")) {
-    myTrackValue->signals.onChanged   += stSlot(this, &StGLRangeFieldFloat32::onValueChange);
+  myFormat(stCString("%+01.3f")),
+  myRangeStyle(theStyle) {
+    myRectPx.left()  = theLeft;
+    myRectPx.right() = theLeft + 32;
+
+    if(theStyle == RangeStyle_Seekbar) {
+        myColors[FieldColor_Default]  = StGLVec3(1.0f, 1.0f, 1.0f);
+        myColors[FieldColor_Positive] = StGLVec3(1.0f, 1.0f, 1.0f);
+        myColors[FieldColor_Negative] = StGLVec3(1.0f, 1.0f, 1.0f);
+
+        signals.onSeekClick = stSlot(this, &StGLRangeFieldFloat32::doSeekClick);
+    }
+
+    myTrackValue->signals.onChanged += stSlot(this, &StGLRangeFieldFloat32::onValueChange);
 }
 
 StGLRangeFieldFloat32::~StGLRangeFieldFloat32() {
@@ -33,7 +47,6 @@
         return true;
     }
 
-    myValueText = new StGLTextArea(this, 0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT), -myRoot->scale(1), myRoot->scale(10));
     float aLongVal = 0.0f;
     if(myTrackValue->hasMaxValue()) {
         aLongVal = myTrackValue->getMaxValue();
@@ -42,37 +55,84 @@
     && std::abs(myTrackValue->getMinValue()) >= aLongVal) {
         aLongVal = myTrackValue->getMinValue();
     }
-    onValueChange(aLongVal);
-    myValueText->setTextColor(StGLVec3(1.0f, 1.0f, 1.0f));
-    if(!myValueText->stglInitAutoHeightWidth()) {
-        delete myValueText; myValueText = NULL;
-        return false;
-    }
 
-    myValueText->changeRectPx().right() += myRoot->scale(10);
-    myValueText->setTextWidth(myValueText->getRectPx().width());
-    myValueText->setupAlignment(StGLTextFormatter::ST_ALIGN_X_RIGHT, StGLTextFormatter::ST_ALIGN_Y_TOP);
-    onValueChange(myTrackValue->getValue());
-    const GLint aHeight = myValueText->getRectPx().height();
-
-    StGLButton* aButDec = new StGLButton(this, 0, 0, "-");
-    aButDec->setCorner(StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT));
-    aButDec->setHeight(aHeight);
-    aButDec->setWidth(myRoot->scale(15));
-    aButDec->signals.onBtnClick += stSlot(this, &StGLRangeFieldFloat32::doDecrement);
-
-    myValueText->changeRectPx().moveLeftTo(aButDec->getRectPx().right() - myRoot->scale(5));
-
-    StGLButton* aButInc = new StGLButton(this, myValueText->getRectPx().right() + myRoot->scale(5), 0, "+");
-    aButInc->setCorner(StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT));
-    aButInc->setHeight(aHeight);
-    aButInc->setWidth(myRoot->scale(15));
-    aButInc->signals.onBtnClick += stSlot(this, &StGLRangeFieldFloat32::doIncrement);
+    switch(myRangeStyle) {
+        case RangeStyle_PlusMinus: {
+            myValueText = new StGLTextArea(this, 0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT), -myRoot->scale(1), myRoot->scale(10));
+            onValueChange(aLongVal);
+            myValueText->setTextColor(StGLVec3(1.0f, 1.0f, 1.0f));
+            if(!myValueText->stglInitAutoHeightWidth()) {
+                delete myValueText; myValueText = NULL;
+                return false;
+            }
+
+            myValueText->changeRectPx().right() += myRoot->scale(10);
+            myValueText->setTextWidth(myValueText->getRectPx().width());
+            myValueText->setupAlignment(StGLTextFormatter::ST_ALIGN_X_RIGHT, StGLTextFormatter::ST_ALIGN_Y_TOP);
+            onValueChange(myTrackValue->getValue());
+            const GLint aHeight = myValueText->getRectPx().height();
+
+            StGLButton* aButDec = new StGLButton(this, 0, 0, "-");
+            aButDec->setCorner(StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT));
+            aButDec->setHeight(aHeight);
+            aButDec->setWidth(myRoot->scale(15));
+            aButDec->signals.onBtnClick += stSlot(this, &StGLRangeFieldFloat32::doDecrement);
+
+            myValueText->changeRectPx().moveLeftTo(aButDec->getRectPx().right() - myRoot->scale(5));
+
+            StGLButton* aButInc = new StGLButton(this, myValueText->getRectPx().right() + myRoot->scale(5), 0, "+");
+            aButInc->setCorner(StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT));
+            aButInc->setHeight(aHeight);
+            aButInc->setWidth(myRoot->scale(15));
+            aButInc->signals.onBtnClick += stSlot(this, &StGLRangeFieldFloat32::doIncrement);
+
+            changeRectPx().right()  = getRectPx().left() + aButInc->getRectPx().right();
+            changeRectPx().bottom() = getRectPx().top()  + aHeight;
+
+            if(!StGLWidget::stglInit()) {
+                return false;
+            }
+            break;
+        }
+        case RangeStyle_Seekbar: {
+            myValueText = new StGLTextArea(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                                           myRectPx.width(), myRectPx.height(), StGLTextArea::SIZE_NORMAL);
+            myValueText->setBorder(false);
+            myValueText->setDrawShadow(true);
+
+            onValueChange(aLongVal);
+            myValueText->setTextColor(StGLVec3(1.0f, 1.0f, 1.0f));
+            myValueText->setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER, StGLTextFormatter::ST_ALIGN_Y_CENTER);
+            if(!myValueText->stglInit()) {
+                delete myValueText; myValueText = NULL;
+                return false;
+            }
+
+            onValueChange(myTrackValue->getValue());
+
+            if(!StGLSeekBar::stglInit()) {
+                return false;
+            }
+            break;
+        }
+    }
+    return true;
+}
 
-    changeRectPx().right()  = getRectPx().left() + aButInc->getRectPx().right();
-    changeRectPx().bottom() = getRectPx().top()  + aHeight;
+void StGLRangeFieldFloat32::stglResize() {
+    if(myRangeStyle == RangeStyle_Seekbar) {
+        StGLSeekBar::stglResize();
+    } else {
+        StGLWidget::stglResize();
+    }
+}
 
-    return StGLWidget::stglInit();
+void StGLRangeFieldFloat32::stglDraw(unsigned int theView) {
+    if(myRangeStyle == RangeStyle_Seekbar) {
+        StGLSeekBar::stglDraw(theView);
+    } else {
+        StGLWidget::stglDraw(theView);
+    }
 }
 
 void StGLRangeFieldFloat32::onValueChange(const float theValue) {
@@ -88,6 +148,7 @@
             myValueText->setTextColor(myColors[FieldColor_Negative]);
         }
     }
+    setProgress(myTrackValue->getNormalizedValue());
 }
 
 void StGLRangeFieldFloat32::doResetValue(const size_t ) {
@@ -110,3 +171,10 @@
     }
     return true;
 }
+
+void StGLRangeFieldFloat32::doSeekClick(const int    theMouseBtn,
+                                        const double theValue) {
+    if(theMouseBtn == ST_MOUSE_LEFT) {
+        myTrackValue->setNormalizedValue((float )theValue, true);
+    }
+}

sview-16_06.tar.gz/StGLWidgets/StGLRootWidget.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLRootWidget.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -61,12 +61,14 @@
   myScaleGlY(1.0),
   myScaleGUI(1.0f),
   myResolution(72),
-  cursorZo(0.0, 0.0),
+  myCursorZo(0.0, 0.0),
   myFocusWidget(NULL),
   myModalDialog(NULL),
   myIsMenuPressed(false),
   myMenuIconSize(IconSize_16),
   myClickThreshold(3) {
+    myRectPxFull = getRectPx();
+
     // unify access
     StGLWidget::myRoot = this;
     myViewport[0] = 0;
@@ -264,11 +266,11 @@
     switch(theView) {
         case ST_DRAW_LEFT:
             myScrDispX   =             myLensDist * GLfloat(0.5 * myRectGl.width());
-            myScrDispXPx =  int(double(myLensDist) * 0.5 * double(rectPx.width()));
+            myScrDispXPx =  int(double(myLensDist) * 0.5 * double(myRectPxFull.width()));
             break;
         case ST_DRAW_RIGHT:
             myScrDispX   =            -myLensDist * GLfloat(0.5 * myRectGl.width());
-            myScrDispXPx = -int(double(myLensDist) * 0.5 * double(rectPx.width()));
+            myScrDispXPx = -int(double(myLensDist) * 0.5 * double(myRectPxFull.width()));
             break;
         case ST_DRAW_MONO:
         default:
@@ -306,17 +308,18 @@
     return myShareArray[theResId];
 }
 
-void StGLRootWidget::stglUpdate(const StPointD_t& theCursorZo) {
-    cursorZo = theCursorZo;
-    StGLWidget::stglUpdate(theCursorZo);
+void StGLRootWidget::stglUpdate(const StPointD_t& theCursorZo,
+                                bool theIsPreciseInput) {
+    myCursorZo = theCursorZo;
+    StGLWidget::stglUpdate(theCursorZo, theIsPreciseInput);
 }
 
 void StGLRootWidget::stglScissorRect(const StRectI_t& theRect,
                                      StGLBoxPx&       theScissorRect) const {
     const GLint aVPortWidth  = myViewport[2];
     const GLint aVPortHeight = myViewport[3];
-    const GLint aRootWidth   = getRectPx().width();
-    const GLint aRootHeight  = getRectPx().height();
+    const GLint aRootWidth   = myRectPxFull.width();
+    const GLint aRootHeight  = myRectPxFull.height();
     if(aRootWidth <= 0 || aRootHeight <= 0) {
         // just prevent division by zero - should never happen
         stMemZero(&theScissorRect, sizeof(StGLBoxPx));
@@ -327,25 +330,37 @@
     const GLdouble aWidthFactor  = GLdouble(aVPortWidth)  / GLdouble(aRootWidth);
     const GLdouble aHeightFactor = GLdouble(aVPortHeight) / GLdouble(aRootHeight);
 
-    theScissorRect.x() = myViewport[0] + GLint(aWidthFactor  * GLdouble(theRect.left())) + myScrDispXPx;
+    theScissorRect.x() = myViewport[0] + GLint(aWidthFactor  * GLdouble(theRect.left() + myScrDispXPx));
     theScissorRect.y() = myViewport[1] + GLint(aHeightFactor * GLdouble(aRootHeight - theRect.bottom()));
 
     theScissorRect.width()  = GLint(aWidthFactor  * GLdouble(theRect.width()));
     theScissorRect.height() = GLint(aHeightFactor * GLdouble(theRect.height()));
 }
 
-void StGLRootWidget::stglResize(const StGLBoxPx& theRectPx) {
-    const bool isChanged = getRectPx().right()  != theRectPx.width()
-                        || getRectPx().bottom() != theRectPx.height();
-
-    myProjCamera.resize(theRectPx.width(), theRectPx.height());
-
-    changeRectPx().right()  = theRectPx.width();  // (left, top) forced to zero point (0, 0)
-    changeRectPx().bottom() = theRectPx.height();
+void StGLRootWidget::stglResize(const StGLBoxPx& theViewPort,
+                                const StMarginsI& theMargins,
+                                float theAspect) {
+    const int  aNewSizeX = theViewPort.width();
+    const int  aNewSizeY = theViewPort.height();
+    const bool isChanged = myRectPxFull.right()  != aNewSizeX
+                        || myRectPxFull.bottom() != aNewSizeY
+                        || myMarginsPx != theMargins
+                        || myProjCamera.getAspect() != theAspect;
+    myMarginsPx = theMargins;
+    myProjCamera.resize(theAspect);
+    myRectPxFull.right()  = aNewSizeX; // (left, top) forced to zero point (0, 0)
+    myRectPxFull.bottom() = aNewSizeY;
+
+    // define working area (shift by margins)
+    changeRectPx().left()   = myMarginsPx.left;
+    changeRectPx().right()  = aNewSizeX - myMarginsPx.right;
+    changeRectPx().top()    = myMarginsPx.top;
+    changeRectPx().bottom() = aNewSizeY - myMarginsPx.bottom;
 
     myProjCamera.getZParams(myRectGl);
-    myScaleGlX = (myRectGl.right() - myRectGl.left()) / GLdouble(getRectPx().width());
-    myScaleGlY = (myRectGl.top() - myRectGl.bottom()) / GLdouble(getRectPx().height());
+    myScaleGlX = (myRectGl.right() - myRectGl.left()) / GLdouble(aNewSizeX);
+    myScaleGlY = (myRectGl.top() - myRectGl.bottom()) / GLdouble(aNewSizeY);
+    myRectWorkGl = getRectGl(getRectPx());
 
     myScrProjMat = myProjCamera.getProjMatrix();
     myScrProjMat.translate(StGLVec3(0.0f, 0.0f, -myProjCamera.getZScreen()));
@@ -383,37 +398,52 @@
 
 bool StGLRootWidget::tryClick(const StClickEvent& theEvent,
                               bool&               theIsItemClicked) {
-    const StPointD_t aCursorBack = cursorZo;
-    cursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
-    if(isPointIn(cursorZo)) {
+    const StPointD_t aCursorBack = myCursorZo;
+    myCursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
+    if(isPointIn(myCursorZo)) {
         setClicked(theEvent.Button, true);
     }
-    const bool aResult = StGLWidget::tryClick(theEvent, theIsItemClicked);
-    cursorZo = aCursorBack;
+
+    bool toIgnore = false;
+    if(theEvent.Button == ST_MOUSE_LEFT // && theEvent.IsSynthesized
+    && myIsMobile) {
+        StPointI_t aCursorPx(int(myRoot->getRectPx().width()  * theEvent.PointX),
+                             int(myRoot->getRectPx().height() * theEvent.PointY));
+        const int aToler = myRoot->scale(8);
+        if(aCursorPx.x() < aToler || aCursorPx.x() > (myRoot->getRectPx().width()  - aToler)
+        || aCursorPx.y() < aToler || aCursorPx.y() > (myRoot->getRectPx().height() - aToler)) {
+            // disallow clicks at the very front of mobile screens;
+            // this area is usually handled by special system gestures (e.g. to reveal system bars)
+            toIgnore = true;
+        }
+    }
+
+    const bool aResult = !toIgnore ? StGLWidget::tryClick(theEvent, theIsItemClicked) : false;
+    myCursorZo = aCursorBack;
     return aResult;
 }
 
 bool StGLRootWidget::tryUnClick(const StClickEvent& theEvent,
                                 bool&               theIsItemUnclicked) {
-    const StPointD_t aCursorBack = cursorZo;
-    cursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
-    if(isPointIn(cursorZo)) {
+    const StPointD_t aCursorBack = myCursorZo;
+    myCursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
+    if(isPointIn(myCursorZo)) {
         setClicked(theEvent.Button, false);
     }
 
     const bool aResult = StGLWidget::tryUnClick(theEvent, theIsItemUnclicked);
     clearDestroyList();
-    cursorZo = aCursorBack;
+    myCursorZo = aCursorBack;
     return aResult;
 }
 
 bool StGLRootWidget::doScroll(const StScrollEvent& theEvent) {
-    const StPointD_t aCursorBack = cursorZo;
-    cursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
+    const StPointD_t aCursorBack = myCursorZo;
+    myCursorZo = StPointD_t(theEvent.PointX, theEvent.PointY);
 
     const bool aResult = StGLWidget::doScroll(theEvent);
     clearDestroyList();
-    cursorZo = aCursorBack;
+    myCursorZo = aCursorBack;
     return aResult;
 }

sview-16_06.tar.gz/StGLWidgets/StGLScrollArea.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLScrollArea.cpp Changed

sview-16_06.tar.gz/StGLWidgets/StGLSeekBar.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLSeekBar.cpp Changed

@@ -96,16 +96,17 @@
 };
 
 StGLSeekBar::StGLSeekBar(StGLWidget* theParent,
-                         const int   theTop,
-                         const int   theMargin)
-: StGLWidget(theParent, 0, theTop, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                         int theTop,
+                         int theMargin,
+                         StGLCorner theCorner)
+: StGLWidget(theParent, 0, theTop, theCorner,
              theParent->getRoot()->scale(512),
              theParent->getRoot()->scale(12) + theMargin * 2),
   myProgram(new StProgramSB()),
   myProgress(0.0f),
   myProgressPx(0),
   myClickPos(-1),
-  myMoveTolerPx(myRoot->scale(myRoot->isMobile() ? 16 : 8)) {
+  myMoveTolerPx(0) {
     StGLWidget::signals.onMouseClick  .connect(this, &StGLSeekBar::doMouseClick);
     StGLWidget::signals.onMouseUnclick.connect(this, &StGLSeekBar::doMouseUnclick);
     myMargins.top    = theMargin;
@@ -225,16 +226,19 @@
     StGLWidget::stglDraw(theView);
 }
 
-void StGLSeekBar::stglUpdate(const StPointD_t& theCursor) {
-    StGLWidget::stglUpdate(theCursor);
+void StGLSeekBar::stglUpdate(const StPointD_t& theCursor,
+                             bool theIsPreciseInput) {
+    StGLWidget::stglUpdate(theCursor, theIsPreciseInput);
     if(!isClicked(ST_MOUSE_LEFT)) {
         return;
     }
 
     const double aPos   = stMin(stMax(getPointInEx(theCursor), 0.0), 1.0);
     const int    aPosPx = int(aPos * double(getRectPx().width()));
+
+    const int aMoveTolerPx = myMoveTolerPx > 0 ? myMoveTolerPx : myRoot->scale(theIsPreciseInput ? 1 : 2);
     if(myClickPos >= 0
-    && std::abs(aPosPx - myClickPos) < myMoveTolerPx) {
+    && std::abs(aPosPx - myClickPos) < aMoveTolerPx) {
         return;
     }

sview-16_06.tar.gz/StGLWidgets/StGLSubtitles.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLSubtitles.cpp Changed

@@ -229,7 +229,8 @@
     return StGLTextArea::stglInit();
 }
 
-void StGLSubtitles::stglUpdate(const StPointD_t& ) {
+void StGLSubtitles::stglUpdate(const StPointD_t& ,
+                               bool ) {
     bool isChanged = myShowItems.pop(myPTS);
     for(StHandle<StSubItem> aNewSubItem = myQueue->pop(myPTS); !aNewSubItem.isNull(); aNewSubItem = myQueue->pop(myPTS)) {
         isChanged = true;
@@ -241,7 +242,7 @@
     myCorner.v = aCorner;
     switch(myCorner.v) {
         case ST_VCORNER_TOP: {
-            const int aDisp = myRoot->scale((int )myTopDY->getValue());
+            const int aDisp = myRoot->scale((int )myTopDY->getValue()) + myRoot->getRootMargins().top;
             if(getRectPx().top() != aDisp) {
                 toResize = true;
                 changeRectPx().moveTopTo(aDisp);
@@ -260,7 +261,7 @@
             break;
         }
         case ST_VCORNER_BOTTOM: {
-            const int aDisp = -myRoot->scale((int )myBottomDY->getValue());
+            const int aDisp = -myRoot->scale((int )myBottomDY->getValue()) - myRoot->getRootMargins().bottom;
             if(getRectPx().top() != aDisp) {
                 toResize = true;
                 changeRectPx().moveTopTo(aDisp);

sview-16_06.tar.gz/StGLWidgets/StGLTextArea.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLTextArea.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -179,7 +179,7 @@
         || !myFont->changeFont()->getFont()->isValid()) {
             return false; // critical error
         } else if(!myFont->stglInit(aCtx)) {
-            ST_ERROR_LOG("Could not initialize OpenGL resources for font");
+            aCtx.pushError(StString("Could not initialize OpenGL resources for font"));
             return false;
         }
     } else if(!myFont->changeFont()->isValid()) {
@@ -274,7 +274,7 @@
 
     // size corrector for FTGL
     StRectD_t zparams; getCamera()->getZParams(zparams);
-    GLfloat aSizeOut = 2.0f * GLfloat(zparams.top()) / GLfloat(getRoot()->getRectPx().height());
+    GLfloat aSizeOut = 2.0f * GLfloat(zparams.top()) / GLfloat(getRoot()->getRootFullSizeY());
 
     StGLMatrix aModelMat;
     aModelMat.translate(StGLVec3(getRoot()->getScreenDispX() + myTextDX, 0.0f, -getCamera()->getZScreen()));

sview-16_06.tar.gz/StGLWidgets/StGLTextureButton.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLTextureButton.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -16,6 +16,7 @@
 #include <StGLCore/StGLCore20.h>
 
 #include <StAV/StAVImage.h>
+#include <StSlots/StAction.h>
 #include <StThreads/StProcess.h>
 
 /**
@@ -304,6 +305,10 @@
     }
 }
 
+void StGLTextureButton::setAction(const StHandle<StAction>& theAction) {
+    myAction = theAction;
+}
+
 void StGLTextureButton::setTexturePath(const StString* theTexturesPaths,
                                        const size_t    theCount) {
     const size_t aNbTextures = (theCount > myTextures->size()) ? myTextures->size() : theCount;
@@ -443,7 +448,8 @@
     return true;
 }
 
-void StGLTextureButton::stglUpdate(const StPointD_t& theCursorZo) {
+void StGLTextureButton::stglUpdate(const StPointD_t& theCursorZo,
+                                   bool theIsPreciseInput) {
     if(!isVisible()) {
         return;
     }
@@ -474,7 +480,7 @@
             myAnimTime = 0.0f;
         }
     }
-    StGLWidget::stglUpdate(theCursorZo);
+    StGLWidget::stglUpdate(theCursorZo, theIsPreciseInput);
 }
 
 void StGLTextureButton::stglDraw(unsigned int ) {
@@ -545,6 +551,9 @@
 
 void StGLTextureButton::doMouseUnclick(const int theBtnId) {
     if(theBtnId == ST_MOUSE_LEFT) {
+        if(!myAction.isNull()) {
+            myAction->doTrigger(NULL);
+        }
         signals.onBtnClick(getUserData());
     }
 }

sview-16_06.tar.gz/StGLWidgets/StGLWidget.cpp -> sview-17_04.tar.gz/StGLWidgets/StGLWidget.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -26,8 +26,8 @@
   myChildren(),
   myPrev(NULL),
   myNext(NULL),
-  userData(0),
-  rectPx(theTop, theTop + theHeight, theLeft, theLeft + theWidth),
+  myUserData(0),
+  myRectPx(theTop, theTop + theHeight, theLeft, theLeft + theWidth),
   myCorner(theCorner),
   myOpacity(1.0f),
   myIsResized(true),
@@ -36,7 +36,7 @@
     if(myParent != NULL) {
         myParent->getChildren()->add(this);
     }
-    stMemSet(mouseClicked, 0, sizeof(mouseClicked));
+    stMemSet(myMouseClicked, 0, sizeof(myMouseClicked));
 }
 
 StGLWidget::~StGLWidget() {
@@ -54,10 +54,10 @@
 
 void StGLWidget::destroyChildren() {
     // remove own children
-    for(StGLWidget *child(myChildren.getStart()), *deleteChild(NULL); child != NULL;) {
-        deleteChild = child;
-        child = child->getNext();
-        delete deleteChild;
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL;) {
+        const StGLWidget* aDeleteChild = aChildIter;
+        aChildIter = aChildIter->getNext();
+        delete aDeleteChild;
     }
 }
 
@@ -118,10 +118,10 @@
 
 /**
  * Helper function to convert relative coordinates to absolute.
- * @param theParentRect (const StRectI_t& ) - parent widget absolute position;
- * @param theChildRect  (const StRectI_t& ) - child widget position relative to parent;
- * @param theCorner     (const StGLCorner ) - corner modifier for child widget relative to parent;
- * @return child widget absolute position.
+ * @param theParentRect parent widget absolute position
+ * @param theChildRect  child widget position relative to parent
+ * @param theCorner     corner modifier for child widget relative to parent
+ * @return child widget absolute position
  */
 inline StRectI_t computeAbsolutePos(const StRectI_t& theParentRect,
                                     const StRectI_t& theChildRect,
@@ -157,9 +157,9 @@
 
 StRectI_t StGLWidget::getRectPxAbsolute() const {
     if(myParent == NULL) {
-        return rectPx;
+        return myRectPx;
     }
-    return computeAbsolutePos(myParent->getRectPxAbsolute(), rectPx, myCorner);
+    return computeAbsolutePos(myParent->getRectPxAbsolute(), myRectPx, myCorner);
 }
 
 StRectI_t StGLWidget::getAbsolute(const StRectI_t& theRectPx) const {
@@ -174,8 +174,8 @@
 }
 
 StPointD_t StGLWidget::getPointGl(const StPointD_t& thePointZo) const {
-    double oglWidth  = myRoot->getRootRectGl().right() - myRoot->getRootRectGl().left();
-    double oglHeight = myRoot->getRootRectGl().top() - myRoot->getRootRectGl().bottom();
+    double oglWidth  = myRoot->getRootWorkRectGl().right() - myRoot->getRootWorkRectGl().left();
+    double oglHeight = myRoot->getRootWorkRectGl().top() - myRoot->getRootWorkRectGl().bottom();
     return StPointD_t((thePointZo.x() - 0.5) * oglWidth,
                       (0.5 - thePointZo.y()) * oglHeight);
 }
@@ -209,63 +209,64 @@
     return myValue;
 }
 
-void StGLWidget::stglUpdate(const StPointD_t& cursorZo) {
+void StGLWidget::stglUpdate(const StPointD_t& theCursorZo,
+                            bool theIsPreciseInput) {
     if(!isVisible()) {
         return;
     }
 
-    for(StGLWidget *child(myChildren.getStart()), *childActive(NULL); child != NULL;) {
-        childActive = child;
-        child = child->getNext();
-        childActive->stglUpdate(cursorZo);
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getNext();
+        aChildActive->stglUpdate(theCursorZo, theIsPreciseInput);
     }
 }
 
 void StGLWidget::stglResize() {
-    for(StGLWidget *child(myChildren.getStart()), *childActive(NULL); child != NULL;) {
-        childActive = child;
-        child = child->getNext();
-        childActive->stglResize();
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getNext();
+        aChildActive->stglResize();
     }
     myIsResized = false;
 }
 
 bool StGLWidget::stglInit() {
-    bool success = true;
-    for(StGLWidget *child(myChildren.getStart()), *childActive(NULL); child != NULL;) {
-        childActive = child;
-        child = child->getNext();
-        success = childActive->stglInit() && success;
+    bool isSuccess = true;
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getNext();
+        isSuccess = aChildActive->stglInit() && isSuccess;
     }
-    return success;
+    return isSuccess;
 }
 
-void StGLWidget::stglDraw(unsigned int view) {
+void StGLWidget::stglDraw(unsigned int theView) {
     if(!isVisible()) {
         return;
     }
-    for(StGLWidget *child(myChildren.getStart()), *childActive(NULL); child != NULL;) {
-        childActive = child;
-        child = child->getNext();
-        childActive->stglDraw(view);
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getNext();
+        aChildActive->stglDraw(theView);
     }
 }
 
-bool StGLWidget::isClicked(const int& mouseBtn) const {
-    if(mouseBtn > ST_MOUSE_MAX_ID) {
+bool StGLWidget::isClicked(int theMouseBtn) const {
+    if(theMouseBtn > ST_MOUSE_MAX_ID) {
         // ignore out of range buttons
         return false;
     }
-    return mouseClicked[mouseBtn];
+    return myMouseClicked[theMouseBtn];
 }
 
-void StGLWidget::setClicked(const int& mouseBtn, bool isClicked) {
-    if(mouseBtn > ST_MOUSE_MAX_ID) {
+void StGLWidget::setClicked(int theMouseBtn, bool theIsClicked) {
+    if(theMouseBtn > ST_MOUSE_MAX_ID) {
         // ignore out of range buttons
-        ST_DEBUG_LOG("StGLWidget, mouse button click #" + mouseBtn + " ignored!");
+        ST_DEBUG_LOG("StGLWidget, mouse button click #" + theMouseBtn + " ignored!");
         return;
     }
-    mouseClicked[mouseBtn] = isClicked;
+    myMouseClicked[theMouseBtn] = theIsClicked;
 }
 
 bool StGLWidget::tryClick(const StClickEvent& theEvent,
@@ -274,9 +275,9 @@
         return false;
     }
 
-    for(StGLWidget *aChildIter(myChildren.getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
-        aChildIter   = aChildIter->getPrev();
+    for(StGLWidget* aChildIter = myChildren.getLast(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getPrev();
         aChildActive->tryClick(theEvent, theIsItemClicked);
     }
     if(!theIsItemClicked && isPointIn(StPointD_t(theEvent.PointX, theEvent.PointY))) {
@@ -293,8 +294,8 @@
         return false;
     }
 
-    for(StGLWidget *aChildIter(myChildren.getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
+    for(StGLWidget* aChildIter = myChildren.getLast(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
         aChildIter   = aChildIter->getPrev();
         aChildActive->tryUnClick(theEvent, theIsItemUnclicked);
     }
@@ -328,9 +329,9 @@
     }
 
     StPointD_t aPnt(theEvent.PointX, theEvent.PointY);
-    for(StGLWidget *aChildIter(myChildren.getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
-        aChildIter   = aChildIter->getPrev();
+    for(StGLWidget* aChildIter = myChildren.getLast(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getPrev();
         if(aChildActive->isVisibleAndPointIn(aPnt)
         && aChildActive->doScroll(theEvent)) {
             return true;
@@ -339,10 +340,14 @@
     return false;
 }
 
-StGLProjCamera* StGLWidget::getCamera() {
+const StGLProjCamera* StGLWidget::getCamera() const {
     return myRoot->StGLRootWidget::getCamera();
 }
 
+StGLProjCamera* StGLWidget::changeCamera() {
+    return myRoot->StGLRootWidget::changeCamera();
+}
+
 StGLContext& StGLWidget::getContext() {
     return myRoot->StGLRootWidget::getContext();
 }
@@ -352,9 +357,9 @@
 }
 
 StGLContainer::StGLContainer(StGLWidget* theParent,
-                             const int theLeft,  const int theTop,
-                             const StGLCorner theCorner,
-                             const int theWidth, const int theHeight)
+                             int theLeft, int theTop,
+                             StGLCorner theCorner,
+                             int theWidth, int theHeight)
 : StGLWidget(theParent, theLeft, theTop, theCorner, theWidth, theHeight) {}
 
 StGLContainer::~StGLContainer() {}
@@ -364,9 +369,9 @@
     if(!isVisible()) {
         return false;
     }
-    for(StGLWidget *aChildIter(myChildren.getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
-        aChildIter   = aChildIter->getPrev();
+    for(StGLWidget* aChildIter = myChildren.getLast(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getPrev();
         aChildActive->tryClick(theEvent, theIsItemClicked);
     }
     return false;
@@ -377,9 +382,9 @@
     if(!isVisible()) {
         return false;
     }
-    for(StGLWidget *aChildIter(myChildren.getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
-        aChildIter   = aChildIter->getPrev();
+    for(StGLWidget* aChildIter = myChildren.getLast(); aChildIter != NULL;) {
+        StGLWidget* aChildActive = aChildIter;
+        aChildIter = aChildIter->getPrev();
         aChildActive->tryUnClick(theEvent, theIsItemUnclicked);
     }
     return false;
@@ -390,7 +395,7 @@
     if(!theToSetChildren) {
         return;
     }
-    for(StGLWidget *aChildIter(myChildren.getStart()); aChildIter != NULL; aChildIter = aChildIter->getNext()) {
+    for(StGLWidget* aChildIter = myChildren.getStart(); aChildIter != NULL; aChildIter = aChildIter->getNext()) {
         aChildIter->setOpacity(theOpacity, theToSetChildren);
     }
 }

sview-16_06.tar.gz/StGLWidgets/StGLWidgets.rc -> sview-17_04.tar.gz/StGLWidgets/StGLWidgets.rc Changed

sview-16_06.tar.gz/StImageViewer/StImageLoader.cpp -> sview-17_04.tar.gz/StImageViewer/StImageLoader.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,10 @@
   myTextureQueue(theTextureQueue),
   myMsgQueue(theMsgQueue),
   myImageLib(theImageLib),
-  myAction(Action_NONE) {
+  myAction(Action_NONE),
+  myToStickPano360(false),
+  myToFlipCubeZ6x1(false),
+  myToFlipCubeZ3x2(false) {
       myPlayList->setExtensions(myMimeList.getExtensionsList());
       myThread = new StThread(threadFunction, (void* )this, "StImageLoader");
 }
@@ -235,7 +238,6 @@
 
     StTimer aLoadTimer(true);
     StFormat  aSrcFormatCurr = myStFormatByUser;
-    StCubemap aSrcCubemap    = theParams->ViewingMode == StStereoParams::PANORAMA_CUBEMAP ? StCubemap_Packed : StCubemap_OFF;
     if(anImgType == StImageFile::ST_TYPE_MPO
     || anImgType == StImageFile::ST_TYPE_JPEG
     || anImgType == StImageFile::ST_TYPE_JPS) {
@@ -422,14 +424,32 @@
             aSizeY1   /= 2;
         }
     }
+
+    if(!anImageFileR->isNull()) {
+        aSrcFormatCurr = StFormat_SeparateFrames;
+    }
+
+    if(myToStickPano360
+    && theParams->ViewingMode == StViewSurface_Plain) {
+        StPanorama aPano = st::probePanorama(aSrcFormatCurr,
+                                             theParams->Src1SizeX, theParams->Src1SizeY,
+                                             theParams->Src2SizeX, theParams->Src2SizeY);
+        theParams->ViewingMode = (aPano == StPanorama_Cubemap6_1 || aPano == StPanorama_Cubemap3_2)
+                               ? StViewSurface_Cubemap
+                               : StViewSurface_Sphere;
+    }
+    StCubemap aSrcCubemap = theParams->ViewingMode == StViewSurface_Cubemap ? StCubemap_Packed : StCubemap_OFF;
+
     size_t aCubeCoeffs[2] = {0, 0};
     if(aSrcCubemap == StCubemap_Packed) {
         if(aSizeX1 / 6 == aSizeY1) {
             aCubeCoeffs[0] = 6;
             aCubeCoeffs[1] = 1;
+            theParams->ToFlipCubeZ = myToFlipCubeZ6x1;
         } else if(aSizeX1 / 3 == aSizeY1 / 2) {
             aCubeCoeffs[0] = 3;
             aCubeCoeffs[1] = 2;
+            theParams->ToFlipCubeZ = myToFlipCubeZ3x2;
         }
         if(!anImageFileR->isNull()
         && (aSizeX1 != aSizeX2 || aSizeY1 != aSizeY2)) {
@@ -467,10 +487,6 @@
     // finally push image data in Texture Queue
     myTextureQueue->setConnectedStream(true);
 
-    if(!anImageR->isNull()) {
-        aSrcFormatCurr = StFormat_SeparateFrames;
-    }
-
     {
         StImage anImageRefL, anImageRefR;
         StHandle<StBufferCounter> aRefL = new StImageFileCounter(anImageL);

sview-16_06.tar.gz/StImageViewer/StImageLoader.h -> sview-17_04.tar.gz/StImageViewer/StImageLoader.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,6 +134,27 @@
      */
     ST_LOCAL void setCompressMemory(const bool theToCompress);
 
+    /**
+     * Stick to panorama 360 mode.
+     */
+    ST_LOCAL void setStickPano360(bool theToStick) {
+        myToStickPano360 = theToStick;
+    }
+
+    /**
+     * Flip Z within 6x1 cubemap input.
+     */
+    ST_LOCAL void setFlipCubeZ6x1(bool theToFlip) {
+        myToFlipCubeZ6x1 = theToFlip;
+    }
+
+    /**
+     * Flip Z within 3x2 cubemap input.
+     */
+    ST_LOCAL void setFlipCubeZ3x2(bool theToFlip) {
+        myToFlipCubeZ3x2 = theToFlip;
+    }
+
         public:  //! @name Signals
 
     struct {
@@ -191,6 +212,9 @@
 
     volatile StImageFile::ImageClass myImageLib;
     volatile Action            myAction;
+    volatile bool              myToStickPano360; //!< stick to panorama 360 mode
+    volatile bool              myToFlipCubeZ6x1; //!< flip Z within 6x1 cubemap input
+    volatile bool              myToFlipCubeZ3x2; //!< flip Z within 3x2 cubemap input
 
         private: //! @name no copies, please

sview-16_06.tar.gz/StImageViewer/StImageViewer.cpp -> sview-17_04.tar.gz/StImageViewer/StImageViewer.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,6 +66,7 @@
     static const char ST_ARGUMENT_FILE_LEFT[]  = "left";
     static const char ST_ARGUMENT_FILE_RIGHT[] = "right";
     static const char ST_ARGUMENT_FILE_LAST[]  = "last";
+    static const char ST_ARGUMENT_FILE_DEMO[]  = "demo";
 
     static const char ST_ARGUMENT_MONITOR[]    = "monitorId";
     static const char ST_ARGUMENT_WINLEFT[]    = "windowLeft";
@@ -100,12 +101,19 @@
     params.LastUpdateDay->setName(tr(MENU_HELP_UPDATES));
     params.SrcStereoFormat->setName(tr(MENU_MEDIA_SRC_FORMAT));
     params.ToShowPlayList->setName(tr(PLAYLIST));
+    params.ToShowAdjustImage->setName(tr(MENU_VIEW_IMAGE_ADJUST));
+    params.ToStickPanorama->setName(tr(MENU_VIEW_STICK_PANORAMA360));
+    params.ToFlipCubeZ6x1->setName(tr(MENU_VIEW_FLIPZ_CUBE6x1));
+    params.ToFlipCubeZ3x2->setName(tr(MENU_VIEW_FLIPZ_CUBE3x2));
     params.ToTrackHead->setName(tr(MENU_VIEW_TRACK_HEAD));
     params.ToShowFps->setName(tr(MENU_SHOW_FPS));
     params.ToShowMenu->setName(stCString("Show main menu"));
     params.ToShowTopbar->setName(stCString("Show top toolbar"));
     params.IsMobileUI->setName(stCString("Mobile UI"));
+    params.ToHideStatusBar->setName("Hide system status bar");
+    params.ToHideNavBar   ->setName(tr(OPTION_HIDE_NAVIGATION_BAR));
     params.IsVSyncOn->setName(tr(MENU_VSYNC));
+    params.ToOpenLast->setName(tr(OPTION_OPEN_LAST_ON_STARTUP));
     params.ToSaveRecent->setName(stCString("Remember recent file"));
     params.TargetFps->setName(stCString("FPS Target"));
     myLangMap->params.language->setName(tr(MENU_HELP_LANGS));
@@ -156,15 +164,30 @@
     params.SrcStereoFormat->signals.onChanged.connect(this, &StImageViewer::doSwitchSrcFormat);
     params.ToShowPlayList   = new StBoolParamNamed(false, stCString("showPlaylist"));
     params.ToShowPlayList->signals.onChanged = stSlot(this, &StImageViewer::doShowPlayList);
+    params.ToShowAdjustImage = new StBoolParamNamed(false, stCString("showAdjustImage"));
+    params.ToShowAdjustImage->signals.onChanged = stSlot(this, &StImageViewer::doShowAdjustImage);
+    params.ToStickPanorama = new StBoolParamNamed(false, stCString("toStickPano360"));
+    params.ToStickPanorama->signals.onChanged = stSlot(this, &StImageViewer::doChangeStickPano360);
+    params.ToFlipCubeZ6x1= new StBoolParamNamed(true,  stCString("toFlipCube6x1"));
+    params.ToFlipCubeZ6x1->signals.onChanged = stSlot(this, &StImageViewer::doChangeFlipCubeZ);
+    params.ToFlipCubeZ3x2= new StBoolParamNamed(false, stCString("toFlipCube3x2"));
+    params.ToFlipCubeZ3x2->signals.onChanged = stSlot(this, &StImageViewer::doChangeFlipCubeZ);
     params.ToTrackHead   = new StBoolParamNamed(true,  stCString("toTrackHead"));
     params.ToShowFps     = new StBoolParamNamed(false, stCString("toShowFps"));
     params.ToShowMenu    = new StBoolParamNamed(true,  stCString("toShowMenu"));
     params.ToShowTopbar  = new StBoolParamNamed(true,  stCString("toShowTopbar"));
     params.IsMobileUI    = new StBoolParamNamed(StWindow::isMobile(), stCString("isMobileUI"));
-    params.IsMobileUI->signals.onChanged = stSlot(this, &StImageViewer::doScaleHiDPI);
+    params.IsMobileUI->signals.onChanged = stSlot(this, &StImageViewer::doChangeMobileUI);
+    params.IsMobileUISwitch = new StBoolParam(params.IsMobileUI->getValue());
+    params.IsMobileUISwitch->signals.onChanged = stSlot(this, &StImageViewer::doScaleHiDPI);
+    params.ToHideStatusBar = new StBoolParamNamed(true, stCString("toHideStatusBar"));
+    params.ToHideStatusBar->signals.onChanged = stSlot(this, &StImageViewer::doHideSystemBars);
+    params.ToHideNavBar    = new StBoolParamNamed(true, stCString("toHideNavBar"));
+    params.ToHideNavBar   ->signals.onChanged = stSlot(this, &StImageViewer::doHideSystemBars);
     params.IsVSyncOn     = new StBoolParamNamed(true,  stCString("vsync"));
     params.IsVSyncOn->signals.onChanged = stSlot(this, &StImageViewer::doSwitchVSync);
     StApplication::params.VSyncMode->setValue(StGLContext::VSync_ON);
+    params.ToOpenLast   = new StBoolParamNamed(false, stCString("toOpenLast"));
     params.ToSaveRecent = new StBoolParamNamed(false, stCString("toSaveRecent"));
     params.imageLib = StImageFile::ST_LIBAV,
     params.TargetFps = new StInt32ParamNamed(0, stCString("fpsTarget"));
@@ -179,11 +202,18 @@
     mySettings->loadString(ST_SETTING_LAST_FOLDER,        params.lastFolder);
     mySettings->loadParam (params.LastUpdateDay);
     mySettings->loadParam (params.CheckUpdatesDays);
+    mySettings->loadParam (params.ToStickPanorama);
+    mySettings->loadParam (params.ToFlipCubeZ6x1);
+    mySettings->loadParam (params.ToFlipCubeZ3x2);
     myToCheckPoorOrient = !mySettings->loadParam(params.ToTrackHead);
     mySettings->loadParam (params.ToShowFps);
     mySettings->loadParam (params.IsMobileUI);
+    mySettings->loadParam (params.ToHideStatusBar);
+    mySettings->loadParam (params.ToHideNavBar);
+    mySettings->loadParam (params.ToOpenLast);
     mySettings->loadParam (params.IsVSyncOn);
     mySettings->loadParam (params.ToShowPlayList);
+    mySettings->loadParam (params.ToShowAdjustImage);
 
     int32_t aSlideShowDelayInt = int32_t(mySlideShowDelay);
     mySettings->loadInt32 (ST_SETTING_SLIDESHOW_DELAY,    aSlideShowDelayInt);
@@ -204,7 +234,8 @@
 
     // no need in Depth buffer
     const StWinAttr anAttribs[] = {
-        StWinAttr_GlDepthSize, (StWinAttr )0,
+        StWinAttr_GlDepthSize,   (StWinAttr )0,
+        StWinAttr_GlStencilSize, (StWinAttr )0,
         StWinAttr_NULL
     };
     for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
@@ -314,11 +345,18 @@
         mySettings->saveParam(params.LastUpdateDay);
         mySettings->saveParam(params.CheckUpdatesDays);
         mySettings->saveString(ST_SETTING_IMAGELIB,  StImageFile::imgLibToString(params.imageLib));
+        mySettings->saveParam (params.ToStickPanorama);
+        mySettings->saveParam (params.ToFlipCubeZ6x1);
+        mySettings->saveParam (params.ToFlipCubeZ3x2);
         mySettings->saveParam (params.ToTrackHead);
         mySettings->saveParam (params.ToShowFps);
         mySettings->saveParam (params.IsMobileUI);
+        mySettings->saveParam (params.ToHideStatusBar);
+        mySettings->saveParam (params.ToHideNavBar);
+        mySettings->saveParam (params.ToOpenLast);
         mySettings->saveParam (params.IsVSyncOn);
         mySettings->saveParam (params.ToShowPlayList);
+        mySettings->saveParam (params.ToShowAdjustImage);
         if(myToSaveSrcFormat) {
             mySettings->saveParam(params.SrcStereoFormat);
         }
@@ -332,7 +370,7 @@
 
     StString aLastL, aLastR;
     StHandle<StFileNode> aFile = myPlayList->getCurrentFile();
-    if(params.ToSaveRecent->getValue()
+    if((params.ToSaveRecent->getValue() || params.ToOpenLast->getValue())
     && !aFile.isNull()) {
         if(aFile->isEmpty()) {
             aLastL = aFile->getPath();
@@ -389,6 +427,7 @@
     myGUI->myImage->getTextureQueue()->setDeviceCaps(aDevCaps);
 
     // load settings
+    doChangeMobileUI(params.IsMobileUI->getValue());
     myWindow->setTargetFps(double(params.TargetFps->getValue()));
     mySettings->loadParam (myGUI->myImage->params.DisplayMode);
     mySettings->loadParam (myGUI->myImage->params.TextureFilter);
@@ -407,7 +446,7 @@
         return false;
     }
     myGUI->stglInit();
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
 
     for(size_t anIter = 0; anIter < myGUI->myImage->getActions().size(); ++anIter) {
         StHandle<StAction>& anAction = myGUI->myImage->changeActions()[anIter];
@@ -457,6 +496,7 @@
     }
 
     // create the image loader thread
+    myWindow->setHideSystemBars(params.ToHideStatusBar->getValue(), params.ToHideNavBar->getValue());
     if(isReset) {
         if(params.IsFullscreen->getValue()) {
             myWindow->setFullScreen(true);
@@ -471,6 +511,9 @@
                                  myGUI->myImage->getTextureQueue(), myContext->getMaxTextureSize());
     myLoader->signals.onLoaded.connect(this, &StImageViewer::doLoaded);
     myLoader->setCompressMemory(myWindow->isMobile());
+    myLoader->setStickPano360(params.ToStickPanorama->getValue());
+    myLoader->setFlipCubeZ6x1(params.ToFlipCubeZ6x1->getValue());
+    myLoader->setFlipCubeZ3x2(params.ToFlipCubeZ3x2->getValue());
 
     // load this parameter AFTER image thread creation
     mySettings->loadParam(params.SrcStereoFormat);
@@ -606,9 +649,11 @@
 
     parseArguments(myOpenFileInfo->getArgumentsMap());
     const StMIME anOpenMIME = myOpenFileInfo->getMIME();
-    if(myOpenFileInfo->getPath().isEmpty()) {
-        const StArgument anArgLast = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_LAST];
-        if(anArgLast.isValid() && !anArgLast.isValueOff()) {
+    const StArgument anArgLast     = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_LAST];
+    const StArgument anArgFileDemo = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_DEMO];
+    const bool toOpenLast = anArgLast.isValid() ? !anArgLast.isValueOff() : params.ToOpenLast->getValue();
+    if(myOpenFileInfo->getPath().isEmpty() || (toOpenLast && anArgFileDemo.isValid())) {
+        if(toOpenLast) {
             StString aLastL, aLastR;
             mySettings->loadString(ST_SETTING_RECENT_L, aLastL);
             mySettings->loadString(ST_SETTING_RECENT_R, aLastR);
@@ -672,7 +717,14 @@
         return;
     }
 
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    const StMarginsI& aMargins = myWindow->getMargins();
+    const bool wasMobileGui = myGUI->isMobile();
+    const bool toMobileGui  = toUseMobileUI(aMargins);
+    if(toMobileGui != wasMobileGui) {
+        doChangeMobileUI(params.IsMobileUI->getValue());
+    } else {
+        myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
+    }
 }
 
 void StImageViewer::doImageAdjustReset(const size_t ) {
@@ -995,14 +1047,15 @@
 }
 
 void StImageViewer::stglDraw(unsigned int theView) {
-    if( myContext.isNull()
-    || !myContext->isBound()) {
+    const bool hasCtx = !myContext.isNull() && myContext->isBound();
+    if(!hasCtx || myWindow->isPaused()) {
         if(theView == ST_DRAW_LEFT
         || theView == ST_DRAW_MONO) {
             if(myWindow->isPaused()) {
+                const double aTimeout = hasCtx ? 300.0 : 60.0;
                 if(!myInactivityTimer.isOn()) {
                     myInactivityTimer.restart();
-                } else if(myInactivityTimer.getElapsedTimeInSec() > 60.0) {
+                } else if(myInactivityTimer.getElapsedTimeInSec() > aTimeout) {
                     // perform delayed destruction on long inactivity
                     exit(0);
                 } else {
@@ -1024,7 +1077,7 @@
         return;
     }
 
-    myGUI->getCamera()->setView(theView);
+    myGUI->changeCamera()->setView(theView);
     if(theView == ST_DRAW_LEFT
     || theView == ST_DRAW_MONO) {
         if(!myWindow->isActive()) {
@@ -1032,7 +1085,7 @@
             StThread::sleep(200);
         }
 
-        myGUI->stglUpdate(myWindow->getMousePos());
+        myGUI->stglUpdate(myWindow->getMousePos(), myWindow->isPreciseCursor());
 
         // check for mono state
         bool hasStereoSource = false;
@@ -1056,6 +1109,18 @@
     myToRecreateMenu = true;
 }
 
+void StImageViewer::doChangeMobileUI(const bool ) {
+    params.IsMobileUISwitch->setValue(toUseMobileUI());
+}
+
+void StImageViewer::doHideSystemBars(const bool ) {
+    if(myWindow.isNull()) {
+        return;
+    }
+
+    myWindow->setHideSystemBars(params.ToHideStatusBar->getValue(), params.ToHideNavBar->getValue());
+}
+
 void StImageViewer::doScaleHiDPI(const bool ) {
     if(myGUI.isNull()) {
         return;
@@ -1083,9 +1148,9 @@
     bool isChanged = false;
     StGLFrameTextures& aTexture = myGUI->myImage->getTextureQueue()->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE);
     if(aTexture.getPlane(0).getTarget() == GL_TEXTURE_CUBE_MAP) {
-        isChanged = (theMode != StStereoParams::PANORAMA_CUBEMAP);
+        isChanged = (theMode != StViewSurface_Cubemap);
     } else {
-        isChanged = (theMode == StStereoParams::PANORAMA_CUBEMAP);
+        isChanged = (theMode == StViewSurface_Cubemap);
     }
 
     if(isChanged
@@ -1107,8 +1172,8 @@
     }
 
     int aMode = myGUI->myImage->params.ViewMode->getValue();
-    if(aMode != StStereoParams::FLAT_IMAGE) {
-        myGUI->myImage->params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+    if(aMode != StViewSurface_Plain) {
+        myGUI->myImage->params.ViewMode->setValue(StViewSurface_Plain);
         return;
     }
 
@@ -1116,15 +1181,47 @@
                                          aParams->Src1SizeX, aParams->Src1SizeY,
                                          aParams->Src2SizeX, aParams->Src2SizeY);
     myGUI->myImage->params.ViewMode->setValue(aPano == StPanorama_Cubemap6_1 || aPano == StPanorama_Cubemap3_2
-                                            ? StStereoParams::PANORAMA_CUBEMAP
-                                            : StStereoParams::PANORAMA_SPHERE);
+                                            ? StViewSurface_Cubemap
+                                            : StViewSurface_Sphere);
+}
+
+void StImageViewer::doChangeStickPano360(const bool ) {
+    if(myLoader.isNull()) {
+        return;
+    }
+
+    myLoader->setStickPano360(params.ToStickPanorama->getValue());
+    if(!params.ToStickPanorama->getValue()) {
+        return;
+    }
+
+    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
+    if(!aParams.isNull()
+    &&  myGUI->myImage->params.ViewMode->getValue() == StViewSurface_Plain
+    && !myPlayList->isEmpty()) {
+        myLoader->doLoadNext();
+    }
+}
+
+void StImageViewer::doChangeFlipCubeZ(const bool ) {
+    if(myLoader.isNull()) {
+        return;
+    }
+
+    myLoader->setFlipCubeZ6x1(params.ToFlipCubeZ6x1->getValue());
+    myLoader->setFlipCubeZ3x2(params.ToFlipCubeZ3x2->getValue());
 }
 
 void StImageViewer::doOpen1FileFromGui(StHandle<StString> thePath) {
     myOpenDialog->setPaths(*thePath, "");
 }
 
-void StImageViewer::doOpen1FileDialog(const size_t ) {
+void StImageViewer::doOpen1FileAction(const size_t ) {
+    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+        myGUI->doOpenFile(0);
+        return;
+    }
+
     myOpenDialog->openDialog(1);
 }
 
@@ -1230,6 +1327,15 @@
     myGUI->myPlayList->setOpacity(theToShow ? 1.0f : 0.0f, false);
 }
 
+void StImageViewer::doShowAdjustImage(const bool theToShow) {
+    if(myGUI.isNull()
+    || myGUI->myAdjustOverlay == NULL) {
+        return;
+    }
+
+    myGUI->myAdjustOverlay->setOpacity(theToShow ? 1.0f : 0.0f, false);
+}
+
 void StImageViewer::doFileNext() {
     if(myLoader.isNull()) {
         return;

sview-16_06.tar.gz/StImageViewer/StImageViewer.h -> sview-17_04.tar.gz/StImageViewer/StImageViewer.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@
         public: //! @name callback Slots
 
     ST_LOCAL void doOpen1FileFromGui(StHandle<StString> thePath);
-    ST_LOCAL void doOpen1FileDialog(const size_t dummy = 0);
+    ST_LOCAL void doOpen1FileAction(const size_t dummy = 0);
     ST_LOCAL void doOpen2FilesDialog(const size_t dummy = 0);
     ST_LOCAL void doSaveImageAs(const size_t theImgType) { myLoader->doSaveImageAs(theImgType); }
     ST_LOCAL void doSaveImageInfo(const size_t theToSave);
@@ -131,13 +131,21 @@
         StHandle<StEnumParam>         CheckUpdatesDays; //!< days count between updates checks
         StHandle<StInt32ParamNamed>   LastUpdateDay;    //!< the last time update has been checked
         StHandle<StInt32ParamNamed>   SrcStereoFormat;  //!< source format
+        StHandle<StBoolParamNamed>    ToStickPanorama;  //!< force panorama input for all files
+        StHandle<StBoolParamNamed>    ToFlipCubeZ6x1;   //!< flip Z coordinate within Cube map 6x1
+        StHandle<StBoolParamNamed>    ToFlipCubeZ3x2;   //!< flip Z coordinate within Cube map 3x2
         StHandle<StBoolParamNamed>    ToTrackHead;      //!< enable/disable head-tracking
         StHandle<StBoolParamNamed>    ToShowMenu;       //!< show main menu
         StHandle<StBoolParamNamed>    ToShowTopbar;     //!< show topbar
         StHandle<StBoolParamNamed>    ToShowPlayList;   //!< display playlist
+        StHandle<StBoolParamNamed>    ToShowAdjustImage;//!< display image adjustment overlay
         StHandle<StBoolParamNamed>    ToShowFps;        //!< display FPS meter
-        StHandle<StBoolParamNamed>    IsMobileUI;       //!< display mobile interface
+        StHandle<StBoolParamNamed>    IsMobileUI;       //!< display mobile interface (user option)
+        StHandle<StBoolParam>         IsMobileUISwitch; //!< display mobile interface (actual value)
+        StHandle<StBoolParamNamed>    ToHideStatusBar;  //!< hide system-provided status bar
+        StHandle<StBoolParamNamed>    ToHideNavBar;     //!< hide system-provided navigation bar
         StHandle<StBoolParamNamed>    IsVSyncOn;        //!< flag to use VSync
+        StHandle<StBoolParamNamed>    ToOpenLast;       //!< option to open last file from recent list by default
         StHandle<StBoolParamNamed>    ToSaveRecent;     //!< load/save recent file
         StString                      lastFolder;       //!< laster folder used to open / save file
         StImageFile::ImageClass       imageLib;         //!< preferred image library
@@ -146,6 +154,21 @@
     } params;
 
     /**
+     * Return true if mobile UI should be enabled considering user option and window margins.
+     */
+    ST_LOCAL bool toUseMobileUI() const {
+        return toUseMobileUI(!myWindow.isNull() ? myWindow->getMargins() : StMarginsI());
+    }
+
+    /**
+     * Return true if mobile UI should be enabled considering user option and window margins.
+     */
+    ST_LOCAL bool toUseMobileUI(const StMarginsI& theMargins) const {
+        return params.IsMobileUI->getValue()
+            || theMargins.top > 0;
+    }
+
+    /**
      * Retrieve current playlist item.
      */
     ST_LOCAL bool getCurrentFile(StHandle<StFileNode>&     theFileNode,
@@ -156,13 +179,18 @@
 
     ST_LOCAL virtual void doChangeLanguage(const int32_t ) ST_ATTR_OVERRIDE;
     ST_LOCAL void doScaleGui(const int32_t );
+    ST_LOCAL void doChangeMobileUI(const bool theIsOn);
+    ST_LOCAL void doHideSystemBars(const bool theToHide);
     ST_LOCAL void doScaleHiDPI(const bool );
     ST_LOCAL void doSwitchVSync(const bool theValue);
     ST_LOCAL void doFullscreen(const bool theIsFullscreen);
     ST_LOCAL void doSwitchSrcFormat(const int32_t theSrcFormat);
     ST_LOCAL void doSwitchViewMode(const int32_t theMode);
     ST_LOCAL void doPanoramaOnOff(const size_t );
+    ST_LOCAL void doChangeStickPano360(const bool );
+    ST_LOCAL void doChangeFlipCubeZ(const bool );
     ST_LOCAL void doShowPlayList(const bool theToShow);
+    ST_LOCAL void doShowAdjustImage(const bool theToShow);
     ST_LOCAL void doFileNext();
 
         public:

sview-16_06.tar.gz/StImageViewer/StImageViewer.rc -> sview-17_04.tar.gz/StImageViewer/StImageViewer.rc Changed

sview-16_06.tar.gz/StImageViewer/StImageViewer.vcxproj.user -> sview-17_04.tar.gz/StImageViewer/StImageViewer.vcxproj.user Changed

sview-16_06.tar.gz/StImageViewer/StImageViewerGUI.cpp -> sview-17_04.tar.gz/StImageViewer/StImageViewerGUI.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,25 +74,30 @@
         myFpsWidget = new StGLFpsLabel(this);
     }
 
+    createImageAdjustments();
     createUpperToolbar();
 
-    const StMarginsI& aRootMargins = getRootMargins();
     StMarginsI aButtonMargins;
     const IconSize anIconSize = scaleIcon(32, aButtonMargins);
     const int      anIconStep = scale(32);
 
-    myPanelBottom = new StGLContainer(this, aRootMargins.left, -aRootMargins.bottom, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(32));
+    myPanelBottom = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(32));
     int aBottomBarNbRight = 0;
     const int aRight  = -scale(8);
     const int aBottom = -scale(8);
     if(myWindow->hasFullscreenMode()) {
-        myBtnFull = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.IsFullscreen,
-                                             iconTexture(stCString("actionVideoFullscreenOff"), anIconSize),
-                                             iconTexture(stCString("actionVideoFullscreenOn"),  anIconSize),
-                                             (aBottomBarNbRight++) * (-anIconStep) + aRight, aBottom,
-                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+        myBtnFull = new StGLTextureButton(myPanelBottom, (aBottomBarNbRight++) * (-anIconStep) + aRight, aBottom,
+                                          StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT), 4);
+        myBtnFull->setAction(myPlugin->getAction(StImageViewer::Action_Fullscreen));
+        const StString aSrcTextures[4] = {
+            iconTexture(stCString("actionVideoFullscreenOff"),   anIconSize),
+            iconTexture(stCString("actionVideoFullscreenOn"),    anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOff"), anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOn"),  anIconSize)
+        };
+        myBtnFull->setTexturePath(aSrcTextures, 4);
+
         myBtnFull->setDrawShadow(true);
-        myBtnFull->setFalseOpacity(1.0f);
         myBtnFull->changeMargins() = aButtonMargins;
     }
 
@@ -130,12 +135,11 @@
     const int      anIconStep = scale(48);
     aButtonMargins.extend(scale(8));
 
-    const StMarginsI& aMargins = getRootMargins();
-    myPanelUpper = new StGLContainer(this, aMargins.left, aMargins.top, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(128));
+    myPanelUpper = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(128));
 
     // append textured buttons
     myBtnOpen   = new StGLTextureButton(myPanelUpper, aLeft + (aBtnIter++) * anIconStep, aTop);
-    myBtnOpen->signals.onBtnClick.connect(myPlugin, &StImageViewer::doOpen1FileDialog);
+    myBtnOpen->signals.onBtnClick.connect(myPlugin, &StImageViewer::doOpen1FileAction);
     myBtnOpen->setTexturePath(iconTexture(stCString("actionOpen"), anIconSize));
     myBtnOpen->setDrawShadow(true);
     myBtnOpen->changeMargins() = aButtonMargins;
@@ -198,14 +202,21 @@
     myBtnPanorama->signals.onBtnClick += stSlot(this, &StImageViewerGUI::doPanoramaCombo);
     myBtnPanorama->setDrawShadow(true);
     myBtnPanorama->changeMargins() = aButtonMargins;
+
+    myBtnAdjust = new StGLCheckboxTextured(myPanelUpper, myPlugin->params.ToShowAdjustImage,
+                                           iconTexture(stCString("actionColorAdjustOff"), anIconSize),
+                                           iconTexture(stCString("actionColorAdjust"),    anIconSize),
+                                           aLeft + (aBtnIter++) * anIconStep, aTop,
+                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnAdjust->setDrawShadow(true);
+    myBtnAdjust->changeMargins() = aButtonMargins;
 }
 
 /**
  * Main menu
  */
 void StImageViewerGUI::createMainMenu() {
-    const StMarginsI& aMargins = getRootMargins();
-    myMenuRoot = new StGLMenu(this, aMargins.left, aMargins.top, StGLMenu::MENU_HORIZONTAL, true);
+    myMenuRoot = new StGLMenu(this, 0, 0, StGLMenu::MENU_HORIZONTAL, true);
 
     StGLMenu* aMenuMedia   = createMediaMenu();  // Root -> Media  menu
     StGLMenu* aMenuView    = createViewMenu();   // Root -> View   menu
@@ -252,7 +263,7 @@
 StGLMenu* StImageViewerGUI::createOpenImageMenu() {
     StGLMenu* menu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
     menu->addItem(tr(MENU_MEDIA_OPEN_IMAGE_1), 1)
-        ->signals.onItemClick.connect(myPlugin, &StImageViewer::doOpen1FileDialog);
+        ->signals.onItemClick.connect(myPlugin, &StImageViewer::doOpen1FileAction);
     menu->addItem(tr(MENU_MEDIA_OPEN_IMAGE_2), 2)
         ->signals.onItemClick.connect(myPlugin, &StImageViewer::doOpen2FilesDialog);
     return menu;
@@ -380,15 +391,16 @@
 
 void StImageViewerGUI::fillPanoramaMenu(StGLMenu* theMenu) {
     theMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
-                     myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
+                     myImage->params.ViewMode, StViewSurface_Plain);
     theMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
-                     myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
+                     myImage->params.ViewMode, StViewSurface_Sphere);
     theMenu->addItem(tr(MENU_VIEW_SURFACE_CUBEMAP),
-                     myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
+                     myImage->params.ViewMode, StViewSurface_Cubemap);
     if(myWindow->hasOrientationSensor()) {
         theMenu->addItem(tr(myWindow->isPoorOrientationSensor() ? MENU_VIEW_TRACK_HEAD_POOR : MENU_VIEW_TRACK_HEAD),
                          myPlugin->params.ToTrackHead);
     }
+    theMenu->addItem(myPlugin->params.ToStickPanorama);
 }
 
 void StImageViewerGUI::doPanoramaCombo(const size_t ) {
@@ -534,7 +546,7 @@
     const StGLVec3 THE_WHITE(1.0f, 1.0f, 1.0f);
     const StString anAbout = tr(ABOUT_DPLUGIN_NAME) + '\n'
                            + tr(ABOUT_VERSION) + " " + StVersionInfo::getSDKVersionString()
-                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2007-2016", "kirill@sview.ru", "www.sview.ru");
+                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2007-2017", "kirill@sview.ru", "www.sview.ru");
 
     StArgumentsMap anInfo;
     anInfo.add(StDictEntry("CPU cores", StString(StThread::countLogicalProcessors()) + StString(" logical processor(s)")));
@@ -589,7 +601,12 @@
     // translate known metadata tag names
     for(size_t aMapIter = 0; aMapIter < anExtraInfo->Info.size(); ++aMapIter) {
         StDictEntry& anEntry = anExtraInfo->Info.changeValue(aMapIter);
+        const size_t aSize = anEntry.getValue().getSize();
         anEntry.changeName() = myLangMap->getValue(anEntry.getKey());
+        if(aSize > 16384) {
+            // cut too long strings
+            anEntry.changeValue() = anEntry.getValue().subString(0, 128) + "\n...[" + (aSize / 1024) + " KiB]";
+        }
     }
     const int aWidthMax  = aDialog->getContent()->getRectPx().width();
     int       aRowLast   = (int )anExtraInfo->Info.size();
@@ -765,9 +782,18 @@
     aParams.add(myPlugin->StApplication::params.ActiveDevice);
     aParams.add(myImage->params.DisplayMode);
     aRend->getOptions(aParams);
+    aParams.add(myPlugin->params.ToStickPanorama);
+    aParams.add(myPlugin->params.ToFlipCubeZ6x1);
+    aParams.add(myPlugin->params.ToFlipCubeZ3x2);
     aParams.add(myPlugin->params.ToShowFps);
     aParams.add(myLangMap->params.language);
     aParams.add(myPlugin->params.IsMobileUI);
+    if(isMobile()) {
+        //aParams.add(myPlugin->params.ToHideStatusBar);
+        aParams.add(myPlugin->params.ToHideNavBar);
+    } else {
+        aParams.add(myPlugin->params.ToOpenLast);
+    }
     aParams.add(myPlugin->params.ExitOnEscape);
 #if !defined(ST_NO_UPDATES_CHECK)
     aParams.add(myPlugin->params.CheckUpdatesDays);
@@ -853,6 +879,7 @@
 }
 
 void StImageViewerGUI::createMobileUI(const StHandle<StPlayList>& thePlayList) {
+    createImageAdjustments();
     createMobileUpperToolbar();
     createMobileBottomToolbar();
 
@@ -878,8 +905,7 @@
     const int      anIconStep = scale(56);
     aButtonMargins.extend(scale(12));
 
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelUpper = new StGLContainer(this, aRootMargins.left, aRootMargins.top, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
+    myPanelUpper = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     int aBtnIter = 0;
 
@@ -930,6 +956,14 @@
     myBtnPanorama->setDrawShadow(true);
     myBtnPanorama->changeMargins() = aButtonMargins;
 
+    myBtnAdjust = new StGLCheckboxTextured(myPanelUpper, myPlugin->params.ToShowAdjustImage,
+                                           iconTexture(stCString("actionColorAdjustOff"), anIconSize),
+                                           iconTexture(stCString("actionColorAdjust"),    anIconSize),
+                                           (aBtnIter++) * anIconStep, 0,
+                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnAdjust->setDrawShadow(true);
+    myBtnAdjust->changeMargins() = aButtonMargins;
+
     aBtnIter = 0;
     StGLTextureButton* aBtnEx = new StGLTextureButton(myPanelUpper, (aBtnIter--) * (-anIconStep), 0,
                                                       StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
@@ -948,8 +982,7 @@
     const int      anIconStep = scale(56);
     aButtonMargins.extend(scale(12));
 
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelBottom = new StGLContainer(this, aRootMargins.left, -aRootMargins.bottom, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
+    myPanelBottom = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     int aBtnIter = 0;
     myBtnPrev = new StGLTextureButton(myPanelBottom, (aBtnIter++) * anIconStep, 0);
@@ -971,6 +1004,21 @@
     myBtnInfo->changeMargins() = aButtonMargins;
 
     aBtnIter = 0;
+    if(myWindow->hasFullscreenMode()) {
+        myBtnFull = new StGLTextureButton(myPanelBottom, (aBtnIter++) * (-anIconStep), 0,
+                                          StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT), 4);
+        myBtnFull->setAction(myPlugin->getAction(StImageViewer::Action_Fullscreen));
+        const StString aSrcTextures[4] = {
+            iconTexture(stCString("actionVideoFullscreenOff"),   anIconSize),
+            iconTexture(stCString("actionVideoFullscreenOn"),    anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOff"), anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOn"),  anIconSize)
+        };
+        myBtnFull->setTexturePath(aSrcTextures, 4);
+        myBtnFull->setDrawShadow(true);
+        myBtnFull->changeMargins() = aButtonMargins;
+    }
+
     StGLTextureButton* aBtnZoomIn = new StGLTextureButton(myPanelBottom, (aBtnIter++) * (-anIconStep), 0,
                                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
     aBtnZoomIn->changeMargins() = aButtonMargins;
@@ -996,12 +1044,109 @@
     myBtnList->changeMargins() = aButtonMargins;
 }
 
-void StImageViewerGUI::doOpenFile(const size_t ) {
-    /*if(!isMobile()) {
-        myPlugin->doOpen1FileDialog();
-        return;
-    }*/
+/**
+ * Create image adjustments control
+ */
+void StImageViewerGUI::createImageAdjustments() {
+    StMarginsI aButtonMargins;
+    const IconSize anIconSize = scaleIcon(32, aButtonMargins);
+    const int      anIconStep = scale(isMobile() ? 56 : 48);
+    const int      aCtrlStep  = scale(36);
+    const int      aSlideWidth = anIconStep * 4;
+    aButtonMargins.extend(scale(isMobile() ? 12 : 8));
+
+    myAdjustOverlay = new StGLContainer(this,
+                                        isMobile() ? anIconStep / 2 : scale(DISPL_X_REGION_UPPER),
+                                        isMobile() ? scale(56) : scale(72),
+                                        StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                                        scale(4096), aCtrlStep * 6 + anIconStep);
+    myAdjustOverlay->setOpacity(myPlugin->params.ToShowAdjustImage->getValue() ? 1.0f : 0.0f, false);
 
+    int aBtnIter = 0;
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Gamma,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_GAMMA) + ": %+01.2f");
+    }
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Brightness,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_BRIGHTNESS) + ": %+01.2f");
+    }
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Saturation,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_SATURATION) + ": %+01.2f");
+    }
+    myBtnResetColor1 = new StGLTextureButton(myAdjustOverlay, anIconStep * 1, aCtrlStep * aBtnIter);
+    myBtnResetColor1->setAction(myPlugin->getAction(StImageViewer::Action_ImageAdjustReset));
+    myBtnResetColor1->setTexturePath(iconTexture(stCString("actionColorReset"), anIconSize));
+    myBtnResetColor1->setDrawShadow(true);
+    myBtnResetColor1->changeMargins() = aButtonMargins;
+    myBtnResetColor1->setOpacity(0.0f, false);
+
+    myBtnSepDx = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationDX,
+                                           0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                           StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepDx->changeRectPx().right() = myBtnSepDx->getRectPx().left() + aSlideWidth;
+    myBtnSepDx->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepDx->changeMargins().left   = scale(8);
+    myBtnSepDx->changeMargins().right  = scale(8);
+    myBtnSepDx->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepDx->setFormat(stCString("DX Separation: %+01.0f"));
+
+    myBtnSepDy = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationDY,
+                                           0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                           StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepDy->changeRectPx().right() = myBtnSepDy->getRectPx().left() + aSlideWidth;
+    myBtnSepDy->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepDy->changeMargins().left   = scale(8);
+    myBtnSepDy->changeMargins().right  = scale(8);
+    myBtnSepDy->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepDy->setFormat(stCString("DY Separation: %+01.0f"));
+
+    myBtnSepRot = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationRot,
+                                                              0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                              StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepRot->changeRectPx().right() = myBtnSepRot->getRectPx().left() + aSlideWidth;
+    myBtnSepRot->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepRot->changeMargins().left   = scale(8);
+    myBtnSepRot->changeMargins().right  = scale(8);
+    myBtnSepRot->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepRot->setFormat(stCString("Angular Sep.: %+01.2f"));
+
+    myBtnResetColor2 = new StGLTextureButton(myAdjustOverlay, anIconStep * 1, aCtrlStep * aBtnIter);
+    myBtnResetColor2->setAction(myPlugin->getAction(StImageViewer::Action_ImageAdjustReset));
+    myBtnResetColor2->setTexturePath(iconTexture(stCString("actionColorReset"), anIconSize));
+    myBtnResetColor2->setDrawShadow(true);
+    myBtnResetColor2->changeMargins() = aButtonMargins;
+
+    myBtnReset3d = new StGLTextureButton(myAdjustOverlay, anIconStep * 2, aCtrlStep * aBtnIter);
+    myBtnReset3d->setAction(myImage->getActions()[StGLImageRegion::Action_Reset]);
+    myBtnReset3d->setTexturePath(iconTexture(stCString("actionResetPlacement"), anIconSize));
+    myBtnReset3d->setDrawShadow(true);
+    myBtnReset3d->changeMargins() = aButtonMargins;
+}
+
+void StImageViewerGUI::doOpenFile(const size_t ) {
     StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
     aDialog->setMimeList(myPlugin->myLoader->getMimeList());
 #if defined(_WIN32)
@@ -1078,10 +1223,18 @@
   //
   myPanelUpper(NULL),
   myPanelBottom(NULL),
+  myAdjustOverlay(NULL),
+  myBtnSepDx(NULL),
+  myBtnSepDy(NULL),
+  myBtnSepRot(NULL),
+  myBtnReset3d(NULL),
+  myBtnResetColor1(NULL),
+  myBtnResetColor2(NULL),
   myBtnOpen(NULL),
   myBtnPrev(NULL),
   myBtnNext(NULL),
   myBtnInfo(NULL),
+  myBtnAdjust(NULL),
   myBtnSwapLR(NULL),
   myBtnPanorama(NULL),
   myBtnSrcFrmt(NULL),
@@ -1095,9 +1248,8 @@
   myIsMinimalGUI(true) {
     const GLfloat aScale = myPlugin->params.ScaleHiDPI2X->getValue() ? 2.0f : myPlugin->params.ScaleHiDPI ->getValue();
     setScale(aScale, (StGLRootWidget::ScaleAdjust )myPlugin->params.ScaleAdjust->getValue());
-    setMobile(myPlugin->params.IsMobileUI->getValue());
+    setMobile(myPlugin->params.IsMobileUISwitch->getValue());
 
-    changeRootMargins() = myWindow->getMargins();
     myPlugin->params.ToShowFps->signals.onChanged.connect(this, &StImageViewerGUI::doShowFPS);
 
     StHandle<StGLTextureQueue> aTextureQueue = theTextureQueue;
@@ -1161,6 +1313,7 @@
 
 void StImageViewerGUI::setVisibility(const StPointD_t& theCursor,
                                      bool              toForceHide) {
+    const bool toShowAdjust   = myPlugin->params.ToShowAdjustImage->getValue();
     const bool toShowPlayList = myPlugin->params.ToShowPlayList->getValue();
     const bool hasMainMenu    =  myPlugin->params.ToShowMenu->getValue()
                              &&  myMenuRoot != NULL;
@@ -1172,6 +1325,16 @@
     const bool isMouseActive  = myWindow->isMouseMoved();
 
     StHandle<StStereoParams> aParams = myImage->getSource();
+    StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
+    if(aSrcFormat == StFormat_AUTO
+    && !aParams.isNull()) {
+        aSrcFormat = aParams->StereoFormat;
+    }
+    if(!aParams.isNull()
+     && myImage->params.SwapLR->getValue()) {
+        aSrcFormat = st::formatReversed(aSrcFormat);
+    }
+
     const double aStillTime = myVisibilityTimer.getElapsedTime();
     myIsVisibleGUI = isMouseActive
         || aParams.isNull()
@@ -1196,6 +1359,19 @@
     if(myPanelBottom != NULL) {
         myPanelBottom->setOpacity(hasBottomPanel ? anOpacity : 0.0f, true);
     }
+    if(myAdjustOverlay != NULL
+    && toShowAdjust) {
+        myAdjustOverlay->setOpacity(anOpacity, true);
+        if(aSrcFormat == StFormat_Mono) {
+            myBtnSepDx  ->setOpacity(0.0f, false);
+            myBtnSepDy  ->setOpacity(0.0f, false);
+            myBtnSepRot ->setOpacity(0.0f, false);
+            myBtnReset3d->setOpacity(0.0f, false);
+            myBtnResetColor2->setOpacity(0.0f, false);
+        } else {
+            myBtnResetColor1->setOpacity(0.0f, false);
+        }
+    }
     if(myPlayList != NULL
     && toShowPlayList) {
         myPlayList->setOpacity(anOpacity, true);
@@ -1205,6 +1381,12 @@
         && myPanelBottom != NULL) {
             myPanelBottom->setOpacity(1.0f, false);
         }
+
+        int aFirstFace = 0;
+        if(myWindow->isStereoFullscreenOnly() && myWindow->isStereoOutput()) {
+            aFirstFace = 2;
+        }
+        myBtnFull->setFaceId(aFirstFace + (myPlugin->params.IsFullscreen->getValue() ? 1 : 0));
         myBtnFull->setOpacity(myIsMinimalGUI ? 1.0f : anOpacity, false);
     }
 
@@ -1218,15 +1400,6 @@
                                 || aCurrPos == StPlayList::CurrentPosition_First ? 1.0f : 0.5f);
     }
 
-    StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
-    if(aSrcFormat == StFormat_AUTO
-    && !aParams.isNull()) {
-        aSrcFormat = aParams->StereoFormat;
-    }
-    if(!aParams.isNull()
-     && myImage->params.SwapLR->getValue()) {
-        aSrcFormat = st::formatReversed(aSrcFormat);
-    }
     if(myBtnSrcFrmt != NULL) {
         myBtnSrcFrmt->setFaceId(aSrcFormat != StFormat_AUTO ? aSrcFormat : StFormat_Mono);
     }
@@ -1234,10 +1407,10 @@
         myBtnSwapLR->setOpacity(aSrcFormat != StFormat_Mono ? myPanelUpper->getOpacity() : 0.0f, false);
     }
 
-    const StStereoParams::ViewMode aViewMode = !aParams.isNull()
-                                             ? aParams->ViewingMode
-                                             : StStereoParams::FLAT_IMAGE;
-    bool toShowPano = aViewMode != StStereoParams::FLAT_IMAGE;
+    const StViewSurface aViewMode = !aParams.isNull()
+                                  ? aParams->ViewingMode
+                                  : StViewSurface_Plain;
+    bool toShowPano = aViewMode != StViewSurface_Plain;
     if(!toShowPano
     && !aParams.isNull()
     &&  st::probePanorama(aParams->StereoFormat,
@@ -1246,10 +1419,10 @@
         toShowPano = true;
     }
     if(myBtnPanorama != NULL) {
-        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StStereoParams::FLAT_IMAGE);
+        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StViewSurface_Plain);
         myBtnPanorama->setOpacity(toShowPano ? myPanelUpper->getOpacity() : 0.0f, false);
     }
-    myWindow->setTrackOrientation(aViewMode != StStereoParams::FLAT_IMAGE
+    myWindow->setTrackOrientation(aViewMode != StViewSurface_Plain
                                && myPlugin->params.ToTrackHead->getValue());
     StQuaternion<double> aQ = myWindow->getDeviceOrientation();
     myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
@@ -1273,12 +1446,14 @@
             myDescr->setText(tr(FULLSCREEN));
         } else if(::isPointIn(myBtnSrcFrmt, theCursor)) {
             myDescr->setText(tr(BTN_SRC_FORMAT) + "\n" + trSrcFormat(aSrcFormat));
+        } else if(::isPointIn(myBtnAdjust, theCursor)) {
+            myDescr->setText(tr(MENU_VIEW_IMAGE_ADJUST));
         } else if(::isPointIn(myBtnPanorama, theCursor)) {
             size_t aTrPano = MENU_VIEW_SURFACE_PLANE;
             switch(aViewMode) {
-                case StStereoParams::FLAT_IMAGE:       aTrPano = MENU_VIEW_SURFACE_PLANE;   break;
-                case StStereoParams::PANORAMA_SPHERE:  aTrPano = MENU_VIEW_SURFACE_SPHERE;  break;
-                case StStereoParams::PANORAMA_CUBEMAP: aTrPano = MENU_VIEW_SURFACE_CUBEMAP; break;
+                case StViewSurface_Plain:   aTrPano = MENU_VIEW_SURFACE_PLANE;   break;
+                case StViewSurface_Sphere:  aTrPano = MENU_VIEW_SURFACE_SPHERE;  break;
+                case StViewSurface_Cubemap: aTrPano = MENU_VIEW_SURFACE_CUBEMAP; break;
             }
             myDescr->setText(tr(MENU_VIEW_PANORAMA) + "\n" + tr(aTrPano));
         } else {
@@ -1298,50 +1473,36 @@
     }
 }
 
-void StImageViewerGUI::stglUpdate(const StPointD_t& pointZo) {
-    StGLRootWidget::stglUpdate(pointZo);
+void StImageViewerGUI::stglUpdate(const StPointD_t& thePointZo,
+                                  bool theIsPreciseInput) {
+    StGLRootWidget::stglUpdate(thePointZo, theIsPreciseInput);
     if(myDescr != NULL) {
-        myDescr->setPoint(pointZo);
+        myDescr->setPoint(thePointZo);
     }
 }
 
-void StImageViewerGUI::stglResize(const StGLBoxPx& theRectPx) {
-    const int aSizeX = theRectPx.width();
-    const int aSizeY = theRectPx.height();
-    myImage->changeRectPx().bottom() = aSizeY;
-    myImage->changeRectPx().right()  = aSizeX;
+void StImageViewerGUI::stglResize(const StGLBoxPx&  theViewPort,
+                                  const StMarginsI& theMargins,
+                                  float theAspect) {
+    const int aNewSizeX  = theViewPort.width();
+    const int aNewSizeY  = theViewPort.height();
+    const int aWorkRight = stMax(aNewSizeX - theMargins.right - theMargins.left, 2);
 
-    const StMarginsI& aMargins = myWindow->getMargins();
-    const bool areNewMargins = aMargins != getRootMargins();
-    if(areNewMargins) {
-        changeRootMargins() = aMargins;
-    }
+    // image should fit entire view
+    myImage->changeRectPx().top()    = -theMargins.top;
+    myImage->changeRectPx().bottom() = -theMargins.top + aNewSizeY;
+    myImage->changeRectPx().left()   = -theMargins.left;
+    myImage->changeRectPx().right()  = -theMargins.left + aNewSizeX;
 
     if(myPanelUpper != NULL) {
-        myPanelUpper->changeRectPx().right() = aSizeX;
+        myPanelUpper->changeRectPx().right() = aWorkRight;
         myIsMinimalGUI = (myWindow->isMovable() || myWindow->hasFullscreenMode()) && !isMobile()
-                     && (aSizeY < scale(400) || aSizeX < scale(400));
+                     && (aNewSizeY < scale(400) || aNewSizeX < scale(400));
     }
     if(myPanelBottom != NULL) {
-        myPanelBottom->changeRectPx().right() = aSizeX;
+        myPanelBottom->changeRectPx().right() = aWorkRight;
     }
-    if(areNewMargins) {
-        if(myPanelUpper != NULL) {
-            myPanelUpper->changeRectPx().left() = aMargins.left;
-            myPanelUpper->changeRectPx().top()  = aMargins.top;
-        }
-        if(myPanelBottom != NULL) {
-            myPanelBottom->changeRectPx().left() = aMargins.left;
-            myPanelBottom->changeRectPx().top()  = aMargins.top;
-        }
-        if(myMenuRoot != NULL) {
-            myMenuRoot->changeRectPx().left() = aMargins.left;
-            myMenuRoot->changeRectPx().top()  = aMargins.top;
-            myMenuRoot->stglUpdateSubmenuLayout();
-        }
-    }
-
-    StGLRootWidget::stglResize(theRectPx);
+    StGLRootWidget::stglResize(theViewPort, theMargins, theAspect);
 }
 
 void StImageViewerGUI::stglDraw(unsigned int theView) {

sview-16_06.tar.gz/StImageViewer/StImageViewerGUI.h -> sview-17_04.tar.gz/StImageViewer/StImageViewerGUI.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
 class StGLFpsLabel;
 class StGLTable;
 class StGLPlayList;
+class StGLRangeFieldFloat32;
 class StPlayList;
 class StWindow;
 
@@ -94,8 +95,11 @@
                               const StHandle<StPlayList>&       thePlayList,
                               const StHandle<StGLTextureQueue>& theTextureQueue);
     ST_LOCAL virtual ~StImageViewerGUI();
-    ST_LOCAL virtual void stglUpdate(const StPointD_t& thePointZo) ST_ATTR_OVERRIDE;
-    ST_LOCAL virtual void stglResize(const StGLBoxPx& theRectPx) ST_ATTR_OVERRIDE;
+    ST_LOCAL virtual void stglUpdate(const StPointD_t& thePointZo,
+                                     bool theIsPreciseInput) ST_ATTR_OVERRIDE;
+    ST_LOCAL virtual void stglResize(const StGLBoxPx& theViewPort,
+                                     const StMarginsI& theMargins,
+                                     float theAspect) ST_ATTR_OVERRIDE;
     ST_LOCAL virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
 
     ST_LOCAL void setVisibility(const StPointD_t& theCursor,
@@ -168,6 +172,7 @@
 
     ST_LOCAL void      createMobileUpperToolbar();
     ST_LOCAL void      createMobileBottomToolbar();
+    ST_LOCAL void      createImageAdjustments();
 
         private: //! @name callback Slots
 
@@ -209,15 +214,25 @@
 
     StGLWidget*         myPanelUpper;       //!< upper  toolbar
     StGLWidget*         myPanelBottom;      //!< bottom toolbar
+
+    StGLWidget*         myAdjustOverlay;    //!< image adjustments control
+    StGLRangeFieldFloat32* myBtnSepDx;
+    StGLRangeFieldFloat32* myBtnSepDy;
+    StGLRangeFieldFloat32* myBtnSepRot;
+    StGLTextureButton*     myBtnReset3d;
+    StGLTextureButton*     myBtnResetColor1;
+    StGLTextureButton*     myBtnResetColor2;
+
     StGLTextureButton*  myBtnOpen;
     StGLTextureButton*  myBtnPrev;
     StGLTextureButton*  myBtnNext;
     StGLTextureButton*  myBtnInfo;
+    StGLTextureButton*  myBtnAdjust;
     StGLTextureButton*  myBtnSwapLR;
     StGLCheckboxTextured* myBtnPanorama;
     StGLTextureButton*  myBtnSrcFrmt;
     StGLTextureButton*  myBtnList;
-    StGLCheckboxTextured* myBtnFull;
+    StGLTextureButton*  myBtnFull;
     StGLFpsLabel*       myFpsWidget;
 
     StGLTable*          myHKeysTable;

sview-16_06.tar.gz/StImageViewer/StImageViewerStrings.cpp -> sview-17_04.tar.gz/StImageViewer/StImageViewerStrings.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,9 @@
 #include "StImageViewer.h"
 #include <StStrings/StLangMap.h>
 
+// Degree sign in UTF-8 encoding.
+#define THE_DEGREE_SIGN "\xC2\xB0"
+
 namespace StImageViewerStrings {
 
 inline void addAction(StLangMap&              theStrings,
@@ -124,6 +127,12 @@
                "Track orientation");
     theStrings(MENU_VIEW_TRACK_HEAD_POOR,
                "Track orientation (poor)");
+    theStrings(MENU_VIEW_STICK_PANORAMA360,
+               "Stick at panorama 360" THE_DEGREE_SIGN);
+    theStrings(MENU_VIEW_FLIPZ_CUBE6x1,
+               "Cubemap 6x1 - flip Z");
+    theStrings(MENU_VIEW_FLIPZ_CUBE3x2,
+               "Cubemap 3x2 - flip Z");
     theStrings(MENU_VIEW_DISPLAY_MODE_STEREO,
                "Stereo");
     theStrings(MENU_VIEW_DISPLAY_MODE_LEFT,
@@ -224,6 +233,10 @@
                "Double click");
     theStrings(OPTION_EXIT_ON_ESCAPE_WINDOWED,
                "When windowed");
+    theStrings(OPTION_HIDE_NAVIGATION_BAR,
+               "Hide system navigation bar");
+    theStrings(OPTION_OPEN_LAST_ON_STARTUP,
+               "Open last viewed file on startup");
 
     theStrings(UPDATES_NOTIFY,
                "A new version of sView is available on the official site www.sview.ru.\n"
@@ -390,10 +403,10 @@
               "Angular separation - increase");
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_Rot90Counter,
               "DoParamsRotZ90Dec",
-              "Rotate 90 degrees counterclockwise");
+              "Rotate 90" THE_DEGREE_SIGN " counterclockwise");
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_Rot90Clockwise,
               "DoParamsRotZ90Inc",
-              "Rotate 90 degrees clockwise");
+              "Rotate 90" THE_DEGREE_SIGN " clockwise");
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_RotCounter,
               "DoParamsRotZDec",
               "Rotate counterclockwise");

sview-16_06.tar.gz/StImageViewer/StImageViewerStrings.h -> sview-17_04.tar.gz/StImageViewer/StImageViewerStrings.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StImageViewer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,6 +96,9 @@
         MENU_VIEW_SURFACE_CUBEMAP   = 1283,
         MENU_VIEW_TRACK_HEAD        = 1285,
         MENU_VIEW_TRACK_HEAD_POOR   = 1286,
+        MENU_VIEW_STICK_PANORAMA360 = 1288,
+        MENU_VIEW_FLIPZ_CUBE6x1     = 1291,
+        MENU_VIEW_FLIPZ_CUBE3x2     = 1292,
 
         // Root -> Output -> Change Device menu
         MENU_CHANGE_DEVICE  = 1400,
@@ -133,6 +136,8 @@
         OPTION_EXIT_ON_ESCAPE_ONE_CLICK    = 1703,
         OPTION_EXIT_ON_ESCAPE_DOUBLE_CLICK = 1704,
         OPTION_EXIT_ON_ESCAPE_WINDOWED     = 1705,
+        OPTION_HIDE_NAVIGATION_BAR         = 1710,
+        OPTION_OPEN_LAST_ON_STARTUP        = 1711,
 
         // Open/Save dialogs
         DIALOG_OPEN_FILE       = 2000,

sview-16_06.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/czech/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/czech/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/english/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/english/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/french/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/french/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/german/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/german/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/korean/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/korean/StImageViewer.lng Changed

sview-16_06.tar.gz/StImageViewer/lang/russian/StImageViewer.lng -> sview-17_04.tar.gz/StImageViewer/lang/russian/StImageViewer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayer.cbp -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayer.cbp Changed

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayer.cpp -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayer.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,6 +72,7 @@
     static const char ST_ARGUMENT_FILE_LEFT[]  = "left";
     static const char ST_ARGUMENT_FILE_RIGHT[] = "right";
     static const char ST_ARGUMENT_FILE_LAST[]  = "last";
+    static const char ST_ARGUMENT_FILE_DEMO[]  = "demo";
     static const char ST_ARGUMENT_FILE_PAUSE[] = "pause";
     static const char ST_ARGUMENT_FILE_PAUSED[]= "paused";
     static const char ST_ARGUMENT_MONITOR[]    = "monitorId";
@@ -106,6 +107,10 @@
     params.SubtitlesParser->setName(tr(MENU_SUBTITLES_PARSER));
     params.SubtitlesParser->defineOption(0, tr(MENU_SUBTITLES_PLAIN_TEXT));
     params.SubtitlesParser->defineOption(1, tr(MENU_SUBTITLES_LITE_HTML));
+    params.AudioAlHrtf->setName(stCString("Audio HRTF mixing"));
+    params.AudioAlHrtf->defineOption(0, stCString("Auto"));
+    params.AudioAlHrtf->defineOption(1, stCString("Forced ON"));
+    params.AudioAlHrtf->defineOption(2, stCString("Forced OFF"));
     params.AudioMute->setName(stCString("Mute Audio"));
     params.IsFullscreen->setName(tr(MENU_VIEW_FULLSCREEN));
 
@@ -127,7 +132,11 @@
     params.LastUpdateDay->setName(tr(MENU_HELP_UPDATES));
     params.SrcStereoFormat->setName(tr(MENU_MEDIA_SRC_FORMAT));
     params.ToShowPlayList->setName(tr(VIDEO_LIST));
+    params.ToShowAdjustImage->setName(tr(MENU_VIEW_IMAGE_ADJUST));
+    params.ToStickPanorama->setName(tr(MENU_VIEW_STICK_PANORAMA360));
     params.ToTrackHead->setName(tr(MENU_VIEW_TRACK_HEAD));
+    params.ToTrackHeadAudio->setName(tr(MENU_VIEW_TRACK_HEAD_AUDIO));
+    params.ToForceBFormat->setName(stCString("Force B-Format"));
     params.ToShowFps->setName(tr(MENU_FPS_METER));
     params.ToShowMenu->setName(stCString("Show main menu"));
     params.ToShowTopbar->setName(stCString("Show top toolbar"));
@@ -146,6 +155,9 @@
     params.BlockSleeping->defineOption(BLOCK_SLEEP_ALWAYS,     tr(MENU_HELP_BLOCKSLP_ALWAYS));
     params.BlockSleeping->defineOption(BLOCK_SLEEP_PLAYBACK,   tr(MENU_HELP_BLOCKSLP_PLAYBACK));
     params.BlockSleeping->defineOption(BLOCK_SLEEP_FULLSCREEN, tr(MENU_HELP_BLOCKSLP_FULLSCR));
+    params.ToHideStatusBar->setName("Hide system status bar");
+    params.ToHideNavBar   ->setName(tr(OPTION_HIDE_NAVIGATION_BAR));
+    params.ToOpenLast     ->setName(tr(OPTION_OPEN_LAST_ON_STARTUP));
     params.ToShowExtra->setName(tr(MENU_HELP_EXPERIMENTAL));
     params.TargetFps->setName(stCString("FPS Target"));
 
@@ -218,6 +230,7 @@
     params.ToSearchSubs = new StBoolParamNamed(true, stCString("toSearchSubs"));
     params.SubtitlesParser = new StEnumParam(1, stCString("subsParser"));
     params.AudioAlDevice = new StALDeviceParam();
+    params.AudioAlHrtf   = new StEnumParam(0, stCString("alHrtfRequest"));
     params.AudioGain = new StFloat32Param( 0.0f, // sound is unattenuated
                                          -50.0f, // almost mute
                                           10.0f, // max amplification
@@ -243,12 +256,20 @@
     params.SrcStereoFormat->signals.onChanged = stSlot(this, &StMoviePlayer::doSwitchSrcFormat);
     params.ToShowPlayList   = new StBoolParamNamed(false, stCString("showPlaylist"));
     params.ToShowPlayList->signals.onChanged = stSlot(this, &StMoviePlayer::doShowPlayList);
-    params.ToTrackHead = new StBoolParamNamed(true,  stCString("toTrackHead"));
+    params.ToShowAdjustImage = new StBoolParamNamed(false, stCString("showAdjustImage"));
+    params.ToShowAdjustImage->signals.onChanged = stSlot(this, &StMoviePlayer::doShowAdjustImage);
+    params.ToStickPanorama  = new StBoolParamNamed(false, stCString("toStickPano360"));
+    params.ToStickPanorama->signals.onChanged = stSlot(this, &StMoviePlayer::doChangeStickPano360);
+    params.ToTrackHead      = new StBoolParamNamed(true,  stCString("toTrackHead"));
+    params.ToTrackHeadAudio = new StBoolParamNamed(true,  stCString("toTrackHeadAudio"));
+    params.ToForceBFormat   = new StBoolParamNamed(false, stCString("toForceBFormat"));
     params.ToShowFps   = new StBoolParamNamed(false, stCString("toShowFps"));
     params.ToShowMenu  = new StBoolParamNamed(true,  stCString("toShowMenu"));
     params.ToShowTopbar= new StBoolParamNamed(true,  stCString("toShowTopbar"));
     params.IsMobileUI  = new StBoolParamNamed(StWindow::isMobile(), stCString("isMobileUI"));
-    params.IsMobileUI->signals.onChanged = stSlot(this, &StMoviePlayer::doScaleHiDPI);
+    params.IsMobileUI->signals.onChanged = stSlot(this, &StMoviePlayer::doChangeMobileUI);
+    params.IsMobileUISwitch = new StBoolParam(params.IsMobileUI->getValue());
+    params.IsMobileUISwitch->signals.onChanged = stSlot(this, &StMoviePlayer::doScaleHiDPI);
     params.IsVSyncOn   = new StBoolParamNamed(true, stCString("vsync"));
     params.IsVSyncOn->signals.onChanged = stSlot(this, &StMoviePlayer::doSwitchVSync);
     StApplication::params.VSyncMode->setValue(StGLContext::VSync_ON);
@@ -262,6 +283,11 @@
     params.SubtitlesStream = new StInt32Param(-1);
     params.SubtitlesStream->signals.onChanged = stSlot(this, &StMoviePlayer::doSwitchSubtitlesStream);
     params.BlockSleeping = new StEnumParam(StMoviePlayer::BLOCK_SLEEP_PLAYBACK, stCString("blockSleep"));
+    params.ToHideStatusBar = new StBoolParamNamed(true, stCString("toHideStatusBar"));
+    params.ToHideStatusBar->signals.onChanged = stSlot(this, &StMoviePlayer::doHideSystemBars);
+    params.ToHideNavBar    = new StBoolParamNamed(true, stCString("toHideNavBar"));
+    params.ToHideNavBar   ->signals.onChanged = stSlot(this, &StMoviePlayer::doHideSystemBars);
+    params.ToOpenLast    = new StBoolParamNamed(false, stCString("toOpenLast"));
     params.ToShowExtra   = new StBoolParamNamed(false, stCString("experimental"));
     // set rendering FPS as twice as average video FPS
     params.TargetFps = new StInt32ParamNamed(2, stCString("fpsTarget"));
@@ -289,6 +315,7 @@
     mySettings->loadParam (params.ToLoopSingle);
     mySettings->loadParam (params.AreGlobalMKeys);
     mySettings->loadParam (params.ToShowPlayList);
+    mySettings->loadParam (params.ToShowAdjustImage);
     mySettings->loadParam (params.SubtitlesPlace);
     mySettings->loadParam (params.SubtitlesTopDY);
     mySettings->loadParam (params.SubtitlesBottomDY);
@@ -298,6 +325,10 @@
     mySettings->loadParam (params.ToSearchSubs);
 
     myToCheckPoorOrient = !mySettings->loadParam(params.ToTrackHead);
+    mySettings->loadParam (params.ToStickPanorama);
+    mySettings->loadParam (params.ToTrackHeadAudio);
+    mySettings->loadParam (params.ToForceBFormat);
+    mySettings->loadParam (params.AudioAlHrtf);
     mySettings->loadParam (params.ToShowFps);
     mySettings->loadParam (params.IsMobileUI);
     mySettings->loadParam (params.IsVSyncOn);
@@ -310,11 +341,13 @@
     mySettings->loadParam (params.ToPrintWebErrors);
     mySettings->loadParam (params.SnapshotImgType);
     mySettings->loadParam (params.BlockSleeping);
+    mySettings->loadParam (params.ToHideStatusBar);
+    mySettings->loadParam (params.ToHideNavBar);
+    mySettings->loadParam (params.ToOpenLast);
     mySettings->loadParam (params.ToShowExtra);
     if(params.StartWebUI->getValue() == WEBUI_ONCE) {
         params.StartWebUI->setValue(WEBUI_OFF);
     }
-    params.StartWebUI->signals.onChanged += stSlot(this, &StMoviePlayer::doSwitchWebUI);
 
     StString aSavedALDevice;
     mySettings->loadString(params.AudioAlDevice->getKey(), aSavedALDevice);
@@ -323,6 +356,8 @@
     params.IsShuffle    ->signals.onChanged.connect(this, &StMoviePlayer::doSwitchShuffle);
     params.ToLoopSingle ->signals.onChanged.connect(this, &StMoviePlayer::doSwitchLoopSingle);
     params.AudioAlDevice->signals.onChanged.connect(this, &StMoviePlayer::doSwitchAudioDevice);
+    params.AudioAlHrtf  ->signals.onChanged.connect(this, &StMoviePlayer::doSwitchAudioAlHrtf);
+    params.ToForceBFormat->signals.onChanged = stSlot(this, &StMoviePlayer::doSetForceBFormat);
 
 #if defined(__ANDROID__)
     addRenderer(new StOutInterlace  (myResMgr, theParentWin));
@@ -339,7 +374,8 @@
 
     // no need in Depth buffer
     const StWinAttr anAttribs[] = {
-        StWinAttr_GlDepthSize, (StWinAttr )0,
+        StWinAttr_GlDepthSize,   (StWinAttr )0,
+        StWinAttr_GlStencilSize, (StWinAttr )0,
         StWinAttr_NULL
     };
     for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
@@ -404,7 +440,7 @@
     anAction = new StActionIntSlot(stCString("DoSeekRight"), stSlot(this, &StMoviePlayer::doSeekRight), 0);
     addAction(Action_SeekRight5, anAction, ST_VK_RIGHT);
 
-    anAction = new StActionIntSlot(stCString("DoOpen1File"), stSlot(this, &StMoviePlayer::doOpen1File), 0);
+    anAction = new StActionIntSlot(stCString("DoOpen1File"), stSlot(this, &StMoviePlayer::doOpen1FileAction), 0);
 #ifdef __APPLE__
     addAction(Action_Open1File, anAction, ST_VK_O | ST_VF_CONTROL, ST_VK_O | ST_VF_COMMAND);
 #else
@@ -511,6 +547,7 @@
         mySettings->saveParam (params.ToSearchSubs);
         mySettings->saveParam (params.TargetFps);
         mySettings->saveString(params.AudioAlDevice->getKey(), params.AudioAlDevice->getUtfTitle());
+        mySettings->saveParam (params.AudioAlHrtf);
         mySettings->saveParam (params.LastUpdateDay);
         mySettings->saveParam (params.CheckUpdatesDays);
         mySettings->saveParam (params.SrcStereoFormat);
@@ -518,22 +555,28 @@
         mySettings->saveParam (params.ToLoopSingle);
         mySettings->saveParam (params.AreGlobalMKeys);
         mySettings->saveParam (params.ToShowPlayList);
+        mySettings->saveParam (params.ToShowAdjustImage);
 
+        mySettings->saveParam (params.ToStickPanorama);
         mySettings->saveParam (params.ToTrackHead);
+        mySettings->saveParam (params.ToTrackHeadAudio);
+        mySettings->saveParam (params.ToForceBFormat);
         mySettings->saveParam (params.ToShowFps);
         mySettings->saveParam (params.IsMobileUI);
         mySettings->saveParam (params.IsVSyncOn);
         mySettings->saveParam (params.ToLimitFps);
         mySettings->saveParam (params.UseGpu);
         mySettings->saveParam (params.UseOpenJpeg);
-
-        mySettings->saveParam (params.StartWebUI);
         if(!params.IsLocalWebUI->getValue()) {
             mySettings->saveParam(params.WebUIPort);
+            mySettings->saveParam(params.StartWebUI);
         }
         mySettings->saveParam (params.ToPrintWebErrors);
         mySettings->saveParam (params.SnapshotImgType);
         mySettings->saveParam (params.BlockSleeping);
+        mySettings->saveParam (params.ToHideStatusBar);
+        mySettings->saveParam (params.ToHideNavBar);
+        mySettings->saveParam (params.ToOpenLast);
         mySettings->saveParam (params.ToShowExtra);
 
         // store hot-keys
@@ -586,6 +629,7 @@
     }
 
     params.ScaleHiDPI->setValue(myWindow->getScaleFactor());
+    doChangeMobileUI(params.IsMobileUI->getValue());
     myGUI = new StMoviePlayerGUI(this, myWindow.access(), myLangMap.access(), myPlayList, theTextureQueue, theSubQueue);
     myGUI->setContext(myContext);
     theTextureQueue->setDeviceCaps(myContext->getDeviceCaps());
@@ -606,7 +650,7 @@
     }
 
     myGUI->stglInit();
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
 
     for(size_t anIter = 0; anIter < myGUI->myImage->getActions().size(); ++anIter) {
         StHandle<StAction>& anAction = myGUI->myImage->changeActions()[anIter];
@@ -744,6 +788,7 @@
             if(anArgWebuiCmd.isValid()) {
                 params.IsLocalWebUI->setValue(true);
                 params.WebUIPort->setValue(::atol(anArgWebuiCmd.getValue().toCString()));
+                params.StartWebUI->setValue(WEBUI_ONCE);
             }
         }
     #endif
@@ -767,18 +812,24 @@
 
     // capture multimedia keys even without window focus
     myWindow->setAttribute(StWinAttr_GlobalMediaKeys, params.AreGlobalMKeys->getValue());
+    myWindow->setHideSystemBars(params.ToHideStatusBar->getValue(), params.ToHideNavBar->getValue());
 
     // create the video playback thread
     if(!isReset) {
-        myVideo = new StVideo(params.AudioAlDevice->getCTitle(), myResMgr, myLangMap, myPlayList, aTextureQueue, aSubQueue);
+        myVideo = new StVideo(params.AudioAlDevice->getCTitle(), (StAudioQueue::StAlHrtfRequest )params.AudioAlHrtf->getValue(),
+                              myResMgr, myLangMap, myPlayList, aTextureQueue, aSubQueue);
         myVideo->signals.onError  = stSlot(myMsgQueue.access(), &StMsgQueue::doPushError);
         myVideo->signals.onLoaded = stSlot(this,                &StMoviePlayer::doLoaded);
         myVideo->params.UseGpu       = params.UseGpu;
         myVideo->params.UseOpenJpeg  = params.UseOpenJpeg;
         myVideo->params.ToSearchSubs = params.ToSearchSubs;
+        myVideo->params.ToTrackHeadAudio = params.ToTrackHeadAudio;
+        myVideo->setStickPano360(params.ToStickPanorama->getValue());
+        myVideo->setForceBFormat(params.ToForceBFormat->getValue());
 
     #ifdef ST_HAVE_MONGOOSE
         doStartWebUI();
+        params.StartWebUI->signals.onChanged += stSlot(this, &StMoviePlayer::doSwitchWebUI);
     #endif
     }
 
@@ -917,12 +968,14 @@
     const StMIME     anOpenMIME  = myOpenFileInfo->getMIME();
     const StArgument anArgPause  = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_PAUSE];
     const StArgument anArgPaused = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_PAUSED];
+    const StArgument anArgLast   = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_LAST];
+    const StArgument anArgFileDemo = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_DEMO];
     const bool       isPaused    = (anArgPause .isValid() && !anArgPause .isValueOff())
                                 || (anArgPaused.isValid() && !anArgPaused.isValueOff());
-    if(myOpenFileInfo->getPath().isEmpty()) {
+    const bool toOpenLast = anArgLast.isValid() ? !anArgLast.isValueOff() : params.ToOpenLast->getValue();
+    if(myOpenFileInfo->getPath().isEmpty() || (toOpenLast && anArgFileDemo.isValid())) {
         // open drawer without files
-        const StArgument anArgLast = myOpenFileInfo->getArgumentsMap()[ST_ARGUMENT_FILE_LAST];
-        if(anArgLast.isValid() && !anArgLast.isValueOff()) {
+        if(toOpenLast) {
             doOpenRecent(0); // open last opened file
             if(isPaused) {
                 myVideo->pushPlayEvent(ST_PLAYEVENT_PAUSE);
@@ -980,7 +1033,14 @@
         return;
     }
 
-    myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER));
+    const StMarginsI& aMargins = myWindow->getMargins();
+    const bool wasMobileGui = myGUI->isMobile();
+    const bool toMobileGui  = toUseMobileUI(aMargins);
+    if(toMobileGui != wasMobileGui) {
+        doChangeMobileUI(params.IsMobileUI->getValue());
+    } else {
+        myGUI->stglResize(myWindow->stglViewport(ST_WIN_MASTER), myWindow->getMargins(), (float )myWindow->stglAspectRatio());
+    }
 }
 
 void StMoviePlayer::doKeyDown(const StKeyEvent& theEvent) {
@@ -1392,7 +1452,7 @@
     if(myGUI->mySeekBar != NULL) {
         myGUI->mySeekBar->setProgress(GLfloat(aPosition));
     }
-    myGUI->stglUpdate(myWindow->getMousePos());
+    myGUI->stglUpdate(myWindow->getMousePos(), myWindow->isPreciseCursor());
 
     // prevent display going to sleep
     bool toBlockSleepDisplay = false;
@@ -1437,6 +1497,11 @@
     bool hasStereoSource = false;
     StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
     if(!aParams.isNull()) {
+        StGLQuaternion aHeadOrient;
+        const bool toTrackHead = params.ToTrackHeadAudio->getValue()
+                              && myGUI->myImage->getHeadOrientation(aHeadOrient, ST_DRAW_MONO, false);
+        myVideo->setHeadOrientation(aHeadOrient, toTrackHead);
+
         hasStereoSource =!aParams->isMono()
                        && myGUI->myImage->hasVideoStream()
                        && myGUI->myImage->params.DisplayMode->getValue() == StGLImageRegion::MODE_STEREO;
@@ -1476,8 +1541,8 @@
 }
 
 void StMoviePlayer::stglDraw(unsigned int theView) {
-    if( myContext.isNull()
-    || !myContext->isBound()) {
+    const bool hasCtx = !myContext.isNull() && myContext->isBound();
+    if(!hasCtx || myWindow->isPaused()) {
         if(!myGUI.isNull()
          && myGUI->myImage != NULL) {
             myGUI->myImage->stglSkipFrames();
@@ -1491,9 +1556,10 @@
                 bool isVideoPlayed = false, isAudioPlayed = false;
                 const bool isPlaying = !myVideo.isNull()
                                      && myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
+                const double aTimeout = hasCtx ? 300.0 : 60.0;
                 if(!myInactivityTimer.isOn()) {
                     myInactivityTimer.restart();
-                } else if(myInactivityTimer.getElapsedTimeInSec() > 60.0
+                } else if(myInactivityTimer.getElapsedTimeInSec() > aTimeout
                       && !isPlaying) {
                     // perform delayed destruction on long inactivity
                     exit(0);
@@ -1516,7 +1582,7 @@
         return;
     }
 
-    myGUI->getCamera()->setView(theView);
+    myGUI->changeCamera()->setView(theView);
     myGUI->stglDraw(theView);
 }
 
@@ -1529,6 +1595,15 @@
     myGUI->myPlayList->setOpacity(theToShow ? 1.0f : 0.0f, false);
 }
 
+void StMoviePlayer::doShowAdjustImage(const bool theToShow) {
+    if(myGUI.isNull()
+    || myGUI->myAdjustOverlay == NULL) {
+        return;
+    }
+
+    myGUI->myAdjustOverlay->setOpacity(theToShow ? 1.0f : 0.0f, false);
+}
+
 void StMoviePlayer::doPlayListReverse(const size_t ) {
     if(myGUI.isNull()) {
         return;
@@ -1555,6 +1630,23 @@
     }
 }
 
+bool StMoviePlayer::hasAlHrtf() const {
+    return !myVideo.isNull()
+         && myVideo->hasAlHrtf();
+}
+
+void StMoviePlayer::doSwitchAudioAlHrtf(const int32_t theValue) {
+    if(!myVideo.isNull()) {
+        myVideo->setAlHrtfRequest((StAudioQueue::StAlHrtfRequest )theValue);
+    }
+}
+
+void StMoviePlayer::doSetForceBFormat(const bool theValue) {
+    if(!myVideo.isNull()) {
+        myVideo->setForceBFormat(theValue);
+    }
+}
+
 void StMoviePlayer::doSetAudioVolume(const float theGaindB) {
     if(!myVideo.isNull()
     && !params.AudioMute->getValue()) {
@@ -1634,8 +1726,8 @@
     }
 
     int aMode = myGUI->myImage->params.ViewMode->getValue();
-    if(aMode != StStereoParams::FLAT_IMAGE) {
-        myGUI->myImage->params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+    if(aMode != StViewSurface_Plain) {
+        myGUI->myImage->params.ViewMode->setValue(StViewSurface_Plain);
         return;
     }
 
@@ -1643,8 +1735,16 @@
                                          aParams->Src1SizeX, aParams->Src1SizeY,
                                          aParams->Src2SizeX, aParams->Src2SizeY);
     myGUI->myImage->params.ViewMode->setValue(aPano == StPanorama_Cubemap6_1 || aPano == StPanorama_Cubemap3_2
-                                            ? StStereoParams::PANORAMA_CUBEMAP
-                                            : StStereoParams::PANORAMA_SPHERE);
+                                            ? StViewSurface_Cubemap
+                                            : StViewSurface_Sphere);
+}
+
+void StMoviePlayer::doChangeStickPano360(const bool ) {
+    if(myVideo.isNull()) {
+        return;
+    }
+
+    myVideo->setStickPano360(params.ToStickPanorama->getValue());
 }
 
 void StMoviePlayer::doSwitchSrcFormat(const int32_t theSrcFormat) {
@@ -1667,6 +1767,10 @@
     myToRecreateMenu = true;
 }
 
+void StMoviePlayer::doChangeMobileUI(const bool ) {
+    params.IsMobileUISwitch->setValue(toUseMobileUI());
+}
+
 void StMoviePlayer::doScaleHiDPI(const bool ) {
     if(myGUI.isNull()) {
         return;
@@ -1714,7 +1818,11 @@
     myOpenDialog->setPaths(*thePath, "");
 }
 
-void StMoviePlayer::doOpen1File(const size_t ) {
+void StMoviePlayer::doOpen1FileAction(const size_t ) {
+    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+        myGUI->doOpenFile(0);
+        return;
+    }
     myOpenDialog->openDialog(StMovieOpenDialog::Dialog_SingleMovie);
 }
 
@@ -1820,6 +1928,14 @@
     myVideo->doSaveSnapshotAs(aType);
 }
 
+void StMoviePlayer::doHideSystemBars(const bool ) {
+    if(myWindow.isNull()) {
+        return;
+    }
+
+    myWindow->setHideSystemBars(params.ToHideStatusBar->getValue(), params.ToHideNavBar->getValue());
+}
+
 void StMoviePlayer::doSetBenchmark(const bool theValue) {
     if(myVideo.isNull()) {
         return;
@@ -1927,7 +2043,7 @@
         }
     } else if(anURI.isEquals(stCString("/action"))) {
         if(!params.IsLocalWebUI->getValue()) {
-            aContent = "Error: command interace is disabled!";
+            aContent = "Error: command interface is disabled!";
         } else {
             const int anActionId = getActionIdFromName(aQuery);
             if(anActionId != -1) {

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayer.h -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayer.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -129,7 +129,7 @@
 
     ST_LOCAL void doFileNext();
     ST_LOCAL void doOpen1FileFromGui(StHandle<StString> thePath);
-    ST_LOCAL void doOpen1File(const size_t dummy = 0);
+    ST_LOCAL void doOpen1FileAction(const size_t dummy = 0);
     ST_LOCAL void doOpen2Files(const size_t dummy = 0);
     ST_LOCAL void doSaveFileInfo(const size_t theToSave);
     ST_LOCAL void doOpenRecent(const size_t theItemId);
@@ -154,6 +154,26 @@
 
     ST_LOCAL void getRecentList(StArrayList<StString>& theList);
 
+    /**
+     * Return true if mobile UI should be enabled considering user option and window margins.
+     */
+    ST_LOCAL bool toUseMobileUI() const {
+        return toUseMobileUI(!myWindow.isNull() ? myWindow->getMargins() : StMarginsI());
+    }
+
+    /**
+     * Return true if mobile UI should be enabled considering user option and window margins.
+     */
+    ST_LOCAL bool toUseMobileUI(const StMarginsI& theMargins) const {
+        return params.IsMobileUI->getValue()
+            || theMargins.top > 0;
+    }
+
+    /**
+     * Return TRUE if OpenAL implementation provides HRTF mixing feature.
+     */
+    ST_CPPEXPORT bool hasAlHrtf() const;
+
     struct {
 
         StHandle<StEnumParam>         ScaleAdjust;       //!< adjust GUI size, see StGLRootWidget::ScaleAdjust
@@ -167,6 +187,7 @@
         StHandle<StBoolParamNamed>    ToSearchSubs;      //!< automatically search for additional subtitles/audio track files nearby video file
         StHandle<StEnumParam>         SubtitlesParser;   //!< subtitles parser
         StHandle<StALDeviceParam>     AudioAlDevice;     //!< active OpenAL device
+        StHandle<StEnumParam>         AudioAlHrtf;       //!< OpenAL HRTF flag
         StHandle<StFloat32Param>      AudioGain;         //!< volume factor
         StHandle<StBoolParamNamed>    AudioMute;         //!< volume mute flag
         StHandle<StFloat32Param>      AudioDelay;        //!< audio/video synchronization delay
@@ -179,12 +200,17 @@
         StHandle<StEnumParam>         CheckUpdatesDays;  //!< days count between updates checks
         StHandle<StInt32ParamNamed>   LastUpdateDay;     //!< the last time update has been checked
         StHandle<StInt32ParamNamed>   SrcStereoFormat;   //!< source format
+        StHandle<StBoolParamNamed>    ToStickPanorama;   //!< force panorama input for all files
         StHandle<StBoolParamNamed>    ToTrackHead;       //!< enable/disable head-tracking
+        StHandle<StBoolParamNamed>    ToTrackHeadAudio;  //!< enable/disable head-tracking for audio listener
+        StHandle<StBoolParamNamed>    ToForceBFormat;    //!< force B-Format for any 4-channels audio stream
         StHandle<StBoolParamNamed>    ToShowPlayList;    //!< display playlist
+        StHandle<StBoolParamNamed>    ToShowAdjustImage; //!< display image adjustment overlay
         StHandle<StBoolParamNamed>    ToShowFps;         //!< display FPS meter
         StHandle<StBoolParamNamed>    ToShowMenu;        //!< show main menu
         StHandle<StBoolParamNamed>    ToShowTopbar;      //!< show topbar
-        StHandle<StBoolParamNamed>    IsMobileUI;        //!< display mobile interface
+        StHandle<StBoolParamNamed>    IsMobileUI;        //!< display mobile interface (user option)
+        StHandle<StBoolParam>         IsMobileUISwitch;  //!< display mobile interface (actual value)
         StHandle<StBoolParamNamed>    ToLimitFps;        //!< limit CPU usage or not
         StHandle<StBoolParamNamed>    IsVSyncOn;         //!< flag to use VSync
         StHandle<StEnumParam>         StartWebUI;        //!< to start Web UI or not
@@ -194,6 +220,9 @@
         StHandle<StInt32Param>        AudioStream;       //!< active Audio stream
         StHandle<StInt32Param>        SubtitlesStream;   //!< active Subtitles stream
         StHandle<StEnumParam>         BlockSleeping;     //!< active Audio stream
+        StHandle<StBoolParamNamed>    ToHideStatusBar;   //!< hide system-provided status bar
+        StHandle<StBoolParamNamed>    ToHideNavBar;      //!< hide system-provided navigation bar
+        StHandle<StBoolParamNamed>    ToOpenLast;        //!< option to open last file from recent list by default
         StHandle<StBoolParamNamed>    ToShowExtra;       //!< show experimental menu items
         StHandle<StInt32ParamNamed>   SnapshotImgType;   //!< default snapshot image type
         StString                      lastFolder;        //!< laster folder used to open / save file
@@ -254,9 +283,12 @@
 
     ST_LOCAL virtual void doChangeLanguage(const int32_t theNewLang) ST_ATTR_OVERRIDE;
     ST_LOCAL void doScaleGui(const int32_t );
+    ST_LOCAL void doChangeMobileUI(const bool );
     ST_LOCAL void doScaleHiDPI(const bool );
     ST_LOCAL void doSwitchVSync(const bool theValue);
     ST_LOCAL void doSwitchAudioDevice(const int32_t theDevId);
+    ST_LOCAL void doSwitchAudioAlHrtf(const int32_t theValue);
+    ST_LOCAL void doSetForceBFormat(const bool theToForce);
     ST_LOCAL void doSetAudioVolume(const float theGain);
     ST_LOCAL void doSetAudioMute(const bool theToMute);
     ST_LOCAL void doSetAudioDelay(const float theDelaySec);
@@ -265,12 +297,15 @@
     ST_LOCAL void doFullscreen(const bool theIsFullscreen);
     ST_LOCAL void doSwitchSrcFormat(const int32_t theSrcFormat);
     ST_LOCAL void doPanoramaOnOff(const size_t );
+    ST_LOCAL void doChangeStickPano360(const bool );
     ST_LOCAL void doSwitchAudioStream(const int32_t theStreamId);
     ST_LOCAL void doSwitchSubtitlesStream(const int32_t theStreamId);
     ST_LOCAL void doShowPlayList(const bool theToShow);
+    ST_LOCAL void doShowAdjustImage(const bool theToShow);
     ST_LOCAL void doUpdateStateLoading();
     ST_LOCAL void doUpdateStateLoaded();
     ST_LOCAL void doImageAdjustReset(const size_t dummy = 0);
+    ST_LOCAL void doHideSystemBars(const bool theToHide);
     ST_LOCAL void doSetBenchmark(const bool theValue);
 
         public:

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayer.rc -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayer.rc Changed

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,10 +72,12 @@
 }
 
 void StMoviePlayerGUI::createDesktopUI(const StHandle<StPlayList>& thePlayList) {
+    createImageAdjustments();
     createUpperToolbar();
     createBottomToolbar(64, 32);
 
     mySeekBar = new StGLSeekBar(myPanelBottom, 0, scale(18));
+    mySeekBar->setMoveTolerance(scale(isMobile() ? 16 : 8));
     mySeekBar->signals.onSeekClick.connect(myPlugin, &StMoviePlayer::doSeek);
 
     myTimeBox = new StTimeBox(myPanelBottom, myBottomBarNbLeft * myIconStep, 0,
@@ -128,12 +130,11 @@
     const int      anIconStep = scale(48);
     aButtonMargins.extend(scale(8));
 
-    const StMarginsI& aMargins = getRootMargins();
-    myPanelUpper = new StGLContainer(this, aMargins.left, aMargins.top, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(128));
+    myPanelUpper = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(128));
 
     // append the textured buttons
     myBtnOpen = new StGLTextureButton(myPanelUpper, aLeft + (aBtnIter++) * anIconStep, aTop);
-    myBtnOpen->signals.onBtnClick.connect(myPlugin, &StMoviePlayer::doOpen1File);
+    myBtnOpen->signals.onBtnClick.connect(myPlugin, &StMoviePlayer::doOpen1FileAction);
     myBtnOpen->setTexturePath(iconTexture(stCString("actionOpen"), anIconSize));
     myBtnOpen->setDrawShadow(true);
     myBtnOpen->changeMargins() = aButtonMargins;
@@ -186,6 +187,14 @@
     myBtnPanorama->setDrawShadow(true);
     myBtnPanorama->changeMargins() = aButtonMargins;
 
+    myBtnAdjust = new StGLCheckboxTextured(myPanelUpper, myPlugin->params.ToShowAdjustImage,
+                                           iconTexture(stCString("actionColorAdjustOff"), anIconSize),
+                                           iconTexture(stCString("actionColorAdjust"),    anIconSize),
+                                           aLeft + (aBtnIter++) * anIconStep, aTop,
+                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnAdjust->setDrawShadow(true);
+    myBtnAdjust->changeMargins() = aButtonMargins;
+
     // right buttons
     StHandle<StBoolParam> aTrackedSubs = new StBoolParam(false);
     myBtnSubs = new StGLCheckboxTextured(myPanelUpper, aTrackedSubs,
@@ -213,7 +222,6 @@
  */
 void StMoviePlayerGUI::createBottomToolbar(const int theIconSize,
                                            const int theIconSizeSmall) {
-    const StMarginsI& aMargins = getRootMargins();
     StMarginsI aButtonMargins, aButtonMarginsSmall;
     const IconSize anIconSize      = scaleIcon(theIconSize,      aButtonMargins);
     const IconSize anIconSizeSmall = scaleIcon(theIconSizeSmall, aButtonMarginsSmall);
@@ -221,9 +229,7 @@
 
     myBottomBarNbLeft  = 0;
     myBottomBarNbRight = 0;
-    myPanelBottom = new StGLContainer(this,
-                                       aMargins.left   + scale(DISPL_X_REGION_BOTTOM),
-                                      -aMargins.bottom,
+    myPanelBottom = new StGLContainer(this, scale(DISPL_X_REGION_BOTTOM), 0,
                                       StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT),
                                       scale(4096), anIconStep);
 
@@ -240,13 +246,17 @@
     myBtnPlay->changeMargins() = aButtonMargins;
 
     if(myWindow->hasFullscreenMode()) {
-        myBtnFullScr = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.IsFullscreen,
-                                                iconTexture(stCString("actionVideoFullscreenOff"), anIconSize),
-                                                iconTexture(stCString("actionVideoFullscreenOn"),  anIconSize),
-                                                (myBottomBarNbRight++) * (-anIconStep), 0,
-                                                StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+        myBtnFullScr = new StGLTextureButton(myPanelBottom, (myBottomBarNbRight++) * (-anIconStep), 0,
+                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT), 4);
+        myBtnFullScr->setAction(myPlugin->getAction(StMoviePlayer::Action_Fullscreen));
+        const StString aSrcTextures[4] = {
+            iconTexture(stCString("actionVideoFullscreenOff"),   anIconSize),
+            iconTexture(stCString("actionVideoFullscreenOn"),    anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOff"), anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOn"),  anIconSize)
+        };
+        myBtnFullScr->setTexturePath(aSrcTextures, 4);
         myBtnFullScr->setDrawShadow(true);
-        myBtnFullScr->setFalseOpacity(1.0f);
         myBtnFullScr->changeMargins() = aButtonMargins;
     }
 
@@ -279,7 +289,6 @@
     myVolumeBar->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
     myVolumeBar->signals.onSeekClick  = stSlot(this, &StMoviePlayerGUI::doAudioGain);
     myVolumeBar->signals.onSeekScroll = stSlot(this, &StMoviePlayerGUI::doAudioGainScroll);
-    myVolumeBar->setMoveTolerance(1);
     myVolumeBar->changeMargins().left  = scale(8);
     myVolumeBar->changeMargins().right = scale(8);
 
@@ -307,8 +316,7 @@
  * Main menu
  */
 void StMoviePlayerGUI::createMainMenu() {
-    const StMarginsI& aMargins = getRootMargins();
-    myMenuRoot = new StGLMenu(this, aMargins.left, aMargins.top, StGLMenu::MENU_HORIZONTAL, true);
+    myMenuRoot = new StGLMenu(this, 0, 0, StGLMenu::MENU_HORIZONTAL, true);
 
     StGLMenu* aMenuMedia   = createMediaMenu();     // Root -> Media menu
     StGLMenu* aMenuView    = createViewMenu();      // Root -> View menu
@@ -489,6 +497,7 @@
     StArrayList<StString> aList;
     myPlugin->getRecentList(aList);
 
+    theMenu->addItem(myPlugin->params.ToOpenLast);
     theMenu->addItem(tr(MENU_MEDIA_RECENT_CLEAR))
            ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doClearRecent);
     for(size_t anIter = 0; anIter < aList.size(); ++anIter) {
@@ -610,15 +619,18 @@
 
 void StMoviePlayerGUI::fillPanoramaMenu(StGLMenu* theMenu) {
     theMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
-                     myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
+                     myImage->params.ViewMode, StViewSurface_Plain);
     theMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
-                     myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
+                     myImage->params.ViewMode, StViewSurface_Sphere);
     theMenu->addItem(tr(MENU_VIEW_SURFACE_CUBEMAP),
-                     myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
+                     myImage->params.ViewMode, StViewSurface_Cubemap);
     if(myWindow->hasOrientationSensor()) {
         theMenu->addItem(tr(myWindow->isPoorOrientationSensor() ? MENU_VIEW_TRACK_HEAD_POOR : MENU_VIEW_TRACK_HEAD),
                          myPlugin->params.ToTrackHead);
     }
+    theMenu->addItem(tr(MENU_VIEW_TRACK_HEAD_AUDIO),
+                     myPlugin->params.ToTrackHeadAudio);
+    theMenu->addItem(myPlugin->params.ToStickPanorama);
 }
 
 void StMoviePlayerGUI::doPanoramaCombo(const size_t ) {
@@ -891,17 +903,20 @@
     const StGLVec3 THE_WHITE(1.0f, 1.0f, 1.0f);
     const StString anAbout = tr(ABOUT_DPLUGIN_NAME) + '\n'
                            + tr(ABOUT_VERSION) + " " + StVersionInfo::getSDKVersionString()
-                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2007-2016", "kirill@sview.ru", "www.sview.ru")
+                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2007-2017", "kirill@sview.ru", "www.sview.ru")
                            + "\n\n<b><i>Used projects</i></b>"
                            + "\n \nFFmpeg " + stAV::getVersionInfo() + " (" + stAV::getLicenseInfo() + ")\nhttps://ffmpeg.org/"
                            + "\n \nOpenAL Soft (LGPL)\nhttp://kcat.strangesoft.net/openal.html"
                            + "\n \nFreeType \nhttp://freetype.org/";
 
-    StArgumentsMap anInfo;
+    StDictionary anInfo;
     anInfo.add(StDictEntry("CPU cores", StString(StThread::countLogicalProcessors()) + StString(" logical processor(s)")));
     getContext().stglFullInfo(anInfo);
     anInfo.add(StDictEntry("Display Scale", StString(myWindow->getMonitors()[myWindow->getPlacement().center()].getScale()) + "x"));
 
+    // OpenAL info
+    myPlugin->myVideo->getAlInfo(anInfo);
+
     StGLMessageBox* aDialog = new StGLMessageBox(this, tr(MENU_HELP_ABOUT), "", scale(512), scale(300));
     StGLTable* aTable = new StGLTable(aDialog->getContent(), 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_CENTER));
     aTable->setupTable((int )anInfo.size() + 1, 2);
@@ -979,7 +994,12 @@
     for(size_t aMapIter = 0; aMapIter < anExtraInfo->Info.size(); ++aMapIter) {
         StDictEntry& anEntry = anExtraInfo->Info.changeValue(aMapIter);
         StString     aKey    = anEntry.getKey().lowerCased();
+        const size_t aSize = anEntry.getValue().getSize();
         anEntry.changeName() = myLangMap->getValue(aKey);
+        if(aSize > 16384) {
+            // cut too long strings
+            anEntry.changeValue() = anEntry.getValue().subString(0, 128) + "\n...[" + (aSize / 1024) + " KiB]";
+        }
     }
 
     const StGLVec3 aWhite(1.0f, 1.0f, 1.0f);
@@ -1136,6 +1156,7 @@
 }
 
 void StMoviePlayerGUI::createMobileUI(const StHandle<StPlayList>& thePlayList) {
+    createImageAdjustments();
     createMobileUpperToolbar();
     createMobileBottomToolbar();
 
@@ -1173,8 +1194,7 @@
     const IconSize anIconSize = scaleIcon(32, aButtonMargins);
     aButtonMargins.extend(scale(12));
 
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelUpper = new StGLContainer(this, aRootMargins.left, aRootMargins.top, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
+    myPanelUpper = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     int aBtnIter = 0;
 
@@ -1226,6 +1246,14 @@
     myBtnPanorama->setDrawShadow(true);
     myBtnPanorama->changeMargins() = aButtonMargins;
 
+    myBtnAdjust = new StGLCheckboxTextured(myPanelUpper, myPlugin->params.ToShowAdjustImage,
+                                           iconTexture(stCString("actionColorAdjustOff"), anIconSize),
+                                           iconTexture(stCString("actionColorAdjust"),    anIconSize),
+                                           (aBtnIter++) * myIconStep, 0,
+                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnAdjust->setDrawShadow(true);
+    myBtnAdjust->changeMargins() = aButtonMargins;
+
     aBtnIter = 0;
     StGLTextureButton* aBtnEx = new StGLTextureButton(myPanelUpper, (aBtnIter--) * (-myIconStep), 0,
                                                       StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
@@ -1245,8 +1273,8 @@
     StMarginsI aButtonMargins;
     const IconSize anIconSize = scaleIcon(32, aButtonMargins);
     aButtonMargins.extend(scale(12));
-    const StMarginsI& aRootMargins = getRootMargins();
-    myPanelBottom = new StGLContainer(this, aRootMargins.left, -aRootMargins.bottom, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
+
+    myPanelBottom = new StGLContainer(this, 0, 0, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(56));
 
     const StGLCorner aLeftCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT);
     myBtnPrev = new StGLTextureButton(myPanelBottom, (myBottomBarNbLeft++) * myIconStep, 0);
@@ -1272,6 +1300,21 @@
     myBtnNext->changeMargins() = aButtonMargins;
 
     const StGLCorner aRightCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT);
+    if(myWindow->hasFullscreenMode()) {
+        myBtnFullScr = new StGLTextureButton(myPanelBottom, (myBottomBarNbRight++) * (-myIconStep), 0,
+                                             aRightCorner, 4);
+        myBtnFullScr->setAction(myPlugin->getAction(StMoviePlayer::Action_Fullscreen));
+        const StString aSrcTextures[4] = {
+            iconTexture(stCString("actionVideoFullscreenOff"),   anIconSize),
+            iconTexture(stCString("actionVideoFullscreenOn"),    anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOff"), anIconSize),
+            iconTexture(stCString("actionVideoFullscreen3dOn"),  anIconSize)
+        };
+        myBtnFullScr->setTexturePath(aSrcTextures, 4);
+        myBtnFullScr->setDrawShadow(true);
+        myBtnFullScr->changeMargins() = aButtonMargins;
+    }
+
     myBtnList = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.ToShowPlayList,
                                          iconTexture(stCString("actionVideoPlaylistOff"), anIconSize),
                                          iconTexture(stCString("actionVideoPlaylist"),    anIconSize),
@@ -1287,6 +1330,7 @@
     aBtnInfo->changeMargins() = aButtonMargins;
 
     mySeekBar = new StGLSeekBar(myPanelBottom, 0, scale(18));
+    mySeekBar->setMoveTolerance(scale(isMobile() ? 16 : 8));
     mySeekBar->signals.onSeekClick.connect(myPlugin, &StMoviePlayer::doSeek);
 
     myTimeBox = new StTimeBox(myPanelBottom, myBottomBarNbRight * (-myIconStep), 0, aRightCorner, StGLTextArea::SIZE_SMALL);
@@ -1295,12 +1339,109 @@
     myTimeBox->changeRectPx().bottom() = myTimeBox->getRectPx().top()  + scale(56);
 }
 
-void StMoviePlayerGUI::doOpenFile(const size_t ) {
-    /*if(!isMobile()) {
-        myPlugin->doOpen1File();
-        return;
-    }*/
+/**
+ * Create image adjustments control
+ */
+void StMoviePlayerGUI::createImageAdjustments() {
+    StMarginsI aButtonMargins;
+    const IconSize anIconSize = scaleIcon(32, aButtonMargins);
+    const int      anIconStep = scale(isMobile() ? 56 : 48);
+    const int      aCtrlStep  = scale(36);
+    const int      aSlideWidth = anIconStep * 4;
+    aButtonMargins.extend(scale(isMobile() ? 12 : 8));
+
+    myAdjustOverlay = new StGLContainer(this,
+                                        isMobile() ? anIconStep / 2 : scale(DISPL_X_REGION_UPPER),
+                                        isMobile() ? scale(56) : scale(72),
+                                        StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                                        scale(4096), aCtrlStep * 6 + anIconStep);
+    myAdjustOverlay->setOpacity(myPlugin->params.ToShowAdjustImage->getValue() ? 1.0f : 0.0f, false);
 
+    int aBtnIter = 0;
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Gamma,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_GAMMA) + ": %+01.2f");
+    }
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Brightness,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_BRIGHTNESS) + ": %+01.2f");
+    }
+    {
+        StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.Saturation,
+                                                                  0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                                                  StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+        aRange->changeRectPx().right() = aRange->getRectPx().left() + aSlideWidth;
+        aRange->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+        aRange->changeMargins().left   = scale(8);
+        aRange->changeMargins().right  = scale(8);
+        aRange->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+        aRange->setFormat(tr(MENU_VIEW_ADJUST_SATURATION) + ": %+01.2f");
+    }
+    myBtnResetColor1 = new StGLTextureButton(myAdjustOverlay, anIconStep * 1, aCtrlStep * aBtnIter);
+    myBtnResetColor1->setAction(myPlugin->getAction(StMoviePlayer::Action_ImageAdjustReset));
+    myBtnResetColor1->setTexturePath(iconTexture(stCString("actionColorReset"), anIconSize));
+    myBtnResetColor1->setDrawShadow(true);
+    myBtnResetColor1->changeMargins() = aButtonMargins;
+    myBtnResetColor1->setOpacity(0.0f, false);
+
+    myBtnSepDx = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationDX,
+                                           0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                           StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepDx->changeRectPx().right() = myBtnSepDx->getRectPx().left() + aSlideWidth;
+    myBtnSepDx->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepDx->changeMargins().left   = scale(8);
+    myBtnSepDx->changeMargins().right  = scale(8);
+    myBtnSepDx->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepDx->setFormat(stCString("DX Separation: %+01.0f"));
+
+    myBtnSepDy = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationDY,
+                                           0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                           StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepDy->changeRectPx().right() = myBtnSepDy->getRectPx().left() + aSlideWidth;
+    myBtnSepDy->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepDy->changeMargins().left   = scale(8);
+    myBtnSepDy->changeMargins().right  = scale(8);
+    myBtnSepDy->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepDy->setFormat(stCString("DY Separation: %+01.0f"));
+
+    myBtnSepRot = new StGLRangeFieldFloat32(myAdjustOverlay, myImage->params.SeparationRot,
+                                            0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT),
+                                            StGLRangeFieldFloat32::RangeStyle_Seekbar, scale(18));
+    myBtnSepRot->changeRectPx().right() = myBtnSepRot->getRectPx().left() + aSlideWidth;
+    myBtnSepRot->changeRectPx().moveTopTo(aCtrlStep * (aBtnIter++));
+    myBtnSepRot->changeMargins().left   = scale(8);
+    myBtnSepRot->changeMargins().right  = scale(8);
+    myBtnSepRot->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnSepRot->setFormat(stCString("Angular Sep.: %+01.2f"));
+
+    myBtnResetColor2 = new StGLTextureButton(myAdjustOverlay, anIconStep * 1, aCtrlStep * aBtnIter);
+    myBtnResetColor2->setAction(myPlugin->getAction(StMoviePlayer::Action_ImageAdjustReset));
+    myBtnResetColor2->setTexturePath(iconTexture(stCString("actionColorReset"), anIconSize));
+    myBtnResetColor2->setDrawShadow(true);
+    myBtnResetColor2->changeMargins() = aButtonMargins;
+
+    myBtnReset3d = new StGLTextureButton(myAdjustOverlay, anIconStep * 2, aCtrlStep * aBtnIter);
+    myBtnReset3d->setAction(myImage->getActions()[StGLImageRegion::Action_Reset]);
+    myBtnReset3d->setTexturePath(iconTexture(stCString("actionResetPlacement"), anIconSize));
+    myBtnReset3d->setDrawShadow(true);
+    myBtnReset3d->changeMargins() = aButtonMargins;
+}
+
+void StMoviePlayerGUI::doOpenFile(const size_t ) {
     StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
     aDialog->setMimeList(myPlugin->myVideo->getMimeListVideo());
 #if defined(_WIN32)
@@ -1402,6 +1543,7 @@
   myPanelUpper(NULL),
   myBtnOpen(NULL),
   myBtnInfo(NULL),
+  myBtnAdjust(NULL),
   myBtnSwapLR(NULL),
   myBtnPanorama(NULL),
   myBtnSrcFrmt(NULL),
@@ -1423,6 +1565,13 @@
   myBtnFullScr(NULL),
   //
   myFpsWidget(NULL),
+  myAdjustOverlay(NULL),
+  myBtnSepDx(NULL),
+  myBtnSepDy(NULL),
+  myBtnSepRot(NULL),
+  myBtnReset3d(NULL),
+  myBtnResetColor1(NULL),
+  myBtnResetColor2(NULL),
   myHKeysTable(NULL),
   //
   myIsVisibleGUI(true),
@@ -1432,11 +1581,10 @@
   myBottomBarNbRight(0) {
     const GLfloat aScale = myPlugin->params.ScaleHiDPI2X->getValue() ? 2.0f : myPlugin->params.ScaleHiDPI ->getValue();
     setScale(aScale, (StGLRootWidget::ScaleAdjust )myPlugin->params.ScaleAdjust->getValue());
-    setMobile(myPlugin->params.IsMobileUI->getValue());
+    setMobile(myPlugin->params.IsMobileUISwitch->getValue());
 
     myIconStep = isMobile() ? scale(56) : scale(64);
 
-    changeRootMargins() = myWindow->getMargins();
     myPlugin->params.ToShowFps->signals.onChanged.connect(this, &StMoviePlayerGUI::doShowFPS);
 
     myImage = new StGLImageRegion(this, theTextureQueue, false);
@@ -1474,7 +1622,8 @@
     //
 }
 
-void StMoviePlayerGUI::stglUpdate(const StPointD_t& thePointZo) {
+void StMoviePlayerGUI::stglUpdate(const StPointD_t& thePointZo,
+                                  bool theIsPreciseInput) {
     if(mySeekBar != NULL
     && myPanelBottom != NULL
     && myTimeBox->wasResized()) {
@@ -1489,7 +1638,7 @@
     }
 
     setVisibility(thePointZo);
-    StGLRootWidget::stglUpdate(thePointZo);
+    StGLRootWidget::stglUpdate(thePointZo, theIsPreciseInput);
     if(myVolumeBar != NULL) {
         char aBuff[128];
         stsprintf(aBuff, 128, "%+03.0f dB", myPlugin->params.AudioGain->getValue());
@@ -1510,42 +1659,28 @@
     }
 }
 
-void StMoviePlayerGUI::stglResize(const StGLBoxPx& theRectPx) {
-    myImage->changeRectPx().bottom() = theRectPx.height();
-    myImage->changeRectPx().right()  = theRectPx.width();
-
-    const StMarginsI& aMargins = myWindow->getMargins();
-    const bool areNewMargins = aMargins != getRootMargins();
-    if(areNewMargins) {
-        changeRootMargins() = aMargins;
-    }
+void StMoviePlayerGUI::stglResize(const StGLBoxPx& theViewPort,
+                                  const StMarginsI& theMargins,
+                                  float theAspect) {
+    const int aNewSizeX = theViewPort.width();
+    const int aNewSizeY = theViewPort.height();
+
+    // image should fit entire view
+    myImage->changeRectPx().top()    = -theMargins.top;
+    myImage->changeRectPx().bottom() = -theMargins.top + aNewSizeY;
+    myImage->changeRectPx().left()   = -theMargins.left;
+    myImage->changeRectPx().right()  = -theMargins.left + aNewSizeX;
 
     if(myPanelUpper != NULL) {
-        myPanelUpper->changeRectPx().right()  = stMax(theRectPx.width() - aMargins.right, 2);
+        myPanelUpper->changeRectPx().right()  = stMax(aNewSizeX - theMargins.right - theMargins.left, 2);
     }
     if(myPanelBottom != NULL) {
         const int aGapX = myPanelBottom->changeRectPx().left();
-        myPanelBottom->changeRectPx().right() = aGapX + stMax(theRectPx.width() - 2 * aGapX, 2);
-    }
-
-    if(areNewMargins) {
-        if(myPanelUpper != NULL) {
-            myPanelUpper->changeRectPx().left() = aMargins.left;
-            myPanelUpper->changeRectPx().moveTopTo(aMargins.top);
-        }
-        if(myPanelBottom != NULL) {
-            myPanelBottom->changeRectPx().left() =  aMargins.left;
-            myPanelBottom->changeRectPx().moveTopTo(-aMargins.bottom);
-        }
-        if(myMenuRoot != NULL) {
-            myMenuRoot->changeRectPx().left() = aMargins.left;
-            myMenuRoot->changeRectPx().top()  = aMargins.top;
-            myMenuRoot->stglUpdateSubmenuLayout();
-        }
+        myPanelBottom->changeRectPx().right() = aGapX + stMax(aNewSizeX - theMargins.right - theMargins.left - 2 * aGapX, 2);
     }
 
     stglResizeSeekBar();
-    StGLRootWidget::stglResize(theRectPx);
+    StGLRootWidget::stglResize(theViewPort, theMargins, theAspect);
 }
 
 void StMoviePlayerGUI::stglResizeSeekBar() {
@@ -1637,6 +1772,7 @@
 }
 
 void StMoviePlayerGUI::setVisibility(const StPointD_t& theCursor) {
+    const bool toShowAdjust   = myPlugin->params.ToShowAdjustImage->getValue();
     const bool toShowPlayList = myPlugin->params.ToShowPlayList->getValue();
     const bool hasMainMenu    = myPlugin->params.ToShowMenu->getValue()
                              && myMenuRoot != NULL;
@@ -1647,7 +1783,23 @@
     const bool hasVideo       = myPlugin->myVideo->hasVideoStream();
     const bool isMouseActive  = myWindow->isMouseMoved();
     const double aStillTime   = myVisibilityTimer.getElapsedTime();
+
     StHandle<StStereoParams> aParams = myImage->getSource();
+    StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
+    if( aSrcFormat == StFormat_AUTO
+    && !aParams.isNull()
+    &&  hasVideo) {
+        aSrcFormat = aParams->StereoFormat;
+    }
+    if(!aParams.isNull()
+     && myImage->params.SwapLR->getValue()
+     && hasVideo) {
+        aSrcFormat = st::formatReversed(aSrcFormat);
+    }
+    const bool has3dInput = hasVideo
+                         && aSrcFormat != StFormat_Mono
+                         && aSrcFormat != StFormat_AUTO;
+
     myIsVisibleGUI = !hasVideo
         || isMouseActive
         || aParams.isNull()
@@ -1683,6 +1835,19 @@
         myPanelBottom->setOpacity(anOpacity, true);
     }
 
+    if(myAdjustOverlay != NULL
+    && toShowAdjust) {
+        myAdjustOverlay->setOpacity(anOpacity, true);
+        if(!has3dInput) {
+            myBtnSepDx  ->setOpacity(0.0f, false);
+            myBtnSepDy  ->setOpacity(0.0f, false);
+            myBtnSepRot ->setOpacity(0.0f, false);
+            myBtnReset3d->setOpacity(0.0f, false);
+            myBtnResetColor2->setOpacity(0.0f, false);
+        } else {
+            myBtnResetColor1->setOpacity(0.0f, false);
+        }
+    }
     if(myPlayList != NULL
     && toShowPlayList) {
         myPlayList->setOpacity(anOpacity, true);
@@ -1701,17 +1866,6 @@
         myBtnPlay->setOpacityScale(aCurrPos != StPlayList::CurrentPosition_NONE ? 1.0f : 0.5f);
     }
 
-    StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
-    if( aSrcFormat == StFormat_AUTO
-    && !aParams.isNull()
-    &&  hasVideo) {
-        aSrcFormat = aParams->StereoFormat;
-    }
-    if(!aParams.isNull()
-     && myImage->params.SwapLR->getValue()
-     && hasVideo) {
-        aSrcFormat = st::formatReversed(aSrcFormat);
-    }
     if(myBtnSrcFrmt != NULL) {
         size_t aFaceId = aSrcFormat;
         if(aSrcFormat == StFormat_AUTO) {
@@ -1721,19 +1875,22 @@
         myBtnSrcFrmt->setFaceId(aFaceId);
     }
     if(myBtnFullScr != NULL) {
-        myBtnFullScr->setFaceId(myPlugin->params.IsFullscreen->getValue() ? 1 : 0);
+        int aFirstFace = 0;
+        if(myWindow->isStereoFullscreenOnly() && myWindow->isStereoOutput()) {
+            aFirstFace = 2;
+        }
+        myBtnFullScr->setFaceId(aFirstFace + (myPlugin->params.IsFullscreen->getValue() ? 1 : 0));
     }
     if(myBtnSwapLR != NULL) {
-        const bool hasInput = hasVideo
-                           && aSrcFormat != StFormat_Mono
-                           && aSrcFormat != StFormat_AUTO;
-        myBtnSwapLR->setOpacity(hasInput ? anOpacity : 0.0f, false);
+        myBtnSwapLR->setOpacity(has3dInput ? anOpacity : 0.0f, false);
     }
 
-    const StStereoParams::ViewMode aViewMode = hasVideo && !aParams.isNull()
-                                             ? aParams->ViewingMode
-                                             : StStereoParams::FLAT_IMAGE;
-    bool toShowPano = aViewMode != StStereoParams::FLAT_IMAGE;
+    ///
+
+    const StViewSurface aViewMode = hasVideo && !aParams.isNull()
+                                  ? aParams->ViewingMode
+                                  : StViewSurface_Plain;
+    bool toShowPano = aViewMode != StViewSurface_Plain;
     if(!toShowPano
     &&  hasVideo
     && !aParams.isNull()
@@ -1743,10 +1900,10 @@
         toShowPano = true;
     }
     if(myBtnPanorama != NULL) {
-        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StStereoParams::FLAT_IMAGE);
+        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StViewSurface_Plain);
         myBtnPanorama->setOpacity(toShowPano ? anOpacity : 0.0f, false);
     }
-    myWindow->setTrackOrientation(aViewMode != StStereoParams::FLAT_IMAGE
+    myWindow->setTrackOrientation(aViewMode != StViewSurface_Plain
                                && myPlugin->params.ToTrackHead->getValue());
     StQuaternion<double> aQ = myWindow->getDeviceOrientation();
     myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
@@ -1765,11 +1922,13 @@
         } else if(::isPointIn(myBtnPanorama, theCursor)) {
             size_t aTrPano = MENU_VIEW_SURFACE_PLANE;
             switch(aViewMode) {
-                case StStereoParams::FLAT_IMAGE:       aTrPano = MENU_VIEW_SURFACE_PLANE;   break;
-                case StStereoParams::PANORAMA_SPHERE:  aTrPano = MENU_VIEW_SURFACE_SPHERE;  break;
-                case StStereoParams::PANORAMA_CUBEMAP: aTrPano = MENU_VIEW_SURFACE_CUBEMAP; break;
+                case StViewSurface_Plain:   aTrPano = MENU_VIEW_SURFACE_PLANE;   break;
+                case StViewSurface_Sphere:  aTrPano = MENU_VIEW_SURFACE_SPHERE;  break;
+                case StViewSurface_Cubemap: aTrPano = MENU_VIEW_SURFACE_CUBEMAP; break;
             }
             myDescr->setText(tr(MENU_VIEW_PANORAMA) + "\n" + tr(aTrPano));
+        } else if(::isPointIn(myBtnAdjust, theCursor)) {
+            myDescr->setText(tr(MENU_VIEW_IMAGE_ADJUST));
         } else if(::isPointIn(myBtnAudio, theCursor)) {
             myDescr->setText(tr(MENU_AUDIO));
         } else if(::isPointIn(myBtnSubs, theCursor)) {
@@ -1816,8 +1975,16 @@
         aBuilder.getMenu()->addItem(tr(MENU_AUDIO_NONE), myPlugin->params.AudioStream, -1);
     }
     if(!aStreams.isNull()) {
+        bool hasQuadAudio = false;
         for(size_t aStreamId = 0; aStreamId < aStreams->size(); ++aStreamId) {
-            aBuilder.getMenu()->addItem(aStreams->getValue(aStreamId), myPlugin->params.AudioStream, int32_t(aStreamId));
+            const StString& aStreamName = aStreams->getValue(aStreamId);
+            aBuilder.getMenu()->addItem(aStreamName, myPlugin->params.AudioStream, int32_t(aStreamId));
+            hasQuadAudio = hasQuadAudio
+                        || aStreamName.isContains(stCString("quad,"))
+                        || aStreamName.isContains(stCString("4.0,"));
+        }
+        if(hasQuadAudio) {
+            aBuilder.getMenu()->addItem(myPlugin->params.ToForceBFormat);
         }
     }
     if(myWindow->isMobile()) {
@@ -2091,9 +2258,13 @@
     StParamsList aParams;
     aParams.add(myPlugin->StApplication::params.ActiveDevice);
     aParams.add(myImage->params.DisplayMode);
+    aParams.add(myPlugin->params.ToStickPanorama);
     aRend->getOptions(aParams);
     aParams.add(myPlugin->params.ToShowFps);
     aParams.add(myPlugin->params.UseGpu);
+    if(myPlugin->hasAlHrtf()) {
+        aParams.add(myPlugin->params.AudioAlHrtf);
+    }
 
     if(avcodec_find_decoder_by_name("libopenjpeg") != NULL) {
         aParams.add(myPlugin->params.UseOpenJpeg);
@@ -2101,12 +2272,17 @@
 
     aParams.add(myLangMap->params.language);
     aParams.add(myPlugin->params.IsMobileUI);
+    if(isMobile()) {
+        //aParams.add(myPlugin->params.ToHideStatusBar);
+        aParams.add(myPlugin->params.ToHideNavBar);
+    }
     aParams.add(myPlugin->params.ExitOnEscape);
     if(!isMobile()) {
         aParams.add(myPlugin->params.ToShowExtra);
     }
     if(!isMobile()) {
         aParams.add(myPlugin->params.BlockSleeping);
+        aParams.add(myPlugin->params.ToOpenLast);
     }
 #if !defined(ST_NO_UPDATES_CHECK)
     aParams.add(myPlugin->params.CheckUpdatesDays);

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayerGUI.h -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayerGUI.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,9 +107,13 @@
                               const StHandle<StGLTextureQueue>& theTextureQueue,
                               const StHandle<StSubQueue>&       theSubQueue);
     ST_LOCAL virtual ~StMoviePlayerGUI();
-    ST_LOCAL virtual void stglResize(const StGLBoxPx& theRectPx) ST_ATTR_OVERRIDE;
+
+    ST_LOCAL virtual void stglResize(const StGLBoxPx& theViewPort,
+                                     const StMarginsI& theMargins,
+                                     float theAspect) ST_ATTR_OVERRIDE;
     ST_LOCAL virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
-    ST_LOCAL virtual void stglUpdate(const StPointD_t& thePointZo) ST_ATTR_OVERRIDE;
+    ST_LOCAL virtual void stglUpdate(const StPointD_t& thePointZo,
+                                     bool theIsPreciseInput) ST_ATTR_OVERRIDE;
 
     ST_LOCAL void setVisibility(const StPointD_t& theCursor);
 
@@ -173,6 +177,7 @@
 
     ST_LOCAL void createMobileUpperToolbar();
     ST_LOCAL void createMobileBottomToolbar();
+    ST_LOCAL void createImageAdjustments();
 
         private: //! @name callback Slots
 
@@ -221,6 +226,7 @@
     StGLWidget*         myPanelUpper;       //!< upper toolbar
     StGLTextureButton*  myBtnOpen;
     StGLTextureButton*  myBtnInfo;
+    StGLTextureButton*  myBtnAdjust;
     StGLTextureButton*  myBtnSwapLR;
     StGLCheckboxTextured* myBtnPanorama;
     StGLTextureButton*  myBtnSrcFrmt;
@@ -240,9 +246,17 @@
     StGLTextureButton*  myBtnList;
     StGLCheckboxTextured* myBtnShuffle;
     StGLCheckboxTextured* myBtnLoop;
-    StGLCheckboxTextured* myBtnFullScr;
+    StGLTextureButton*  myBtnFullScr;
     StGLFpsLabel*       myFpsWidget;
 
+    StGLWidget*            myAdjustOverlay; //!< image adjustments control
+    StGLRangeFieldFloat32* myBtnSepDx;
+    StGLRangeFieldFloat32* myBtnSepDy;
+    StGLRangeFieldFloat32* myBtnSepRot;
+    StGLTextureButton*     myBtnReset3d;
+    StGLTextureButton*     myBtnResetColor1;
+    StGLTextureButton*     myBtnResetColor2;
+
     StGLTable*          myHKeysTable;
 
     bool                myIsVisibleGUI;

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayerStrings.cpp -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayerStrings.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,9 @@
 #include "StMoviePlayer.h"
 #include <StStrings/StLangMap.h>
 
+// Degree sign in UTF-8 encoding.
+#define THE_DEGREE_SIGN "\xC2\xB0"
+
 namespace StMoviePlayerStrings {
 
 inline void addAction(StLangMap&              theStrings,
@@ -190,6 +193,10 @@
                "Track orientation");
     theStrings(MENU_VIEW_TRACK_HEAD_POOR,
                "Track orientation (poor)");
+    theStrings(MENU_VIEW_TRACK_HEAD_AUDIO,
+               "Orient audio");
+    theStrings(MENU_VIEW_STICK_PANORAMA360,
+               "Stick at panorama 360" THE_DEGREE_SIGN);
     theStrings(MENU_VIEW_DISPLAY_MODE_STEREO,
                "Stereo");
     theStrings(MENU_VIEW_DISPLAY_MODE_LEFT,
@@ -296,6 +303,10 @@
                "Double click");
     theStrings(OPTION_EXIT_ON_ESCAPE_WINDOWED,
                "When windowed");
+    theStrings(OPTION_HIDE_NAVIGATION_BAR,
+               "Hide system navigation bar");
+    theStrings(OPTION_OPEN_LAST_ON_STARTUP,
+               "Open last played file on startup");
 
     theStrings(FILE_VIDEO_OPEN,
                "Open another movie");
@@ -584,10 +595,10 @@
               "Angular separation - increase");
     addAction(theStrings, StMoviePlayer::Action_StereoParamsBegin + StGLImageRegion::Action_Rot90Counter,
               "DoParamsRotZ90Dec",
-              "Rotate 90 degrees counterclockwise");
+              "Rotate 90" THE_DEGREE_SIGN " counterclockwise");
     addAction(theStrings, StMoviePlayer::Action_StereoParamsBegin + StGLImageRegion::Action_Rot90Clockwise,
               "DoParamsRotZ90Inc",
-              "Rotate 90 degrees clockwise");
+              "Rotate 90" THE_DEGREE_SIGN " clockwise");
     addAction(theStrings, StMoviePlayer::Action_StereoParamsBegin + StGLImageRegion::Action_RotCounter,
               "DoParamsRotZDec",
               "Rotate counterclockwise");

sview-16_06.tar.gz/StMoviePlayer/StMoviePlayerStrings.h -> sview-17_04.tar.gz/StMoviePlayer/StMoviePlayerStrings.h Changed

sview-16_06.tar.gz/StMoviePlayer/StVideo/StALContext.cpp -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StALContext.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,21 +17,68 @@
  */
 
 #include "StALContext.h"
+
 #include <StStrings/StLogger.h>
+#include <StThreads/StProcess.h>
 
 #ifndef ALC_CONNECTED
     #define ALC_CONNECTED 0x313 // undefined on mac os
 #endif
 
+namespace {
+    /**
+     * Return string for the status.
+     */
+    const char* hrtfStatusToString(ALCint theStatus) {
+        switch(theStatus) {
+            case ALC_HRTF_DISABLED_SOFT:            return "Disabled";
+            case ALC_HRTF_ENABLED_SOFT:             return "Enabled";
+            case ALC_HRTF_DENIED_SOFT:              return "Denied";
+            case ALC_HRTF_REQUIRED_SOFT:            return "Required";
+            case ALC_HRTF_HEADPHONES_DETECTED_SOFT: return "Headphones detected";
+            case ALC_HRTF_UNSUPPORTED_FORMAT_SOFT:  return "Unsupported format";
+        }
+        return "UNKNOWN";
+    }
+
+    /**
+     * Initialize OpenAL resources.
+     */
+    bool stalGlobalInit() {
+    #ifdef __APPLE__
+        static bool isFirstCall = true;
+        if(!isFirstCall) {
+            return true;
+        }
+        isFirstCall = false;
+
+        // append sView resources folder to OpenAL search path
+        // so that we can put default hrtf tables into OS X application bundle
+        const StString anStResFolder = StProcess::getStShareFolder();
+        StString aDataDirs = StProcess::getEnv("XDG_DATA_DIRS");
+        if(aDataDirs.isEmpty()) {
+            aDataDirs = "/usr/local/share/:/usr/share/";
+        }
+        aDataDirs = aDataDirs + ":" + anStResFolder;
+        StProcess::setEnv("XDG_DATA_DIRS", aDataDirs);
+    #endif
+        return true;
+    }
+}
+
 StALContext::StALContext()
 : hasExtEAX2(false),
   hasExtFloat32(false),
   hasExtFloat64(false),
   hasExtMultiChannel(false),
+  hasExtBFormat(false),
   hasExtDisconnect(false),
-  hDevice(NULL),
-  hContext(NULL) {
-    //
+  hasExtSoftHrtf(false),
+  alcGetStringiSOFT(NULL),
+  alcResetDeviceSOFT(NULL),
+  myAlDevice(NULL),
+  myAlContext(NULL) {
+    stalGlobalInit();
 }
 
 StALContext::~StALContext() {
@@ -39,36 +86,44 @@
 }
 
 StString StALContext::toStringExtensions() const {
-    StString extList = "OpenAL extensions:\n";
+    StString anExtList = "OpenAL extensions: ";
     if(hasExtEAX2) {
-        extList += " - EAX2.0;\n";
+        anExtList += "EAX2.0 ";
     }
     if(hasExtFloat32) {
-        extList += " - float32 mono/stereo formats;\n";
+        anExtList += "float32 ";
     }
     if(hasExtFloat64) {
-        extList += " - float64 mono/stereo formats;\n";
+        anExtList += "float64 ";
     }
     if(hasExtMultiChannel) {
-        extList += " - multi-channel formats;\n";
+        anExtList += "multi-channel ";
+    }
+    if(hasExtBFormat) {
+        anExtList += "B-Format ";
     }
     if(hasExtDisconnect) {
-        extList += " - ALC_EXT_disconnect;\n";
+        anExtList += "ALC_EXT_disconnect ";
     }
-    return extList;
+    if(hasExtSoftHrtf) {
+        ALCint aHrtfStatus = ALC_HRTF_DISABLED_SOFT;
+        alcGetIntegerv(myAlDevice, ALC_HRTF_STATUS_SOFT, 1, &aHrtfStatus);
+        anExtList += StString("ALC_SOFT_HRTF [") + hrtfStatusToString(aHrtfStatus) + "] ";
+    }
+    return anExtList;
 }
 
 bool StALContext::create(const std::string& theDeviceName) {
     if(theDeviceName.empty()) {
         // open default device
-        hDevice = alcOpenDevice(NULL);
+        myAlDevice = alcOpenDevice(NULL);
     } else {
-        hDevice = alcOpenDevice(theDeviceName.c_str());
+        myAlDevice = alcOpenDevice(theDeviceName.c_str());
     }
-    if(hDevice == NULL) {
+    if(myAlDevice == NULL) {
         return false;
     }
-    hContext = alcCreateContext(hDevice, NULL);
+    myAlContext = alcCreateContext(myAlDevice, NULL);
     makeCurrent();
 
     // check extensions
@@ -76,7 +131,14 @@
     hasExtFloat32      = alIsExtensionPresent("AL_EXT_float32")   == AL_TRUE;
     hasExtFloat64      = alIsExtensionPresent("AL_EXT_double")    == AL_TRUE;
     hasExtMultiChannel = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE;
-    hasExtDisconnect   = alcIsExtensionPresent(hDevice, "ALC_EXT_disconnect") == AL_TRUE;
+    hasExtBFormat      = alIsExtensionPresent("AL_EXT_BFORMAT")   == AL_TRUE;
+    hasExtDisconnect   = alcIsExtensionPresent(myAlDevice, "ALC_EXT_disconnect") == AL_TRUE;
+    if(alcIsExtensionPresent(myAlDevice, "ALC_SOFT_HRTF") == AL_TRUE) {
+        alcGetStringiSOFT  = (alcGetStringiSOFT_t  )alcGetProcAddress(myAlDevice, "alcGetStringiSOFT");
+        alcResetDeviceSOFT = (alcResetDeviceSOFT_t )alcGetProcAddress(myAlDevice, "alcResetDeviceSOFT");
+        hasExtSoftHrtf = alcGetStringiSOFT  != NULL
+                      && alcResetDeviceSOFT != NULL;
+    }
 
     // debug info
     ST_DEBUG_LOG(toStringExtensions());
@@ -84,35 +146,69 @@
     return true;
 }
 
+void StALContext::fullInfo(StDictionary& theMap) const {
+    StString anExtensions, aHrtfState;
+    if(hasExtFloat32) {
+        anExtensions += "AL_EXT_float32 ";
+    }
+    if(hasExtFloat64) {
+        anExtensions += "AL_EXT_double ";
+    }
+    if(hasExtMultiChannel) {
+        anExtensions += "AL_EXT_MCFORMATS ";
+    }
+    if(hasExtBFormat) {
+        anExtensions += "AL_EXT_BFORMAT ";
+    }
+    if(hasExtDisconnect) {
+        anExtensions += "ALC_EXT_disconnect ";
+    }
+    if(hasExtSoftHrtf) {
+        ALCint aHrtfStatus = ALC_HRTF_DISABLED_SOFT;
+        alcGetIntegerv(myAlDevice, ALC_HRTF_STATUS_SOFT, 1, &aHrtfStatus);
+        aHrtfState = hrtfStatusToString(aHrtfStatus);
+    }
+
+    theMap.add(StDictEntry("ALvendor",    (const char* )alGetString(AL_VENDOR)));
+    theMap.add(StDictEntry("ALrenderer",  (const char* )alGetString(AL_RENDERER)));
+    theMap.add(StDictEntry("ALversion",   (const char* )alGetString(AL_VERSION)));
+    theMap.add(StDictEntry("OpenAL extensions", anExtensions));
+    theMap.add(StDictEntry("OpenAL HRTF mixing", !aHrtfState.isEmpty() ? aHrtfState : "Not implemented"));
+}
+
 void StALContext::destroy() {
     alcMakeContextCurrent(NULL);
-    if(hContext != NULL && hDevice != NULL) {
-        alcDestroyContext(hContext);
-        alcCloseDevice(hDevice);
+    if(myAlContext != NULL && myAlDevice != NULL) {
+        alcDestroyContext(myAlContext);
+        alcCloseDevice(myAlDevice);
     }
-    hContext = NULL;
-    hDevice = NULL;
+    myAlContext = NULL;
+    myAlDevice = NULL;
 
     // remove extensions
     hasExtEAX2 = false;
     hasExtFloat32 = false;
     hasExtFloat64 = false;
     hasExtMultiChannel = false;
-    hasExtDisconnect = false;
+    hasExtBFormat      = false;
+    hasExtDisconnect   = false;
+    hasExtSoftHrtf     = false;
+    alcGetStringiSOFT  = NULL;
+    alcResetDeviceSOFT = NULL;
 }
 
 bool StALContext::makeCurrent() {
-    return alcMakeContextCurrent(hContext) == AL_TRUE;
+    return alcMakeContextCurrent(myAlContext) == AL_TRUE;
 }
 
 bool StALContext::isConnected() const {
-    if(hDevice == NULL) {
+    if(myAlDevice == NULL) {
         return false;
     } else if(!hasExtDisconnect) {
         return true;
     }
 
     ALint aConnected = AL_FALSE;
-    alcGetIntegerv(hDevice, ALC_CONNECTED, 1, &aConnected);
+    alcGetIntegerv(myAlDevice, ALC_CONNECTED, 1, &aConnected);
     return aConnected == AL_TRUE;
 }

sview-16_06.tar.gz/StMoviePlayer/StVideo/StALContext.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StALContext.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #ifndef __StALContext_h_
 #define __StALContext_h_
 
-#include <StStrings/StString.h>
+#include <StStrings/StDictionary.h>
 
 // OpenAL headers
 #if (defined(__APPLE__))
@@ -32,6 +32,36 @@
     #include <AL/alext.h>
 #endif
 
+namespace {
+    // Accepted as part of the <attrList> parameter of alcCreateContext and alcDeviceResetSOFT(), and as the <paramName> parameter of alcGetIntegerv()
+    #define ALC_HRTF_SOFT                            0x1992
+
+    // Accepted as part of the <attrList> parameter of alcCreateContext() and alcDeviceResetSOFT()
+    #define ALC_HRTF_ID_SOFT                         0x1996
+
+    // Accepted as part of the <attrList> parameter of alcCreateContext() and alcDeviceResetSOFT(), for the ALC_HRTF_SOFT attribute.
+    #define ALC_DONT_CARE_SOFT                       0x0002
+
+    // Accepted as the <paramName> parameter of alcGetIntegerv()
+    #define ALC_HRTF_STATUS_SOFT                     0x1993
+    #define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
+
+    // Accepted as the <paramName> parameter of alcGetString() and alcGetStringiSOFT()
+    #define ALC_HRTF_SPECIFIER_SOFT                  0x1995
+
+    // Possible results from a ALC_HRTF_STATUS_SOFT query
+    #define ALC_HRTF_DISABLED_SOFT                   0x0000
+
+    #define ALC_HRTF_ENABLED_SOFT                    0x0001
+    #define ALC_HRTF_DENIED_SOFT                     0x0002
+    #define ALC_HRTF_REQUIRED_SOFT                   0x0003
+    #define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
+    #define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
+
+    typedef const ALCchar* (ALC_APIENTRY* alcGetStringiSOFT_t )(ALCdevice* device, ALCenum paramName, ALCsizei index);
+    typedef ALCboolean     (ALC_APIENTRY* alcResetDeviceSOFT_t)(ALCdevice* device, const ALCint* attrList);
+}
+
 /**
  * Wrapper over C-interface to OpenAL library.
  * Represent the device context.
@@ -44,7 +74,12 @@
     bool hasExtFloat32;      //!< has 32bit float formats
     bool hasExtFloat64;      //!< has 64bit float formats
     bool hasExtMultiChannel; //!< has multichannel formats
+    bool hasExtBFormat;      //!< AL_EXT_BFORMAT
     bool hasExtDisconnect;   //!< ALC_EXT_disconnect
+    bool hasExtSoftHrtf;     //!< ALC_SOFT_HRTF
+
+    alcGetStringiSOFT_t  alcGetStringiSOFT;
+    alcResetDeviceSOFT_t alcResetDeviceSOFT;
 
         public:
 
@@ -64,6 +99,11 @@
     ST_CPPEXPORT StString toStringExtensions() const;
 
     /**
+     * Retrieve info from OpenAL context.
+     */
+    ST_CPPEXPORT void fullInfo(StDictionary& theMap) const;
+
+    /**
      * Creates the AL device with specified name.
      */
     ST_CPPEXPORT bool create(const std::string& theDeviceName);
@@ -84,10 +124,20 @@
      */
     ST_CPPEXPORT bool isConnected() const;
 
+    /**
+     * Return OpenAL device.
+     */
+    ST_LOCAL ALCdevice* getAlDevice() { return myAlDevice; }
+
+    /**
+     * Return OpenAL context.
+     */
+    ST_LOCAL ALCcontext* getAlContext() { return myAlContext; }
+
         private: //!< private fields
 
-    ALCdevice*  hDevice;
-    ALCcontext* hContext;
+    ALCdevice*  myAlDevice;
+    ALCcontext* myAlContext;
 
 };

sview-16_06.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.h Changed

sview-16_06.tar.gz/StMoviePlayer/StVideo/StAudioQueue.cpp -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StAudioQueue.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,37 +21,44 @@
 #include <StGL/StGLVec.h>
 #include <StThreads/StThread.h>
 
-/**
- * Check OpenAL state.
- */
-bool stalCheckErrors(const StString& ST_DEBUG_VAR(theProcedure)) {
-    ALenum anError = alGetError();
-    switch(anError) {
-        case AL_NO_ERROR: return true; // alright
-        case AL_INVALID_NAME:      ST_DEBUG_LOG(theProcedure + ": AL_INVALID_NAME");      return false;
-        case AL_INVALID_ENUM:      ST_DEBUG_LOG(theProcedure + ": AL_INVALID_ENUM");      return false;
-        case AL_INVALID_VALUE:     ST_DEBUG_LOG(theProcedure + ": AL_INVALID_VALUE");     return false;
-        case AL_INVALID_OPERATION: ST_DEBUG_LOG(theProcedure + ": AL_INVALID_OPERATION"); return false;
-        case AL_OUT_OF_MEMORY:     ST_DEBUG_LOG(theProcedure + ": AL_OUT_OF_MEMORY");     return false;
-        default:                   ST_DEBUG_LOG(theProcedure + ": OpenAL unknown error"); return false;
+namespace {
+
+    /**
+     * Check OpenAL state.
+     */
+    bool stalCheckErrors(const StString& ST_DEBUG_VAR(theProcedure)) {
+        ALenum anError = alGetError();
+        switch(anError) {
+            case AL_NO_ERROR: return true; // alright
+            case AL_INVALID_NAME:      ST_DEBUG_LOG(theProcedure + ": AL_INVALID_NAME");      return false;
+            case AL_INVALID_ENUM:      ST_DEBUG_LOG(theProcedure + ": AL_INVALID_ENUM");      return false;
+            case AL_INVALID_VALUE:     ST_DEBUG_LOG(theProcedure + ": AL_INVALID_VALUE");     return false;
+            case AL_INVALID_OPERATION: ST_DEBUG_LOG(theProcedure + ": AL_INVALID_OPERATION"); return false;
+            case AL_OUT_OF_MEMORY:     ST_DEBUG_LOG(theProcedure + ": AL_OUT_OF_MEMORY");     return false;
+            default:                   ST_DEBUG_LOG(theProcedure + ": OpenAL unknown error"); return false;
+        }
     }
-}
 
-static const StGLVec3 POSITION_LEFT         (-1.0f, 0.0f,  0.0f);
-static const StGLVec3 POSITION_RIGHT        ( 1.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_POSITION_LEFT         (-1.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_POSITION_RIGHT        ( 1.0f, 0.0f,  0.0f);
+
+    static const StGLVec3 THE_POSITION_CENTER       ( 0.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_POSITION_FRONT_LEFT   (-1.0f, 0.0f, -1.0f);
+    static const StGLVec3 THE_POSITION_FRONT_CENTER ( 0.0f, 0.0f, -1.0f);
+    static const StGLVec3 THE_POSITION_FRONT_RIGHT  ( 1.0f, 0.0f, -1.0f);
+    static const StGLVec3 THE_POSITION_LFE          ( 0.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_POSITION_REAR_LEFT    (-1.0f, 0.0f,  1.0f);
+    static const StGLVec3 THE_POSITION_REAR_RIGHT   ( 1.0f, 0.0f,  1.0f);
 
-static const StGLVec3 POSITION_CENTER       ( 0.0f, 0.0f,  0.0f);
-static const StGLVec3 POSITION_FRONT_LEFT   (-1.0f, 0.0f, -1.0f);
-static const StGLVec3 POSITION_FRONT_CENTER ( 0.0f, 0.0f, -1.0f);
-static const StGLVec3 POSITION_FRONT_RIGHT  ( 1.0f, 0.0f, -1.0f);
-static const StGLVec3 POSITION_LFE          ( 0.0f, 0.0f,  0.0f);
-static const StGLVec3 POSITION_REAR_LEFT    (-1.0f, 0.0f,  1.0f);
-static const StGLVec3 POSITION_REAR_RIGHT   ( 1.0f, 0.0f,  1.0f);
+    static const StGLVec3 THE_POSITION_REAR_LEFT71  (-1.0f, 0.0f,  1.0f);
+    static const StGLVec3 THE_POSITION_REAR_RIGHT71 ( 1.0f, 0.0f,  1.0f);
+    static const StGLVec3 THE_POSITION_SIDE_LEFT71  (-1.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_POSITION_SIDE_RIGHT71 ( 1.0f, 0.0f,  0.0f);
 
-static const StGLVec3 POSITION_REAR_LEFT71  (-1.0f, 0.0f,  1.0f);
-static const StGLVec3 POSITION_REAR_RIGHT71 ( 1.0f, 0.0f,  1.0f);
-static const StGLVec3 POSITION_SIDE_LEFT71  (-1.0f, 0.0f,  0.0f);
-static const StGLVec3 POSITION_SIDE_RIGHT71 ( 1.0f, 0.0f,  0.0f);
+    static const StGLVec3 THE_LISTENER_FORWARD      ( 0.0f, 0.0f, -1.0f);
+    static const StGLVec3 THE_LISTENER_UP           ( 0.0f, 1.0f,  0.0f);
+
+}
 
 #if(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0))
 /**
@@ -78,59 +85,59 @@
 #endif
 
 void StAudioQueue::stalConfigureSources1() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_CENTER);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_CENTER);
     stalCheckErrors("alSource*1.0");
 }
 
 void StAudioQueue::stalConfigureSources2_0() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_RIGHT);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_RIGHT);
     stalCheckErrors("alSource*2.0");
 }
 
 void StAudioQueue::stalConfigureSources3_0() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_RIGHT);
-    alSourcefv(myAlSources[2], AL_POSITION, POSITION_CENTER);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_RIGHT);
+    alSourcefv(myAlSources[2], AL_POSITION, THE_POSITION_CENTER);
     stalCheckErrors("alSource*3.0");
 }
 
 void StAudioQueue::stalConfigureSources4_0() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_FRONT_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_FRONT_RIGHT);
-    alSourcefv(myAlSources[2], AL_POSITION, POSITION_REAR_LEFT);
-    alSourcefv(myAlSources[3], AL_POSITION, POSITION_REAR_RIGHT);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_FRONT_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_FRONT_RIGHT);
+    alSourcefv(myAlSources[2], AL_POSITION, THE_POSITION_REAR_LEFT);
+    alSourcefv(myAlSources[3], AL_POSITION, THE_POSITION_REAR_RIGHT);
     stalCheckErrors("alSource*4.0");
 }
 
 void StAudioQueue::stalConfigureSources5_0() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_FRONT_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_FRONT_RIGHT);
-    alSourcefv(myAlSources[2], AL_POSITION, POSITION_FRONT_CENTER);
-    alSourcefv(myAlSources[3], AL_POSITION, POSITION_REAR_LEFT);
-    alSourcefv(myAlSources[4], AL_POSITION, POSITION_REAR_RIGHT);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_FRONT_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_FRONT_RIGHT);
+    alSourcefv(myAlSources[2], AL_POSITION, THE_POSITION_FRONT_CENTER);
+    alSourcefv(myAlSources[3], AL_POSITION, THE_POSITION_REAR_LEFT);
+    alSourcefv(myAlSources[4], AL_POSITION, THE_POSITION_REAR_RIGHT);
     stalCheckErrors("alSource*5.0");
 }
 
 void StAudioQueue::stalConfigureSources5_1() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_FRONT_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_FRONT_RIGHT);
-    alSourcefv(myAlSources[2], AL_POSITION, POSITION_FRONT_CENTER);
-    alSourcefv(myAlSources[3], AL_POSITION, POSITION_LFE);
-    alSourcefv(myAlSources[4], AL_POSITION, POSITION_REAR_LEFT);
-    alSourcefv(myAlSources[5], AL_POSITION, POSITION_REAR_RIGHT);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_FRONT_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_FRONT_RIGHT);
+    alSourcefv(myAlSources[2], AL_POSITION, THE_POSITION_FRONT_CENTER);
+    alSourcefv(myAlSources[3], AL_POSITION, THE_POSITION_LFE);
+    alSourcefv(myAlSources[4], AL_POSITION, THE_POSITION_REAR_LEFT);
+    alSourcefv(myAlSources[5], AL_POSITION, THE_POSITION_REAR_RIGHT);
     stalCheckErrors("alSource*5.1");
 }
 
 void StAudioQueue::stalConfigureSources7_1() {
-    alSourcefv(myAlSources[0], AL_POSITION, POSITION_FRONT_LEFT);
-    alSourcefv(myAlSources[1], AL_POSITION, POSITION_FRONT_RIGHT);
-    alSourcefv(myAlSources[2], AL_POSITION, POSITION_FRONT_CENTER);
-    alSourcefv(myAlSources[3], AL_POSITION, POSITION_LFE);
-    alSourcefv(myAlSources[4], AL_POSITION, POSITION_REAR_LEFT71);
-    alSourcefv(myAlSources[5], AL_POSITION, POSITION_REAR_RIGHT71);
-    alSourcefv(myAlSources[6], AL_POSITION, POSITION_SIDE_LEFT71);
-    alSourcefv(myAlSources[7], AL_POSITION, POSITION_SIDE_RIGHT71);
+    alSourcefv(myAlSources[0], AL_POSITION, THE_POSITION_FRONT_LEFT);
+    alSourcefv(myAlSources[1], AL_POSITION, THE_POSITION_FRONT_RIGHT);
+    alSourcefv(myAlSources[2], AL_POSITION, THE_POSITION_FRONT_CENTER);
+    alSourcefv(myAlSources[3], AL_POSITION, THE_POSITION_LFE);
+    alSourcefv(myAlSources[4], AL_POSITION, THE_POSITION_REAR_LEFT71);
+    alSourcefv(myAlSources[5], AL_POSITION, THE_POSITION_REAR_RIGHT71);
+    alSourcefv(myAlSources[6], AL_POSITION, THE_POSITION_SIDE_LEFT71);
+    alSourcefv(myAlSources[7], AL_POSITION, THE_POSITION_SIDE_RIGHT71);
     stalCheckErrors("alSource*7.1");
 }
 
@@ -148,64 +155,126 @@
         }
     }
     myAlCtx.makeCurrent();
+    stalResetHrtf();
+    {
+        StMutexAuto aLock(myAlInfoMutex);
+        myAlInfo.clear();
+        myAlCtx.fullInfo(myAlInfo);
+    }
 
     alGetError(); // clear error code
 
     // generate the buffers
-    for(size_t srcId = 0; srcId < NUM_AL_SOURCES; ++srcId) {
-        alGenBuffers(NUM_AL_BUFFERS, &myAlBuffers[srcId][0]);
-        stalCheckErrors(StString("alGenBuffers") + srcId);
+    for(size_t aSrcId = 0; aSrcId < THE_NUM_AL_SOURCES; ++aSrcId) {
+        alGenBuffers(THE_NUM_AL_BUFFERS, &myAlBuffers[aSrcId][0]);
+        stalCheckErrors(StString("alGenBuffers") + aSrcId);
     }
 
     // generate the sources
-    alGenSources(NUM_AL_SOURCES, myAlSources);
+    alGenSources(THE_NUM_AL_SOURCES, myAlSources);
     stalCheckErrors("alGenSources");
 
     // configure sources
     const StGLVec3 aZeroVec(0.0f);
-    for(size_t srcId = 0; srcId < NUM_AL_SOURCES; ++srcId) {
-        alSourcefv(myAlSources[srcId], AL_POSITION,        aZeroVec);
-        alSourcefv(myAlSources[srcId], AL_VELOCITY,        aZeroVec);
-        alSourcefv(myAlSources[srcId], AL_DIRECTION,       aZeroVec);
-        alSourcef (myAlSources[srcId], AL_ROLLOFF_FACTOR,  0.0f);
-        alSourcei (myAlSources[srcId], AL_SOURCE_RELATIVE, AL_TRUE);
-        alSourcef (myAlSources[srcId], AL_GAIN,            1.0f);
-        stalCheckErrors(StString("alSource*") + srcId);
+    for(size_t aSrcId = 0; aSrcId < THE_NUM_AL_SOURCES; ++aSrcId) {
+        alSourcefv(myAlSources[aSrcId], AL_POSITION,        aZeroVec);
+        alSourcefv(myAlSources[aSrcId], AL_VELOCITY,        aZeroVec);
+        alSourcefv(myAlSources[aSrcId], AL_DIRECTION,       aZeroVec);
+        alSourcef (myAlSources[aSrcId], AL_ROLLOFF_FACTOR,  0.0f);
+        //alSourcei(myAlSources[aSrcId], AL_SOURCE_RELATIVE, myToOrientListener ? AL_FALSE : AL_TRUE);
+        alSourcei (myAlSources[aSrcId], AL_SOURCE_RELATIVE, AL_FALSE);
+        alSourcef (myAlSources[aSrcId], AL_GAIN,            1.0f);
+        stalCheckErrors(StString("alSource*") + aSrcId);
     }
 
     // configure listener
-    const StGLVec3 aListenerOri[2] = { -StGLVec3::DZ(),    // forward
-                                        StGLVec3::DY()  }; // up
-    alListenerfv(AL_POSITION,    aZeroVec);
-    alListenerfv(AL_VELOCITY,    aZeroVec);
-    alListenerfv(AL_ORIENTATION, (const ALfloat* )aListenerOri);
-    alListenerf (AL_GAIN,        myAlGain); // apply gain to all sources at-once
+    alListenerfv(AL_POSITION, aZeroVec);
+    alListenerfv(AL_VELOCITY, aZeroVec);
+    alListenerf (AL_GAIN,     myAlGain); // apply gain to all sources at-once
+    stalOrientListener();
     return true;
 }
 
 void StAudioQueue::stalDeinit() {
     // clear buffers
     stalEmpty();
-    alSourceStopv(NUM_AL_SOURCES, myAlSources);
+    alSourceStopv(THE_NUM_AL_SOURCES, myAlSources);
 
-    alDeleteSources(NUM_AL_SOURCES, myAlSources);
+    alDeleteSources(THE_NUM_AL_SOURCES, myAlSources);
     stalCheckErrors("alDeleteSources");
 
-    for(size_t srcId = 0; srcId < NUM_AL_SOURCES; ++srcId) {
-        alDeleteBuffers(NUM_AL_BUFFERS, &myAlBuffers[srcId][0]);
-        stalCheckErrors(StString("alDeleteBuffers") + srcId);
+    for(size_t aSrcId = 0; aSrcId < THE_NUM_AL_SOURCES; ++aSrcId) {
+        alDeleteBuffers(THE_NUM_AL_BUFFERS, &myAlBuffers[aSrcId][0]);
+        stalCheckErrors(StString("alDeleteBuffers") + aSrcId);
     }
 
     // close device
     myAlCtx.destroy();
 }
 
+void StAudioQueue::stalReinitialize() {
+    stalDeinit(); // release OpenAL context
+    myIsAlValid = (stalInit() ? ST_AL_INIT_OK : ST_AL_INIT_KO);
+
+    myIsDisconnected = false;
+    myToSwitchDev    = false;
+}
+
+void StAudioQueue::stalResetHrtf() {
+    const bool wasChanged = myAlHrtf != myAlHrtfPrev;
+    myAlHrtfPrev = myAlHrtf;
+    if(!myAlCtx.hasExtSoftHrtf) {
+        return;
+    }
+
+    ALCint aHrtfVal = ALC_DONT_CARE_SOFT;
+    if(myAlHrtf == StAlHrtfRequest_ForceOn) {
+        aHrtfVal = ALC_TRUE;
+    } else if(myAlHrtf == StAlHrtfRequest_ForceOff) {
+        aHrtfVal = ALC_FALSE;
+    }
+    ALCint anAttrs[] = {
+        ALC_HRTF_SOFT, aHrtfVal,
+        0
+    };
+    myAlCtx.alcResetDeviceSOFT(myAlCtx.getAlDevice(), anAttrs);
+    if(wasChanged) {
+        (void )wasChanged;
+        ST_DEBUG_LOG(myAlCtx.toStringExtensions())
+    }
+}
+
+void StAudioQueue::stalOrientListener() {
+    if(myToOrientListener) {
+        StGLQuaternion aHeadOrient;
+        {
+            StMutexAuto aLock(mySwitchMutex);
+            aHeadOrient = myHeadOrient;
+            aHeadOrient.reverse();
+            aHeadOrient.normalize();
+        }
+
+        const StGLVec3 aFwdVec = aHeadOrient.multiply(THE_LISTENER_FORWARD);
+        const StGLVec3 anUpVec = aHeadOrient.multiply(THE_LISTENER_UP);
+        const StGLVec3 aListenerOri[2] = { aFwdVec, anUpVec };
+
+        //static StGLVec3 aPrev; if(aFwdVec != aPrev) { aPrev = aFwdVec; ST_DEBUG_LOG("FWD: " + aFwdVec.toString() + "\n[UP: " + anUpVec.toString() + "]\n") }
+
+        alListenerfv(AL_ORIENTATION, (const ALfloat* )aListenerOri);
+        myAlIsListOrient = true;
+    } else if(myAlIsListOrient) {
+        const StGLVec3 aListenerOri[2] = { THE_LISTENER_FORWARD, THE_LISTENER_UP };
+        alListenerfv(AL_ORIENTATION, (const ALfloat* )aListenerOri);
+        myAlIsListOrient = false;
+    }
+}
+
 void StAudioQueue::stalEmpty() {
-    alSourceStopv(NUM_AL_SOURCES, myAlSources);
+    alSourceStopv(THE_NUM_AL_SOURCES, myAlSources);
 
     ALint aBufQueued = 0;
     ALuint alBuffIdToUnqueue = 0;
-    for(size_t aSrcId = 0; aSrcId < NUM_AL_SOURCES; ++aSrcId) {
+    for(size_t aSrcId = 0; aSrcId < THE_NUM_AL_SOURCES; ++aSrcId) {
         alGetSourcei(myAlSources[aSrcId], AL_BUFFERS_QUEUED, &aBufQueued);
         for(ALint aBufIter = 0; aBufIter < aBufQueued; ++aBufIter) {
             alSourceUnqueueBuffers(myAlSources[aSrcId], 1, &alBuffIdToUnqueue);
@@ -213,7 +282,7 @@
         }
         alSourcei(myAlSources[aSrcId], AL_BUFFER, 0);
     }
-    ///alSourceRewindv(NUM_AL_SOURCES, myAlSources);
+    ///alSourceRewindv(THE_NUM_AL_SOURCES, myAlSources);
 }
 
 ALenum StAudioQueue::stalGetSourceState() {
@@ -241,7 +310,8 @@
     return SV_THREAD_RETURN 0;
 }
 
-StAudioQueue::StAudioQueue(const std::string& theAlDeviceName)
+StAudioQueue::StAudioQueue(const std::string& theAlDeviceName,
+                           StAudioQueue::StAlHrtfRequest theAlHrtf)
 : StAVPacketQueue(512),
   myPlaybackTimer(false),
   myDowntimeEvent(true),
@@ -253,12 +323,20 @@
   myIsAlValid(ST_AL_INIT_NA),
   myToSwitchDev(false),
   myIsDisconnected(false),
+  myToOrientListener(false),
+  myToForceBFormat(false),
   myAlDeviceName(theAlDeviceName),
   myAlFormat(AL_FORMAT_STEREO16),
   myPrevFormat(AL_FORMAT_STEREO16),
   myPrevFrequency(0),
   myAlGain(1.0f),
   myAlGainPrev(1.0f),
+  myAlSoftLayout(true),
+  myAlIsListOrient(false),
+  myAlCanBFormat(false),
+  myAlIsBFormat(false),
+  myAlHrtf(theAlHrtf),
+  myAlHrtfPrev(theAlHrtf),
   myDbgPrevQueued(-1),
   myDbgPrevSrcState(-1) {
     stMemSet(myAlSources, 0, sizeof(myAlSources));
@@ -322,6 +400,17 @@
     return true;
 }
 
+bool StAudioQueue::initOut20Soft(const bool theIsPlanar) {
+    if(!setupOutMonoFormat()) {
+        return false;
+    }
+
+    myBufferOut.setupChannels(StChannelMap::CH20, StChannelMap::PCM, 2);
+    myBufferSrc.setupChannels(StChannelMap::CH20, StChannelMap::PCM, theIsPlanar ? myCodecCtx->channels : 1);
+    stalConfigureSources2_0();
+    return true;
+}
+
 bool StAudioQueue::initOut30Soft(const bool theIsPlanar) {
     if(!setupOutMonoFormat()) {
         return false;
@@ -410,6 +499,34 @@
     return true;
 }
 
+bool StAudioQueue::initOut40BFormat(const bool theIsPlanar) {
+    switch(myBufferSrc.getFormat()) {
+        case StPcmFormat_Int32:
+        case StPcmFormat_Float32:
+        case StPcmFormat_Float64: {
+            myAlFormat = alGetEnumValue("AL_FORMAT_BFORMAT3D_FLOAT32");
+            myBufferOut.setFormat(StPcmFormat_Float32);
+            break;
+        }
+        case StPcmFormat_Int16: {
+            myAlFormat = alGetEnumValue("AL_FORMAT_BFORMAT3D_16");
+            myBufferOut.setFormat(StPcmFormat_Int16);
+            break;
+        }
+        case StPcmFormat_UInt8: {
+            myAlFormat = alGetEnumValue("AL_FORMAT_BFORMAT3D_8");
+            myBufferOut.setFormat(StPcmFormat_UInt8);
+            break;
+        }
+        default: return false;
+    }
+
+    myBufferSrc.setupChannels(StChannelMap::CH40, StChannelMap::WYZX, theIsPlanar ? myCodecCtx->channels : 1);
+    myBufferOut.setupChannels(StChannelMap::CH40, StChannelMap::PCM, 1);
+    stalConfigureSources1();
+    return true;
+}
+
 bool StAudioQueue::initOut50Soft(const bool theIsPlanar) {
     if(!setupOutMonoFormat()) {
         return false;
@@ -540,42 +657,68 @@
         false;
     #endif
 
+    myAlCanBFormat = false;
+    myAlIsBFormat  = false;
     switch(myCodecCtx->channels) {
         case 1: {
+            myAlSoftLayout = true; // just unsupported
             return initOutMono();
         }
         case 2: {
-            return initOutStereo(isPlanar);
+            if(!myToOrientListener) {
+                myAlSoftLayout = false;
+                return initOutStereo(isPlanar);
+            } else {
+                myAlSoftLayout = true;
+                return initOut20Soft(isPlanar);
+            }
         }
         case 3: {
+            myAlSoftLayout = true;
             return initOut30Soft(isPlanar);
         }
         case 4: {
-            if(myAlCtx.hasExtMultiChannel) {
+            myAlCanBFormat = myAlCtx.hasExtBFormat;
+            if(myToForceBFormat && myAlCtx.hasExtBFormat) {
+                myAlSoftLayout = true;
+                myAlIsBFormat  = true;
+                return initOut40BFormat(isPlanar);
+            }
+            if(myAlCtx.hasExtMultiChannel && !myToOrientListener) {
+                myAlSoftLayout = false;
                 return initOut40Ext(isPlanar);
             }
             ST_DEBUG_LOG("OpenAL: multichannel extension (AL_FORMAT_QUAD16) is unavailable");
+            myAlSoftLayout = true;
             return initOut40Soft(isPlanar);
         }
         case 5: {
+            myAlSoftLayout = true;
             return initOut50Soft(isPlanar);
         }
         case 6: {
-            if(myAlCtx.hasExtMultiChannel) {
+            if(myAlCtx.hasExtMultiChannel && !myToOrientListener) {
+                myAlSoftLayout = false;
                 return initOut51Ext(isPlanar);
             }
             ST_DEBUG_LOG("OpenAL: multichannel extension (AL_FORMAT_51CHN16) is unavailable");
+            myAlSoftLayout = true;
             return initOut51Soft(isPlanar);
         }
         case 8: {
-            if(myAlCtx.hasExtMultiChannel) {
+            if(myAlCtx.hasExtMultiChannel && !myToOrientListener) {
+                myAlSoftLayout = false;
                 return initOut71Ext(isPlanar);
             }
 
             ST_DEBUG_LOG("OpenAL: multichannel extension (AL_FORMAT_71CHN16) is unavailable");
+            myAlSoftLayout = true;
             return initOut71Soft(isPlanar);
         }
-        default: return false;
+        default: {
+            myAlSoftLayout = true;
+            return false;
+        }
     }
 }
 
@@ -683,18 +826,43 @@
     myAvSrcFormat  = -1;
     myAvSampleRate = -1;
     myAvNbChannels = -1;
+    myAlSoftLayout = true;
+    myAlCanBFormat = false;
+    myAlIsBFormat  = false;
     StAVPacketQueue::deinit();
 }
 
 bool StAudioQueue::parseEvents() {
     double aPtsSeek = 0.0;
 
+    bool toResetBuffers = false;
     if(myToSwitchDev) {
-        stalDeinit(); // release OpenAL context
-        myIsAlValid = (stalInit() ? ST_AL_INIT_OK : ST_AL_INIT_KO);
+        stalReinitialize();
+        return true;
+    } else if(myAlHrtf != myAlHrtfPrev) {
+        stalResetHrtf();
+        StMutexAuto aLock(myAlInfoMutex);
+        myAlInfo.clear();
+        myAlCtx.fullInfo(myAlInfo);
+    } else if(myAlIsBFormat != myToForceBFormat
+           && myAlCanBFormat) {
+        toResetBuffers = true;
+    }
+
+    if(myToOrientListener) {
+        if(!myAlSoftLayout) {
+            toResetBuffers = true;
+        } else {
+            stalOrientListener();
+        }
+    } else if(myAlIsListOrient) {
+        stalOrientListener();
+    }
 
-        myIsDisconnected = false;
-        myToSwitchDev    = false;
+    if(toResetBuffers) {
+        myBufferSrc.clear();
+        myBufferOut.clear();
+        initBuffers();
         return true;
     }
 
@@ -718,12 +886,12 @@
         }
         case ST_PLAYEVENT_PAUSE: {
             playTimerPause();
-            alSourcePausev(NUM_AL_SOURCES, myAlSources);
+            alSourcePausev(THE_NUM_AL_SOURCES, myAlSources);
             return false;
         }
         case ST_PLAYEVENT_RESUME: {
             playTimerResume();
-            alSourcePlayv(NUM_AL_SOURCES, myAlSources);
+            alSourcePlayv(THE_NUM_AL_SOURCES, myAlSources);
             return false;
         }
         case ST_PLAYEVENT_SEEK: {
@@ -751,7 +919,7 @@
 #ifdef ST_DEBUG
     if(myDbgPrevQueued != aQueued) {
         ST_DEBUG_LOG("OpenAL buffers: " + aQueued + " queued + "
-            + aProcessed + " processed from " + NUM_AL_BUFFERS
+            + aProcessed + " processed from " + THE_NUM_AL_BUFFERS
         );
     }
     myDbgPrevQueued = aQueued;
@@ -768,7 +936,7 @@
     if(myPrevFormat    != myAlFormat
     || myPrevFrequency != myBufferOut.getFreq()
     || (aState  == AL_STOPPED
-     && aQueued == NUM_AL_BUFFERS)) {
+     && aQueued == THE_NUM_AL_BUFFERS)) {
         ST_DEBUG_LOG("AL, reinitialize buffers per source , plane size= " + myBufferOut.getPlaneSize()
                             + "; freq= " + myBufferOut.getFreq());
         stalEmpty();
@@ -779,7 +947,7 @@
 
     bool toTryToPlay = false;
     bool isQueued = false;
-    if(aProcessed == 0 && aQueued < NUM_AL_BUFFERS) {
+    if(aProcessed == 0 && aQueued < THE_NUM_AL_BUFFERS) {
         if(myBufferOut.isEmpty()) {
             ST_DEBUG_LOG(" EMPTY BUFFER ");
             return true;
@@ -797,7 +965,7 @@
             alSourceQueueBuffers(myAlSources[aSrcId], 1, &myAlBuffers[aSrcId][aQueued]);
             stalCheckErrors("alSourceQueueBuffers");
         }
-        toTryToPlay = ((aQueued + 1) == NUM_AL_BUFFERS);
+        toTryToPlay = ((aQueued + 1) == THE_NUM_AL_BUFFERS);
         isQueued = true;
     } else if(aProcessed != 0
            && (aState == AL_PLAYING
@@ -854,7 +1022,7 @@
         } else {
             playTimerStart(0.0);
         }
-        alSourcePlayv(NUM_AL_SOURCES, myAlSources);
+        alSourcePlayv(THE_NUM_AL_SOURCES, myAlSources);
         if(stalCheckConnected()) {
             ST_DEBUG_LOG("!!! OpenAL was in stopped state, now resume playback from " + (thePts - diffSecs));
         }
@@ -864,7 +1032,7 @@
         const bool toPause = !myIsPlaying;
         myEventMutex.unlock();
         if(toPause) {
-            alSourcePausev(NUM_AL_SOURCES, myAlSources);
+            alSourcePausev(THE_NUM_AL_SOURCES, myAlSources);
         }
     }
 
@@ -910,7 +1078,7 @@
             } else {
                 playTimerStart(0.0);
             }
-            alSourcePlayv(NUM_AL_SOURCES, myAlSources);
+            alSourcePlayv(THE_NUM_AL_SOURCES, myAlSources);
             if(stalCheckConnected()) {
                 ST_DEBUG_LOG("!!! OpenAL was in stopped state, now resume playback from " + (thePts - diffSecs));
             }

sview-16_06.tar.gz/StMoviePlayer/StVideo/StAudioQueue.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StAudioQueue.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,9 +44,18 @@
  */
 class StAudioQueue : public StAVPacketQueue {
 
+        public:
+
+    enum StAlHrtfRequest {
+        StAlHrtfRequest_Auto     = 0,
+        StAlHrtfRequest_ForceOn  = 1,
+        StAlHrtfRequest_ForceOff = 2,
+    };
+
         public: //! @name public API
 
-    ST_LOCAL StAudioQueue(const std::string& theAlDeviceName);
+    ST_LOCAL StAudioQueue(const std::string& theAlDeviceName,
+                          StAudioQueue::StAlHrtfRequest theAlHrtf);
     ST_LOCAL virtual ~StAudioQueue();
 
     ST_LOCAL bool isInDowntime() {
@@ -98,6 +107,13 @@
     }
 
     /**
+     * Setup OpenAL HRTF mixing.
+     */
+    ST_LOCAL void setAlHrtfRequest(StAlHrtfRequest theAlHrt) {
+        myAlHrtf = theAlHrt;
+    }
+
+    /**
      * Set audio gain.
      */
     ST_LOCAL void setAudioVolume(const float theGain) {
@@ -105,6 +121,34 @@
     }
 
     /**
+     * Set head orientation.
+     */
+    ST_LOCAL void setHeadOrientation(const StGLQuaternion& theOrient, bool theToTrack) {
+        if(!theToTrack) {
+            myToOrientListener = false;
+            return;
+        }
+
+        StMutexAuto aLock(mySwitchMutex);
+        myHeadOrient = theOrient;
+        myToOrientListener = true;
+    }
+
+    /**
+     * Turn ON/OFF listener head orientation tracking.
+     */
+    ST_LOCAL void setTrackHeadOrientation(bool theToTrack) {
+        myToOrientListener = theToTrack;
+    }
+
+    /**
+     * Set forcing B-Format.
+     */
+    ST_LOCAL void setForceBFormat(bool theToForce) {
+        myToForceBFormat = theToForce;
+    }
+
+    /**
      * Switch audio device.
      */
     ST_LOCAL void switchAudioDevice(const std::string& theAlDeviceName) {
@@ -114,18 +158,38 @@
     }
 
     /**
+     * Return TRUE if OpenAL implementation provides HRTF mixing feature.
+     */
+    ST_LOCAL bool hasAlHrtf() const {
+        return myAlCtx.hasExtSoftHrtf;
+    }
+
+    /**
      * @return true if device was disconnected and OpenAL should be re-initialized
      */
     ST_LOCAL bool isDisconnected() const {
         return myIsDisconnected;
     }
 
+    /**
+     * Return OpenAL info.
+     */
+    ST_LOCAL void getAlInfo(StDictionary& theInfo) {
+        StMutexAuto aLock(myAlInfoMutex);
+        for(size_t aPairIter = 0; aPairIter < myAlInfo.size(); ++aPairIter) {
+            theInfo.add(myAlInfo.getFromIndex(aPairIter));
+        }
+    }
+
         private: //! @name private methods
 
     ST_LOCAL bool initBuffers();
 
     ST_LOCAL bool stalInit();
     ST_LOCAL void stalDeinit();
+    ST_LOCAL void stalReinitialize();
+    ST_LOCAL void stalResetHrtf();
+    ST_LOCAL void stalOrientListener();
 
     ST_LOCAL void stalConfigureSources1();
     ST_LOCAL void stalConfigureSources2_0();
@@ -167,6 +231,9 @@
     //! Initialize 2-channels stream.
     ST_LOCAL bool initOutStereo(const bool theIsPlanar);
 
+    //! Initialize 2.0 stream by configuring 2 sources in 3D.
+    ST_LOCAL bool initOut20Soft(const bool theIsPlanar);
+
     //! Initialize 3.0 stream by configuring 3 sources in 3D.
     ST_LOCAL bool initOut30Soft(const bool theIsPlanar);
 
@@ -176,6 +243,9 @@
     //! Initialize 4.0 stream using extension (AL_FORMAT_QUAD).
     ST_LOCAL bool initOut40Ext(const bool theIsPlanar);
 
+    //! Initialize 4.0 Ambisonics WXYZ stream using extension (AL_FORMAT_BFORMAT3D).
+    ST_LOCAL bool initOut40BFormat(const bool theIsPlanar);
+
     //! Initialize 5.0 stream by configuring 5 sources in 3D.
     ST_LOCAL bool initOut50Soft(const bool theIsPlanar);
 
@@ -218,8 +288,8 @@
 
     // This constant sets count of OpenAL buffers, used in loop
     // for gapless playback
-    #define NUM_AL_BUFFERS 4
-    #define NUM_AL_SOURCES 8
+    #define THE_NUM_AL_BUFFERS 4
+    #define THE_NUM_AL_SOURCES 8
 
     /**
      * This is help class, used to store buffer-sizes
@@ -230,7 +300,7 @@
             public:
 
         ST_LOCAL DataLoop()
-        : myLast(NUM_AL_BUFFERS - 1) {
+        : myLast(THE_NUM_AL_BUFFERS - 1) {
             stMemSet(myDataSizes, 0, sizeof(myDataSizes));
         }
 
@@ -240,7 +310,7 @@
 
         ST_LOCAL void push(const size_t theDataSize) {
             ++myLast;
-            if(myLast >= NUM_AL_BUFFERS) {
+            if(myLast >= THE_NUM_AL_BUFFERS) {
                myLast = 0;
             }
             myDataSizes[myLast] = theDataSize;
@@ -248,7 +318,7 @@
 
         ST_LOCAL size_t summ() const {
             size_t aSumm = 0;
-            for(size_t aBuffIter = 0; aBuffIter < NUM_AL_BUFFERS; ++aBuffIter) {
+            for(size_t aBuffIter = 0; aBuffIter < THE_NUM_AL_BUFFERS; ++aBuffIter) {
                 aSumm += myDataSizes[aBuffIter];
             }
             return aSumm;
@@ -256,7 +326,7 @@
 
             private:
 
-        size_t myDataSizes[NUM_AL_BUFFERS];
+        size_t myDataSizes[THE_NUM_AL_BUFFERS];
         size_t myLast;
 
     } myAlDataLoop;
@@ -281,18 +351,30 @@
     StMutex            mySwitchMutex;   //!< switch audio device lock
     volatile bool      myToSwitchDev;   //!< switch audio device flag
     volatile bool      myIsDisconnected;//!< audio device disconnection flag
+    volatile bool      myToOrientListener; //!< track listener orientation
+    volatile bool      myToForceBFormat;//!< force using B-Format for any 4-channels input
+    StGLQuaternion     myHeadOrient;    //!< head orientation
 
         private: //! @name OpenAL items
 
     std::string        myAlDeviceName;  //!< Output audio device name for OpenAL context initialization
+    StDictionary       myAlInfo;        //!< OpenAL info
+    StMutex            myAlInfoMutex;
     StALContext        myAlCtx;         //!< OpenAL context
-    ALuint             myAlBuffers[NUM_AL_SOURCES][NUM_AL_BUFFERS]; //!< audio buffers
-    ALuint             myAlSources[NUM_AL_SOURCES];                 //!< audio sources
+    ALuint             myAlBuffers[THE_NUM_AL_SOURCES][THE_NUM_AL_BUFFERS]; //!< audio buffers
+    ALuint             myAlSources[THE_NUM_AL_SOURCES];                     //!< audio sources
     ALenum             myAlFormat;      //!< buffer data internal format
     ALenum             myPrevFormat;    //!< previous format (to correctly reinitialize AL buffer on change)
     ALsizei            myPrevFrequency; //!< previous audio frequency
     ALfloat            myAlGain;        //!< volume factor
     ALfloat            myAlGainPrev;    //!< volume factor (currently active)
+    bool               myAlSoftLayout;  //!< flag indicating soft multichannel layout
+    bool               myAlIsListOrient;//!< flag indicating that listener orientation is not identity
+    bool               myAlCanBFormat;  //!< flag indicating that B-Format can be forced (e.g. 4-channels input and extension is available)
+    bool               myAlIsBFormat;   //!< flag indicating that using B-Format is enabled (forcibly) for 4-channels input
+
+    StAlHrtfRequest    myAlHrtf;
+    StAlHrtfRequest    myAlHrtfPrev;
 
         private: //! @name debug items

sview-16_06.tar.gz/StMoviePlayer/StVideo/StPCMBuffer.cpp -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StPCMBuffer.cpp Changed

@@ -51,10 +51,23 @@
             return;
         case StChannelMap::CH40:
             count = 4;
-            FL = 0;
-            FR = 1;
-            RL = 2;
-            RR = 3;
+            if(theRules == StChannelMap::WYZX) {
+                // WYZX -> WXYZ
+                Order[0] = 0;
+                Order[1] = 3;
+                Order[2] = 1;
+                Order[3] = 2;
+                FL = Order[0];
+                FR = Order[1];
+                RL = Order[2];
+                RR = Order[3];
+            } else {
+                FL = 0;
+                FR = 1;
+                RL = 2;
+                RR = 3;
+            }
+
             FC = LFE = SL = SR = 0;
             return;
         case StChannelMap::CH50:
@@ -70,6 +83,8 @@
             count = 6;
             SL = SR = 0;
             switch(theRules) {
+                case StChannelMap::WYZX:
+                    // error
                 case StChannelMap::PCM: {
                     FL  = 0;
                     FR  = 1;

sview-16_06.tar.gz/StMoviePlayer/StVideo/StPCMBuffer.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StPCMBuffer.h Changed

sview-16_06.tar.gz/StMoviePlayer/StVideo/StVideo.cpp -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StVideo.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
 const char* StVideo::ST_VIDEOS_MIME_STRING = ST_VIDEO_PLUGIN_MIME_CHAR;
 
 StVideo::StVideo(const std::string&                 theALDeviceName,
+                 StAudioQueue::StAlHrtfRequest      theAlHrtf,
                  const StHandle<StResourceManager>& theResMgr,
                  const StHandle<StTranslations>&    theLangMap,
                  const StHandle<StPlayList>&        thePlayList,
@@ -84,7 +85,7 @@
     myVideoSlave  = new StVideoQueue(myTextureQueue, myVideoMaster);
     myVideoSlave->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
-    myAudio = new StAudioQueue(theALDeviceName);
+    myAudio = new StAudioQueue(theALDeviceName, theAlHrtf);
     myAudio->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
     mySubtitles = new StSubtitleQueue(theSubtitlesQueue);
@@ -246,6 +247,7 @@
 }
 
 bool StVideo::addFile(const StString& theFileToLoad,
+                      const StHandle<StStereoParams>& theNewParams,
                       StStreamsInfo&  theInfo) {
     // open video file
     StString aFileName, aDummy;
@@ -337,10 +339,12 @@
         if(aStream->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
             // video track
             if(!myVideoMaster->isInitialized()) {
-                myVideoMaster->init(aFormatCtx, aStreamId, aTitleString);
+                myVideoMaster->init(aFormatCtx, aStreamId, aTitleString, theNewParams);
                 myVideoMaster->setSlave(NULL);
 
                 if(myVideoMaster->isInitialized()) {
+                    myAudio->setTrackHeadOrientation(params.ToTrackHeadAudio->getValue() && theNewParams->ViewingMode != StViewSurface_Plain);
+
                     const int aSizeX      = myVideoMaster->sizeX();
                     const int aSizeY      = myVideoMaster->sizeY();
                     const int aCodedSizeX = myVideoMaster->getCodedSizeX();
@@ -363,7 +367,7 @@
                 }
             } else if(!myVideoSlave->isInitialized()
                    && !stAV::isAttachedPicture(aStream)) {
-                myVideoSlave->init(aFormatCtx, aStreamId, "");
+                myVideoSlave->init(aFormatCtx, aStreamId, "", theNewParams);
                 if(myVideoSlave->isInitialized()) {
                     mySlaveCtx    = aFormatCtx;
                     mySlaveStream = aStreamId;
@@ -511,6 +515,7 @@
     myVideoSlave ->setUseGpu(toUseGpu);
     myVideoMaster->setUseOpenJpeg(toUseOpenJpeg);
     myVideoSlave ->setUseOpenJpeg(toUseOpenJpeg);
+    myAudio->setTrackHeadOrientation(false);
 
     myFileInfoTmp = new StMovieInfo();
 
@@ -520,14 +525,14 @@
     if(!theNewSource->isEmpty()) {
         bool isLoaded = false;
         for(size_t aNode = 0; aNode < theNewSource->size(); ++aNode) {
-            isLoaded = addFile(theNewSource->getValue(aNode)->getPath(), aStreamsInfo) || isLoaded;
+            isLoaded = addFile(theNewSource->getValue(aNode)->getPath(), theNewParams, aStreamsInfo) || isLoaded;
         }
         if(!isLoaded) {
             return false;
         }
     } else {
         const StString aFullPath = theNewSource->getPath();
-        if(!addFile(aFullPath, aStreamsInfo)) {
+        if(!addFile(aFullPath, theNewParams, aStreamsInfo)) {
             return false;
         }
 
@@ -553,7 +558,7 @@
                     && aTrackName.isStartsWithIgnoreCase(aName)) {
                         //myPlayList->addToNode(aCurrFile, aFilePath);
                         //myPlayList->getCurrentFile(theNewSource, theNewParams)
-                        addFile(aNode->getPath(), aStreamsInfo);
+                        addFile(aNode->getPath(), theNewParams, aStreamsInfo);
                     }
                 }
             }
@@ -762,10 +767,10 @@
 
             myVideoMaster->setUseGpu(toUseGpu, isGpuFailed);
             myVideoSlave ->setUseGpu(toUseGpu, isGpuFailed);
-            myVideoMaster->init(aCtxMaster, aStreamIdMaster, aFileNameMaster);
+            myVideoMaster->init(aCtxMaster, aStreamIdMaster, aFileNameMaster, myCurrParams);
             myVideoMaster->setSlave(NULL);
             if(toDecodeSlave) {
-                myVideoSlave->init(mySlaveCtx, mySlaveStream, "");
+                myVideoSlave->init(mySlaveCtx, mySlaveStream, "", myCurrParams);
                 myVideoMaster->setSlave(myVideoSlave);
             }
             myVideoMaster->pushStart();

sview-16_06.tar.gz/StMoviePlayer/StVideo/StVideo.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StVideo.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,6 +108,7 @@
      * Main constructor.
      */
     ST_LOCAL StVideo(const std::string&                 theALDeviceName,
+                     StAudioQueue::StAlHrtfRequest      theAlHrtf,
                      const StHandle<StResourceManager>& theResMgr,
                      const StHandle<StTranslations>&    theLangMap,
                      const StHandle<StPlayList>&        thePlayList,
@@ -164,6 +165,13 @@
     }
 
     /**
+     * Stick to panorama 360 mode.
+     */
+    ST_LOCAL void setStickPano360(bool theToStick) {
+        myVideoMaster->setStickPano360(theToStick);
+    }
+
+    /**
      * Retrieve information about currently played file.
      */
     ST_LOCAL StHandle<StMovieInfo> getFileInfo(const StHandle<StStereoParams>& theParams) const;
@@ -198,6 +206,20 @@
     }
 
     /**
+     * Return TRUE if OpenAL implementation provides HRTF mixing feature.
+     */
+    ST_LOCAL bool hasAlHrtf() const {
+        return myAudio->hasAlHrtf();
+    }
+
+    /**
+     * Setup OpenAL HRTF mixing.
+     */
+    ST_LOCAL void setAlHrtfRequest(StAudioQueue::StAlHrtfRequest theAlHrt) {
+        myAudio->setAlHrtfRequest(theAlHrt);
+    }
+
+    /**
      * @return true if device was disconnected and OpenAL should be re-initialized
      */
     ST_LOCAL bool isDisconnected() const {
@@ -211,8 +233,29 @@
         myAudio->setAudioVolume(theGain);
     }
 
+    /**
+     * Set head orientation.
+     */
+    ST_LOCAL void setHeadOrientation(const StGLQuaternion& theOrient, bool theToTrack) {
+        myAudio->setHeadOrientation(theOrient, theToTrack);
+    }
+
+    /**
+     * Set forcing B-Format.
+     */
+    ST_LOCAL void setForceBFormat(bool theToForce) {
+        myAudio->setForceBFormat(theToForce);
+    }
+
     ST_LOCAL void setAudioDelay(const float theDelaySec);
 
+    /**
+     * Return OpenAL info.
+     */
+    ST_LOCAL void getAlInfo(StDictionary& theInfo) {
+        myAudio->getAlInfo(theInfo);
+    }
+
         public: //! @name Properties
 
     struct {
@@ -220,6 +263,7 @@
         StHandle<StBoolParam>         UseGpu;          //!< use video decoding on GPU when available
         StHandle<StBoolParam>         UseOpenJpeg;     //!< use OpenJPEG (libopenjpeg) instead of built-in jpeg2000 decoder
         StHandle<StBoolParam>         ToSearchSubs;    //!< automatically search for additional subtitles/audio track files nearby video file
+        StHandle<StBoolParamNamed>    ToTrackHeadAudio;//!< enable/disable head-tracking for audio listener
         StHandle<StParamActiveStream> activeAudio;     //!< active Audio stream
         StHandle<StParamActiveStream> activeSubtitles; //!< active Subtitles stream
 
@@ -312,6 +356,7 @@
      * Private method to append one format context (one file).
      */
     ST_LOCAL bool addFile(const StString& theFileToLoad,
+                          const StHandle<StStereoParams>& theNewParams,
                           StStreamsInfo&  theInfo);
 
     ST_LOCAL bool openSource(const StHandle<StFileNode>&     theNewSource,
@@ -408,7 +453,7 @@
     StHandle<StMovieInfo>         myFileInfo;     //!< info about currently loaded file
     StHandle<StMovieInfo>         myFileInfoTmp;
     StHandle<StFileNode>          myCurrNode;     //!< active (played) file node
-    StHandle<StStereoParams>      myCurrParams;   //!< paramters for active file node
+    StHandle<StStereoParams>      myCurrParams;   //!< parameters for active file node
     StHandle<StFileNode>          myCurrPlsFile;  //!< active playlist file node
     StHandle<StGLTextureQueue>    myTextureQueue; //!< decoded frames queue

sview-16_06.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -173,6 +173,8 @@
   myAvDiscard(AVDISCARD_DEFAULT),
   myFramePts(0.0),
   myPixelRatio(1.0f),
+  myHParallax(0),
+  myRotateDeg(0),
   //
   myVideoClock(0.0),
   //
@@ -184,7 +186,8 @@
   myWasFlushed(false),
   myStFormatByUser(StFormat_AUTO),
   myStFormatByName(StFormat_AUTO),
-  myStFormatInStream(StFormat_AUTO) {
+  myStFormatInStream(StFormat_AUTO),
+  myToStickPano360(false) {
 #ifdef ST_USE64PTR
     myFrame.Frame->opaque = (void* )stAV::NOPTS_VALUE;
 #else
@@ -218,6 +221,8 @@
         const char* name;
     };
 
+    static const StCString THE_ROTATE_KEY       = stCString("rotate");
+
     static const StCString THE_SRC_MODE_KEY     = stCString("STEREO_MODE");
     static const StCString THE_SRC_MODE_KEY_WMV = stCString("StereoscopicLayout");
 
@@ -286,7 +291,8 @@
 
 bool StVideoQueue::init(AVFormatContext*   theFormatCtx,
                         const unsigned int theStreamId,
-                        const StString&    theFileName) {
+                        const StString&    theFileName,
+                        const StHandle<StStereoParams>& theNewParams) {
     if(!StAVPacketQueue::init(theFormatCtx, theStreamId, theFileName)
     || myCodecCtx->codec_type != AVMEDIA_TYPE_VIDEO) {
         signals.onError(stCString("FFmpeg: invalid stream"));
@@ -408,6 +414,52 @@
         myHParallax = (int )stStringToLong(aValue.toCString(), 10, aCLocale);
     }
 
+    // we can read information from Display Matrix in side data or from metadata key
+    myRotateDeg = 0;
+
+#ifdef ST_AV_NEWSPHERICAL
+    if(const AVSphericalMapping* aSpherical = (AVSphericalMapping* )av_stream_get_side_data(myStream, AV_PKT_DATA_SPHERICAL, NULL)) {
+        switch(aSpherical->projection) {
+            case AV_SPHERICAL_EQUIRECTANGULAR: {
+                theNewParams->ViewingMode = StViewSurface_Sphere;
+                break;
+            }
+            case AV_SPHERICAL_CUBEMAP: {
+                theNewParams->ViewingMode = StViewSurface_Cubemap;
+                //spherical->padding
+                break;
+            }
+            case AV_SPHERICAL_EQUIRECTANGULAR_TILE: {
+                // unsupported
+                //av_spherical_tile_bounds(aSpherical, par->width, par->height, &l, &t, &r, &b);
+                break;
+            }
+        }
+        if(theNewParams->ViewingMode != StViewSurface_Plain
+        && theNewParams->isZeroRotate()) {
+            const double aYaw   = (double )aSpherical->yaw   / (1 << 16);
+            const double aPitch = (double )aSpherical->pitch / (1 << 16);
+            const double aRoll  = (double )aSpherical->roll  / (1 << 16);
+            myRotateDeg = (int )-aRoll;
+            theNewParams->setRotateZero((float )-aYaw, (float )aPitch, (float )myRotateDeg);
+        }
+    }
+#endif
+
+#if(LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+    if(const uint8_t* aDispMatrix = av_stream_get_side_data(myStream, AV_PKT_DATA_DISPLAYMATRIX, NULL)) {
+        const double aRotDeg = -av_display_rotation_get((const int32_t* )aDispMatrix);
+        if(!st::isNaN(aRotDeg)) {
+            myRotateDeg = -int(aRotDeg - 360 * std::floor(aRotDeg / 360 + 0.9 / 360));
+        }
+    }
+#else
+    if(stAV::meta::readTag(myStream, THE_ROTATE_KEY, aValue)) {
+        StCLocale aCLocale;
+        myRotateDeg = (int )-stStringToLong(aValue.toCString(), 10, aCLocale);
+    }
+#endif
+
     // stereoscopic mode tags
     myStFormatInStream = is720in1080 ? StFormat_Tiled4x : StFormat_AUTO;
     if(stAV::meta::readTag(myFormatCtx, THE_SRC_MODE_KEY,     aValue)
@@ -665,6 +717,16 @@
         theStParams->Src2SizeY = 0;
     }
 
+    if(myToStickPano360
+    && theStParams->ViewingMode == StViewSurface_Plain) {
+        StPanorama aPano = st::probePanorama(theSrcFormat,
+                                             theStParams->Src1SizeX, theStParams->Src1SizeY,
+                                             theStParams->Src2SizeX, theStParams->Src2SizeY);
+        theStParams->ViewingMode = (aPano == StPanorama_Cubemap6_1 || aPano == StPanorama_Cubemap3_2)
+                                 ? StViewSurface_Cubemap
+                                 : StViewSurface_Sphere;
+    }
+
     myTextureQueue->push(theSrcDataLeft, theSrcDataRight, theStParams, theSrcFormat, theCubemapFormat, theSrcPTS);
     myTextureQueue->setConnectedStream(true);
     if(myWasFlushed) {
@@ -862,15 +924,24 @@
 
         // we currently allow to override source format stored in metadata
     #ifdef ST_AV_NEWSTEREO
-        AVFrameSideData* aSideData = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D);
-        if(aSideData != NULL) {
-            AVStereo3D* aStereo = (AVStereo3D* )aSideData->data;
+        if(AVFrameSideData* aSideDataS3d = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D)) {
+            AVStereo3D* aStereo = (AVStereo3D* )aSideDataS3d->data;
             myStFormatInStream = stAV::stereo3dAvToSt(aStereo->type);
             if(aStereo->flags & AV_STEREO3D_FLAG_INVERT) {
                 myStFormatInStream = st::formatReversed(myStFormatInStream);
             }
         }
     #endif
+    #if(LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+        if(const AVFrameSideData* aSideDataRot = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_DISPLAYMATRIX)) {
+            if(aSideDataRot->size >= int(9 * sizeof(int32_t))) {
+                const double aRotDeg = -av_display_rotation_get((const int32_t* )aSideDataRot->data);
+                if(!st::isNaN(aRotDeg)) {
+                    myRotateDeg = -int(aRotDeg - 360 * std::floor(aRotDeg / 360 + 0.9 / 360));
+                }
+            }
+        }
+    #endif
         if(stAV::meta::readTag(myFrame.Frame, THE_SRC_MODE_KEY, aTagValue)) {
             for(size_t aSrcId = 0;; ++aSrcId) {
                 const StFFmpegStereoFormat& aFlag = STEREOFLAGS[aSrcId];
@@ -885,7 +956,7 @@
         }
         // override source format stored in metadata
         StFormat  aSrcFormat     = myStFormatByUser;
-        StCubemap aCubemapFormat = aPacket->getSource()->ViewingMode == StStereoParams::PANORAMA_CUBEMAP ? StCubemap_Packed : StCubemap_OFF;
+        StCubemap aCubemapFormat = aPacket->getSource()->ViewingMode == StViewSurface_Cubemap ? StCubemap_Packed : StCubemap_OFF;
         if(aSrcFormat == StFormat_AUTO) {
             // prefer info stored in the stream itself
             aSrcFormat = myStFormatInStream;
@@ -907,6 +978,7 @@
                 StHandle<StStereoParams> aParams = aPacket->getSource();
                 if(!aParams.isNull()) {
                     aParams->setSeparationNeutral(myHParallax);
+                    aParams->setZRotateZero((float )myRotateDeg);
                 }
                 isStarted = false;
             }
@@ -951,6 +1023,7 @@
                 StHandle<StStereoParams> aParams = aPacket->getSource();
                 if(!aParams.isNull()) {
                     aParams->setSeparationNeutral(myHParallax);
+                    aParams->setZRotateZero((float )myRotateDeg);
                 }
                 isStarted = false;
             }

sview-16_06.tar.gz/StMoviePlayer/StVideo/StVideoQueue.h -> sview-17_04.tar.gz/StMoviePlayer/StVideo/StVideoQueue.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMoviePlayer program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -197,6 +197,13 @@
         return myStFormatByName;
     }
 
+    /**
+     * Stick to panorama 360 mode.
+     */
+    ST_LOCAL void setStickPano360(bool theToStick) {
+        myToStickPano360 = theToStick;
+    }
+
     ST_LOCAL StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
                           const StHandle<StVideoQueue>&     theMaster = StHandle<StVideoQueue>());
     ST_LOCAL virtual ~StVideoQueue();
@@ -207,9 +214,10 @@
      * @param theStreamId  stream id in video format context
      * @return true if no error
      */
-    ST_LOCAL virtual bool init(AVFormatContext*   theFormatCtx,
-                               const unsigned int theStreamId,
-                               const StString&    theFileName) ST_ATTR_OVERRIDE;
+    ST_LOCAL bool init(AVFormatContext*   theFormatCtx,
+                       const unsigned int theStreamId,
+                       const StString&    theFileName,
+                       const StHandle<StStereoParams>& theNewParams);
 
     /**
      * Clean function.
@@ -378,6 +386,7 @@
     double                     myFramePts;
     GLfloat                    myPixelRatio;      //!< pixel aspect ratio
     int                        myHParallax;       //!< horizontal parallax in pixels stored in metadata
+    int                        myRotateDeg;       //!< rotate angle in degrees
 
     double                     myVideoClock;      //!< synchronization variable
 
@@ -394,6 +403,7 @@
     volatile StFormat          myStFormatByUser;  //!< source format specified by user
     volatile StFormat          myStFormatByName;  //!< source format detected from file name
     volatile StFormat          myStFormatInStream;//!< source format information retrieved from stream
+    volatile bool              myToStickPano360;  //!< stick to panorama 360 mode
 
 };

sview-16_06.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/czech/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/czech/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng -> sview-17_04.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng Changed

sview-16_06.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp -> sview-17_04.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp Changed

sview-16_06.tar.gz/StOutAnaglyph/StOutAnaglyph.rc -> sview-17_04.tar.gz/StOutAnaglyph/StOutAnaglyph.rc Changed

sview-16_06.tar.gz/StOutAnaglyph/shaders/fAnaglyphGray.shf -> sview-17_04.tar.gz/StOutAnaglyph/shaders/fAnaglyphGray.shf Changed

@@ -13,14 +13,14 @@
  * The NTSC weights are only applicable to RGB colors in a gamma 2.2 color space.
  * For linear RGB colors the values above are better.
  */
-mat4 multL = mat4(0.3086,      0,      0,      0,
-                  0.6094,      0,      0,      0,
-                  0.0820,      0,      0,      0,
-                       0,      0,      0,      0);
-mat4 multR = mat4(     0, 0.3086, 0.3086,      0,
-                       0, 0.6094, 0.6094,      0,
-                       0, 0.0820, 0.0820,      0,
-                       0,      0,      0,      0);
+const mat4 multL = mat4(0.3086,      0,      0,      0,
+                        0.6094,      0,      0,      0,
+                        0.0820,      0,      0,      0,
+                             0,      0,      0,      0);
+const mat4 multR = mat4(     0, 0.3086, 0.3086,      0,
+                             0, 0.6094, 0.6094,      0,
+                             0, 0.0820, 0.0820,      0,
+                             0,      0,      0,      0);
 
 uniform sampler2D texL, texR;
 varying vec2 fTexCoord;

sview-16_06.tar.gz/StOutAnaglyph/shaders/fAnaglyphOptim.shf -> sview-17_04.tar.gz/StOutAnaglyph/shaders/fAnaglyphOptim.shf Changed

@@ -8,18 +8,18 @@
  */
 
 // http://research.csc.ncsu.edu/stereographics/LS.pdf
-mat4 multL = mat4(     0.4154,    -0.0458, -0.0547,      0,
-                       0.4710,    -0.0484, -0.0615,      0,
-                   0.16666667,    -0.0257,  0.0128,      0,
-                            0,          0,       0,      0);
-mat4 multR = mat4(-0.01090909,     0.3756, -0.0651,      0,
-                  -0.03636364, 0.73333333, -0.1287,      0,
-                  -0.00606061, 0.01111111,  1.2971,      0,
-                            0,          0,       0,      0);
+const mat4 multL = mat4(     0.4154,    -0.0458, -0.0547,      0,
+                             0.4710,    -0.0484, -0.0615,      0,
+                         0.16666667,    -0.0257,  0.0128,      0,
+                                  0,          0,       0,      0);
+const mat4 multR = mat4(-0.01090909,     0.3756, -0.0651,      0,
+                        -0.03636364, 0.73333333, -0.1287,      0,
+                        -0.00606061, 0.01111111,  1.2971,      0,
+                                  0,          0,       0,      0);
 
 // normalize multipliers
-vec4 multUp = vec4(2.2, 2.2, 2.2, 1.0);
-vec4 multDw = 1.0 / multUp;
+const vec4 multUp =       vec4(2.2, 2.2, 2.2, 1.0);
+const vec4 multDw = 1.0 / vec4(2.2, 2.2, 2.2, 1.0);
 
 uniform sampler2D texL, texR;
 varying vec2 fTexCoord;

sview-16_06.tar.gz/StOutAnaglyph/shaders/fAnaglyphTrue.shf -> sview-17_04.tar.gz/StOutAnaglyph/shaders/fAnaglyphTrue.shf Changed

sview-16_06.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellowDubois.shf -> sview-17_04.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellowDubois.shf Changed

@@ -10,18 +10,18 @@
 /**
  * http://www.site.uottawa.ca/~edubois/anaglyph/
  */
-mat4 multL = mat4( 1.062, -0.026, -0.038,      0,
-                  -0.205,  0.908, -0.173,      0,
-                   0.299,  0.068,  0.022,      0,
-                       0,      0,      0,      0);
-mat4 multR = mat4(-0.016,  0.006,  0.094,      0,
-                  -0.123,  0.062,  0.185,      0,
-                  -0.017, -0.017,  0.911,      0,
-                       0,      0,      0,      0);
+const mat4 multL = mat4( 1.062, -0.026, -0.038,      0,
+                        -0.205,  0.908, -0.173,      0,
+                         0.299,  0.068,  0.022,      0,
+                             0,      0,      0,      0);
+const mat4 multR = mat4(-0.016,  0.006,  0.094,      0,
+                        -0.123,  0.062,  0.185,      0,
+                        -0.017, -0.017,  0.911,      0,
+                             0,      0,      0,      0);
 
 // normalize multipliers
-vec4 multUp = vec4(2.2, 2.2, 2.2, 1.0);
-vec4 multDw = 1.0 / multUp;
+const vec4 multUp =       vec4(2.2, 2.2, 2.2, 1.0);
+const vec4 multDw = 1.0 / vec4(2.2, 2.2, 2.2, 1.0);
 
 uniform sampler2D texL, texR;
 varying vec2 fTexCoord;

sview-16_06.tar.gz/StOutDistorted/StOutDistorted.cpp -> sview-17_04.tar.gz/StOutDistorted/StOutDistorted.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StOutDistorted, class providing stereoscopic output in anamorph side by side format using StCore toolkit.
- * Copyright © 2013-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -18,6 +18,7 @@
 #include <StGL/StGLFrameBuffer.h>
 #include <StGL/StGLArbFbo.h>
 #include <StGLCore/StGLCore20.h>
+#include <StGLMesh/StGLTextureQuad.h>
 #include <StSettings/StSettings.h>
 #include <StSettings/StTranslations.h>
 #include <StSettings/StEnumParam.h>
@@ -25,15 +26,19 @@
 #include <StVersion.h>
 #include <StAV/StAVImage.h>
 
-#ifdef ST_HAVE_LIBOVR
-
-#include <OVR.h>
-#include <OVR_CAPI_GL.h>
+#ifdef ST_HAVE_OPENVR
+    #include <openvr.h>
 
-#ifdef _MSC_VER
-    #pragma comment(lib, "LibOVR.lib")
-#endif
+    #ifdef _MSC_VER
+        #pragma comment(lib, "openvr_api.lib")
+    #endif
+#elif defined(ST_HAVE_LIBOVR)
+    #include <OVR.h>
+    #include <OVR_CAPI_GL.h>
 
+    #ifdef _MSC_VER
+        #pragma comment(lib, "LibOVR.lib")
+    #endif
 #endif
 
 namespace {
@@ -42,7 +47,6 @@
 
     static const char ST_SETTING_DEVICE_ID[] = "deviceId";
     static const char ST_SETTING_WINDOWPOS[] = "windowPos";
-    static const char ST_SETTING_MARGINS[]   = "margins";
     static const char ST_SETTING_WARP_COEF[] = "warpCoef";
     static const char ST_SETTING_CHROME_AB[] = "chromeAb";
 
@@ -50,8 +54,8 @@
     enum {
         STTR_DISTORTED_NAME     = 1000,
         STTR_DISTORTED_DESC     = 1001,
-        STTR_OCULUS_NAME        = 1002,
-        STTR_OCULUS_DESC        = 1003,
+        STTR_OPENVR_NAME        = 1002,
+        STTR_OPENVR_DESC        = 1003,
         STTR_S3DV_NAME          = 1004,
         STTR_S3DV_DESC          = 1005,
 
@@ -71,6 +75,56 @@
         STTR_PLUGIN_DESCRIPTION = 2002,
     };
 
+#ifdef ST_HAVE_OPENVR
+    static StString getVrTrackedDeviceString(vr::IVRSystem* theHmd,
+                                             vr::TrackedDeviceIndex_t theDevice,
+                                             vr::TrackedDeviceProperty theProperty,
+                                             vr::TrackedPropertyError* theError = NULL) {
+      const uint32_t aBuffLen = theHmd->GetStringTrackedDeviceProperty(theDevice, theProperty, NULL, 0, theError);
+      if(aBuffLen == 0) {
+          return StString();
+      }
+
+      char* aBuffer = new char[aBuffLen + 1];
+      theHmd->GetStringTrackedDeviceProperty(theDevice, theProperty, aBuffer, aBuffLen, theError);
+      aBuffer[aBuffLen] = '\0';
+      const StString aResult(aBuffer);
+      delete[] aBuffer;
+      return aResult;
+    }
+
+    /**
+     * Print OpenVR compositor error.
+     */
+    StString getVRCompositorError(vr::EVRCompositorError theVRError) {
+        switch(theVRError) {
+            case vr::VRCompositorError_None:
+              return "None";
+            case vr::VRCompositorError_RequestFailed:
+              return "Compositor Error: Request Failed";
+            case vr::VRCompositorError_IncompatibleVersion:
+              return "Compositor Error: Incompatible Version";
+            case vr::VRCompositorError_DoNotHaveFocus:
+              return "Compositor Error: Do not have focus";
+            case vr::VRCompositorError_InvalidTexture:
+              return "Compositor Error: Invalid Texture";
+            case vr::VRCompositorError_IsNotSceneApplication:
+              return "Compositor Error: Is not scene application";
+            case vr::VRCompositorError_TextureIsOnWrongDevice:
+              return "Compositor Error: Texture is on wrong device";
+            case vr::VRCompositorError_TextureUsesUnsupportedFormat:
+              return "Compositor Error: Texture uses unsupported format";
+            case vr::VRCompositorError_SharedTexturesNotSupported:
+              return "Compositor Error: Shared textures not supported";
+            case vr::VRCompositorError_IndexOutOfRange:
+              return "Compositor Error: Index out of range";
+            case vr::VRCompositorError_AlreadySubmitted:
+              return "Compositor Error: Already submitted";
+        }
+        return StString("Compositor Error: UNKNOWN #") + int(theVRError);
+    }
+#endif
+
 }
 
 StAtomic<int32_t> StOutDistorted::myInstancesNb(0);
@@ -85,7 +139,7 @@
 
 const char* StOutDistorted::getDeviceId() const {
     switch(myDevice) {
-        case DEVICE_OCULUS:    return "Oculus";
+        case DEVICE_HMD:       return "OpenVR";
         case DEVICE_S3DV:      return "S3DV";
         case DEVICE_DISTORTED:
         default:               return "Distorted";
@@ -97,11 +151,11 @@
 }
 
 bool StOutDistorted::setDevice(const StString& theDevice) {
-    if(theDevice == "Oculus") {
-        if(myDevice != DEVICE_OCULUS) {
+    if(theDevice == "OpenVR") {
+        if(myDevice != DEVICE_HMD) {
             myToResetDevice = true;
         }
-        myDevice = DEVICE_OCULUS;
+        myDevice = DEVICE_HMD;
     } else if(theDevice == "S3DV") {
         if(myDevice != DEVICE_S3DV) {
             myToResetDevice = true;
@@ -123,11 +177,13 @@
 }
 
 void StOutDistorted::getOptions(StParamsList& theList) const {
-    if(myDevice != DEVICE_OCULUS
+    if(myDevice != DEVICE_HMD
     && myDevice != DEVICE_S3DV) {
         theList.add(params.Layout);
     }
-    theList.add(params.MonoClone);
+    if(myDevice != DEVICE_HMD) {
+        theList.add(params.MonoClone);
+    }
 }
 
 void StOutDistorted::updateStrings() {
@@ -135,8 +191,8 @@
 
     myDevices[DEVICE_DISTORTED]->Name = aLangMap.changeValueId(STTR_DISTORTED_NAME, "TV (parallel pair)");
     myDevices[DEVICE_DISTORTED]->Desc = aLangMap.changeValueId(STTR_DISTORTED_DESC, "Distorted Output");
-    myDevices[DEVICE_OCULUS]   ->Name = aLangMap.changeValueId(STTR_OCULUS_NAME, "Oculus Rift");
-    myDevices[DEVICE_OCULUS]   ->Desc = aLangMap.changeValueId(STTR_OCULUS_DESC, "Distorted Output");
+    myDevices[DEVICE_HMD]->Name       = aLangMap.changeValueId(STTR_OPENVR_NAME,    "OpenVR HMD");
+    myDevices[DEVICE_HMD]->Desc       = aLangMap.changeValueId(STTR_OPENVR_DESC,    "Distorted Output");
     if(myDevices.size() > DEVICE_S3DV) {
         myDevices[DEVICE_S3DV] ->Name = "S3DV";             //aLangMap.changeValueId(STTR_S3DV_NAME, "S3DV");
         myDevices[DEVICE_S3DV] ->Desc = "Distorted Output"; //aLangMap.changeValueId(STTR_S3DV_DESC, "Distorted Output");
@@ -151,12 +207,23 @@
     params.Layout->defineOption(LAYOUT_OVER_UNDER,            aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_OVERUNDER,          "Top-and-Bottom") + (myCanHdmiPack ? " [HDMI]" : ""));
 
     // about string
-    StString& aTitle     = aLangMap.changeValueId(STTR_PLUGIN_TITLE,   "sView - Distorted Output module");
-    StString& aVerString = aLangMap.changeValueId(STTR_VERSION_STRING, "version");
-    StString& aDescr     = aLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
-        "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
-    myAbout = aTitle + '\n' + aVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
-            + aDescr.format("2013-2016", "kirill@sview.ru", "www.sview.ru");
+    myAboutTitle     = aLangMap.changeValueId(STTR_PLUGIN_TITLE,   "sView - Distorted Output module");
+    myAboutVerString = aLangMap.changeValueId(STTR_VERSION_STRING, "version");
+    myAboutDescr     = aLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
+                                              "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
+    updateAbout();
+}
+
+void StOutDistorted::updateAbout() {
+    myAbout = myAboutTitle + '\n' + myAboutVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
+            + (!myAboutVrDevice.isEmpty() ? ("Connected hardware: " + myAboutVrDevice + "\n \n") : "")
+            + myAboutDescr.format("2013-2017", "kirill@sview.ru", "www.sview.ru");
+#ifdef ST_HAVE_OPENVR
+    myAbout = myAbout + "\n \n"
+            + "This software uses OpenVR library:\n"
+            + "https://github.com/ValveSoftware/openvr\n"
+            + "\xC2\xA9 2015 Valve Corporation";
+#endif
 }
 
 StOutDistorted::StOutDistorted(const StHandle<StResourceManager>& theResMgr,
@@ -173,15 +240,23 @@
   //myBarrelCoef(1.0f, 0.18f, 0.115f, 0.0387f),
   myChromAb(0.996f, -0.004f, 1.014f, 0.0f),
   //myChromAb(1.0f, 0.0f, 1.0f, 0.0f),
-  myOvrHmd(NULL),
-  myOvrSizeX(0),
-  myOvrSizeY(0),
-#ifdef ST_HAVE_LIBOVR
+  myVrMarginsTop(0.35),
+  myVrMarginsBottom(0.35),
+  myVrMarginsLeft(0.33),
+  myVrMarginsRight(0.33),
+  myVrRendSizeX(0),
+  myVrRendSizeY(0),
+  myVrTrackOrient(false),
+  myVrToDrawMsg(false),
+#ifdef ST_HAVE_OPENVR
+  myVrHmd(NULL),
+  myVrTrackedPoses(new vr::TrackedDevicePose_t[vr::k_unMaxTrackedDeviceCount]),
+#elif defined(ST_HAVE_LIBOVR)
+  myVrHmd(NULL),
   myOvrSwapTexture(NULL),
   myOvrMirrorTexture(NULL),
   myOvrMirrorFbo(0),
 #endif
-  myToReduceGui(false),
   myToShowCursor(true),
   myToCompressMem(myInstancesNb.increment() > 1),
   myIsBroken(false),
@@ -196,14 +271,14 @@
     const StSearchMonitors& aMonitors = StWindow::getMonitors();
 
     // detect connected displays
-    int aSupportOculus   = ST_DEVICE_SUPPORT_NONE;
+    int aSupportOpenVr   = ST_DEVICE_SUPPORT_NONE;
     int aSupportParallel = ST_DEVICE_SUPPORT_NONE;
     int aSupportS3DV     = ST_DEVICE_SUPPORT_NONE;
     for(size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
         const StMonitor& aMon = aMonitors[aMonIter];
         if(aMon.getPnPId().isStartsWith(stCString("OVR"))) {
             // Oculus Rift
-            aSupportOculus = ST_DEVICE_SUPPORT_HIGHT;
+            aSupportOpenVr = ST_DEVICE_SUPPORT_HIGHT;
             break;
         } else if(aMon.getPnPId().isEquals(stCString("ST@S3DV"))) {
             aSupportS3DV = ST_DEVICE_SUPPORT_PREFER;
@@ -219,12 +294,16 @@
         }
     }
 
-#ifdef ST_HAVE_LIBOVR
+#ifdef ST_HAVE_OPENVR
+    if(vr::VR_IsHmdPresent()) {
+        aSupportOpenVr = ST_DEVICE_SUPPORT_PREFER;
+    }
+#elif defined(ST_HAVE_LIBOVR)
     const ovrResult anOvrRes = ovr_Initialize(NULL);
     if(!OVR_SUCCESS(anOvrRes)) {
         ST_ERROR_LOG("StOutDistorted, OVR initialization has failed!");
     } else {
-        aSupportOculus = ST_DEVICE_SUPPORT_HIGHT;
+        aSupportOpenVr = ST_DEVICE_SUPPORT_HIGHT;
     }
 #endif
 
@@ -236,12 +315,12 @@
     aDevDistorted->Name     = stCString("TV (parallel pair)");
     myDevices.add(aDevDistorted);
 
-    StHandle<StOutDevice> aDevOculus = new StOutDevice();
-    aDevOculus->PluginId = ST_OUT_PLUGIN_NAME;
-    aDevOculus->DeviceId = stCString("Oculus");
-    aDevOculus->Priority = aSupportOculus;
-    aDevOculus->Name     = stCString("Oculus Rift");
-    myDevices.add(aDevOculus);
+    StHandle<StOutDevice> aDevVR = new StOutDevice();
+    aDevVR->PluginId = ST_OUT_PLUGIN_NAME;
+    aDevVR->DeviceId = stCString("OpenVR");
+    aDevVR->Priority = aSupportOpenVr;
+    aDevVR->Name     = stCString("OpenVR");
+    myDevices.add(aDevVR);
 
     if(aSupportS3DV != ST_DEVICE_SUPPORT_NONE) {
         StHandle<StOutDevice> aDevS3dv = new StOutDevice();
@@ -265,6 +344,8 @@
     params.MonoClone = new StBoolParamNamed(false, stCString("monoClone"), stCString("monoClone"));
     // Layout option
     params.Layout = new StEnumParam(myCanHdmiPack ? LAYOUT_OVER_UNDER : LAYOUT_SIDE_BY_SIDE_ANAMORPH, stCString("layout"), stCString("layout"));
+    updateStrings();
+
     // load window position
     if(isMovable()) {
         StRect<int32_t> aRect;
@@ -276,34 +357,31 @@
     mySettings->loadParam(params.MonoClone);
     mySettings->loadParam(params.Layout);
     checkHdmiPack();
-    updateStrings();
     StWindow::setTitle("sView - Distorted Renderer");
 
-    StRectI_t aMargins;
-    aMargins.left()   = 64;
-    aMargins.right()  = 64;
-    aMargins.top()    = 160;
-    aMargins.bottom() = 160;
-    mySettings->loadInt32Rect(ST_SETTING_MARGINS,   aMargins);
     mySettings->loadFloatVec4(ST_SETTING_WARP_COEF, myBarrelCoef);
     mySettings->loadFloatVec4(ST_SETTING_CHROME_AB, myChromAb);
-
-    myBarMargins.left   = aMargins.left();
-    myBarMargins.right  = aMargins.right();
-    myBarMargins.top    = aMargins.top();
-    myBarMargins.bottom = aMargins.bottom();
 }
 
 void StOutDistorted::releaseResources() {
     if(!myContext.isNull()) {
-    #ifdef ST_HAVE_LIBOVR
+        if(!myVrFullscreenMsg.isNull()) {
+            myVrFullscreenMsg->release(*myContext);
+            myVrFullscreenMsg.nullify();
+        }
+    #ifdef ST_HAVE_OPENVR
+        if(myVrHmd != NULL) {
+            vr::VR_Shutdown();
+            myVrHmd = NULL;
+        }
+    #elif defined(ST_HAVE_LIBOVR)
         if(myOvrSwapFbo[0] != 0) {
             myContext->arbFbo->glDeleteFramebuffers(2, myOvrSwapFbo);
             myOvrSwapFbo[0] = 0;
             myOvrSwapFbo[1] = 0;
         }
         if(myOvrSwapTexture != NULL) {
-            ovr_DestroySwapTextureSet(myOvrHmd, myOvrSwapTexture);
+            ovr_DestroySwapTextureSet(myVrHmd, myOvrSwapTexture);
             myOvrSwapTexture = NULL;
         }
         if(myOvrMirrorFbo != 0) {
@@ -311,12 +389,12 @@
             myOvrMirrorFbo = NULL;
         }
         if(myOvrMirrorTexture != NULL) {
-            ovr_DestroyMirrorTexture(myOvrHmd, &myOvrMirrorTexture->Texture);
+            ovr_DestroyMirrorTexture(myVrHmd, &myOvrMirrorTexture->Texture);
             myOvrMirrorTexture = NULL;
         }
-        if(myOvrHmd != NULL) {
-            ovr_Destroy(myOvrHmd);
-            myOvrHmd = NULL;
+        if(myVrHmd != NULL) {
+            ovr_Destroy(myVrHmd);
+            myVrHmd = NULL;
         }
     #endif
 
@@ -343,15 +421,8 @@
         mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
     }
 
-    StRectI_t aMargins;
-    aMargins.left()   = myBarMargins.left;
-    aMargins.right()  = myBarMargins.right;
-    aMargins.top()    = myBarMargins.top;
-    aMargins.bottom() = myBarMargins.bottom;
-
     mySettings->saveParam(params.Layout);
     mySettings->saveParam(params.MonoClone);
-    mySettings->saveInt32Rect(ST_SETTING_MARGINS,   aMargins);
     mySettings->saveFloatVec4(ST_SETTING_WARP_COEF, myBarrelCoef);
     mySettings->saveFloatVec4(ST_SETTING_CHROME_AB, myChromAb);
     if(myWasUsed) {
@@ -364,7 +435,9 @@
     myInstancesNb.decrement();
     releaseResources();
 
-#ifdef ST_HAVE_LIBOVR
+#ifdef ST_HAVE_OPENVR
+    delete[] myVrTrackedPoses;
+#elif defined(ST_HAVE_LIBOVR)
     ovr_Shutdown();
 #endif
 }
@@ -427,35 +500,69 @@
     myCurTCrdsBuf.init(*myContext, 2, 4, QUAD_TEXCOORD);
 
     // cursor texture
-    StAVImage aCursorImg;
-    StHandle<StResource> aCursorRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "cursor.png");
-    uint8_t* aData     = NULL;
-    int      aDataSize = 0;
-    if(!aCursorRes.isNull()
-    && !aCursorRes->isFile()
-    &&  aCursorRes->read()) {
-        aData     = (uint8_t* )aCursorRes->getData();
-        aDataSize = aCursorRes->getSize();
+    {
+        StAVImage aCursorImg;
+        StHandle<StResource> aCursorRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "cursor.png");
+        uint8_t* aData     = NULL;
+        int      aDataSize = 0;
+        if(!aCursorRes.isNull()
+        && !aCursorRes->isFile()
+        &&  aCursorRes->read()) {
+            aData     = (uint8_t* )aCursorRes->getData();
+            aDataSize = aCursorRes->getSize();
+        }
+        if(aCursorImg.load(!aCursorRes.isNull() ? aCursorRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+            myCursor->init(*myContext, aCursorImg.getPlane());
+        }
     }
-    if(aCursorImg.load(!aCursorRes.isNull() ? aCursorRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
-        //myCursor->setMinMagFilter(*myContext, GL_NEAREST);
-        myCursor->init(*myContext, aCursorImg.getPlane());
+
+#ifdef ST_HAVE_OPENVR
+    if(myDevice == DEVICE_HMD) {
+        vr::EVRInitError aVrError = vr::VRInitError_None;
+        myVrHmd = vr::VR_Init(&aVrError, vr::VRApplication_Scene);
+        if(aVrError != vr::VRInitError_None) {
+            myVrHmd = NULL;
+            myMsgQueue->pushError(StString("Unable to init VR runtime: ") + vr::VR_GetVRInitErrorAsEnglishDescription(aVrError));
+        }
+
+        if(myVrHmd != NULL) {
+            /*vr::IVRRenderModels* aRenderModels = (vr::IVRRenderModels* )vr::VR_GetGenericInterface(vr::IVRRenderModels_Version, &aVrError);
+            if(aRenderModels == NULL) {
+                myMsgQueue->pushError(StString("Unable to get render model interface: ") + vr::VR_GetVRInitErrorAsEnglishDescription(aVrError));
+            }*/
+        }
     }
 
-#ifdef ST_HAVE_LIBOVR
-    if(myDevice == DEVICE_OCULUS) {
+    myAboutVrDevice.clear();
+    if(myVrHmd != NULL) {
+        const StString aVrManuf   = getVrTrackedDeviceString(myVrHmd, vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_ManufacturerName_String);
+        const StString aVrDriver  = getVrTrackedDeviceString(myVrHmd, vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_TrackingSystemName_String);
+        const StString aVrDisplay = getVrTrackedDeviceString(myVrHmd, vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SerialNumber_String);
+
+        uint32_t aRenderSizeX = 0;
+        uint32_t aRenderSizeY = 0;
+        myVrHmd->GetRecommendedRenderTargetSize(&aRenderSizeX, &aRenderSizeY);
+        myAboutVrDevice = aVrManuf + " " + aVrDriver + "\n"
+                        + aVrDisplay + " [" + aRenderSizeX + "x" + aRenderSizeY + "]";
+        myVrRendSizeX = int(aRenderSizeX);
+        myVrRendSizeY = int(aRenderSizeY);
+        updateAbout();
+    }
+
+#elif defined(ST_HAVE_LIBOVR)
+    if(myDevice == DEVICE_HMD) {
         ovrGraphicsLuid aLuid;
-        const ovrResult anOvrRes = ovr_Create(&myOvrHmd, &aLuid);
-        if(myOvrHmd == NULL
+        const ovrResult anOvrRes = ovr_Create(&myVrHmd, &aLuid);
+        if(myVrHmd == NULL
         || !OVR_SUCCESS(anOvrRes)) {
             myMsgQueue->pushError(stCString("StOutDistorted, Oculus Rift is not connected!"));
-            myOvrHmd = NULL;
+            myVrHmd = NULL;
             return true;
         }
     }
 
-    if(myOvrHmd != NULL) {
-        ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myOvrHmd);
+    if(myVrHmd != NULL) {
+        ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myVrHmd);
         ovrSizei aWinSize = { anHmdDesc.Resolution.w / 2, anHmdDesc.Resolution.h / 2 };
 
         ST_DEBUG_LOG("libOVR Resolution: " + anHmdDesc.Resolution.w + "x" + anHmdDesc.Resolution.h);
@@ -466,7 +573,7 @@
             StWindow::setPlacement(aRect, false);
         }
 
-        ovrResult anOvrRes = ovr_CreateMirrorTextureGL(myOvrHmd, GL_SRGB8_ALPHA8, aWinSize.w, aWinSize.h, (ovrTexture** )&myOvrMirrorTexture);
+        ovrResult anOvrRes = ovr_CreateMirrorTextureGL(myVrHmd, GL_SRGB8_ALPHA8, aWinSize.w, aWinSize.h, (ovrTexture** )&myOvrMirrorTexture);
         if(!OVR_SUCCESS(anOvrRes)) {
             myMsgQueue->pushError(stCString("StOutDistorted, Failed to create mirror texture!"));
             myIsBroken = true;
@@ -480,12 +587,12 @@
         myContext->stglBindFramebufferRead(anFboReadBack);
 
         ovrSizei anEyeSizes[2] = {
-            ovr_GetFovTextureSize(myOvrHmd, ovrEye_Left,  anHmdDesc.DefaultEyeFov[ovrEye_Left],  1),
-            ovr_GetFovTextureSize(myOvrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[ovrEye_Right], 1)
+            ovr_GetFovTextureSize(myVrHmd, ovrEye_Left,  anHmdDesc.DefaultEyeFov[ovrEye_Left],  1),
+            ovr_GetFovTextureSize(myVrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[ovrEye_Right], 1)
         };
-        myOvrSizeX = stMax(anEyeSizes[0].w, anEyeSizes[1].w);
-        myOvrSizeY = stMax(anEyeSizes[0].h, anEyeSizes[1].h);
-        anOvrRes = ovr_CreateSwapTextureSetGL(myOvrHmd, GL_SRGB8_ALPHA8, myOvrSizeX * 2, myOvrSizeY, &myOvrSwapTexture);
+        myVrRendSizeX = stMax(anEyeSizes[0].w, anEyeSizes[1].w);
+        myVrRendSizeY = stMax(anEyeSizes[0].h, anEyeSizes[1].h);
+        anOvrRes = ovr_CreateSwapTextureSetGL(myVrHmd, GL_SRGB8_ALPHA8, myVrRendSizeX * 2, myVrRendSizeY, &myOvrSwapTexture);
         if(!OVR_SUCCESS(anOvrRes)
          || myOvrSwapTexture->TextureCount < 2) {
             myMsgQueue->pushError(stCString("StOutDistorted, Failed to create swap texture!"));
@@ -503,15 +610,69 @@
                                                   ((ovrGLTexture* )&myOvrSwapTexture->Textures[1])->OGL.TexId, 0);
         myContext->stglBindFramebufferRead(anFboReadBack);
     }
-#else
-    (void )myOvrSizeX;
-    (void )myOvrSizeY;
 #endif
+
+    if(myDevice == DEVICE_HMD) {
+        StAVImage anImage;
+        StHandle<StResource> aWarnRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "hmd_exit_fullscreen.png");
+        uint8_t* aData     = NULL;
+        int      aDataSize = 0;
+        if(!aWarnRes.isNull()
+        && !aWarnRes->isFile()
+        &&  aWarnRes->read()) {
+            aData     = (uint8_t* )aWarnRes->getData();
+            aDataSize = aWarnRes->getSize();
+        }
+        if(anImage.load(!aWarnRes.isNull() ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+            myVrFullscreenMsg = new StGLTextureQuad();
+            if(!myVrFullscreenMsg->init(*myContext, anImage.getPlane())) {
+                ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture can not be initialized!");
+                myVrFullscreenMsg->release(*myContext);
+                myVrFullscreenMsg.nullify();
+            }
+        } else {
+            ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture missed: " + anImage.getState());
+        }
+    }
+
     return true;
 }
 
 void StOutDistorted::processEvents() {
     StWindow::processEvents();
+
+#ifdef ST_HAVE_OPENVR
+    if(myVrHmd == NULL) {
+        return;
+    }
+
+    // process OpenVR events
+    for(vr::VREvent_t aVREvent; myVrHmd->PollNextEvent(&aVREvent, sizeof(aVREvent));) {
+        switch(aVREvent.eventType) {
+            case vr::VREvent_TrackedDeviceActivated: {
+                // setupVrRenderModel(aVREvent.trackedDeviceIndex);
+                ST_DEBUG_LOG("Device " + aVREvent.trackedDeviceIndex + " attached. Setting up render model")
+                break;
+            }
+            case vr::VREvent_TrackedDeviceDeactivated: {
+                ST_DEBUG_LOG("Device " + aVREvent.trackedDeviceIndex + " detached")
+                break;
+            }
+            case vr::VREvent_TrackedDeviceUpdated: {
+                ST_DEBUG_LOG("Device " + aVREvent.trackedDeviceIndex + " updated")
+                break;
+            }
+        }
+    }
+
+    // process OpenVR controller state
+    for(vr::TrackedDeviceIndex_t aDevIter = 0; aDevIter < vr::k_unMaxTrackedDeviceCount; ++aDevIter) {
+        vr::VRControllerState_t aCtrlState;
+        if(myVrHmd->GetControllerState(aDevIter, &aCtrlState, sizeof(aCtrlState))) {
+            // aCtrlState.ulButtonPressed == 0;
+        }
+    }
+#endif
 }
 
 void StOutDistorted::showCursor(const bool theToShow) {
@@ -533,18 +694,35 @@
         return;
     }
 
-    const GLfloat aLensDisp = getLensDist() * 0.5f;
+    const float aLensDisp = getLensDist() * 0.5f;
+    double aGlLeft  = -1.0;
+    double aGlTop   =  1.0;
+    double aGlSizeX =  2.0;
+    double aGlSizeY =  2.0;
+    if(isHmdOutput()) {
+        aGlLeft  = -1.0 + myVrMarginsLeft * 2.0;
+        aGlTop   =  1.0 - myVrMarginsTop  * 2.0;
+        aGlSizeX =  2.0 - (myVrMarginsLeft + myVrMarginsRight) * 2.0;
+        aGlSizeY =  2.0 - (myVrMarginsTop + myVrMarginsBottom) * 2.0;
+    }
 
     // compute cursor position
     StArray<StGLVec4> aVerts(4);
-    const GLfloat aCurLeft = GLfloat(-1.0 + theCursorPos.x() * 2.0);
-    const GLfloat aCurTop  = GLfloat( 1.0 - theCursorPos.y() * 2.0);
+    const float aCurLeft = float(aGlLeft + theCursorPos.x() * aGlSizeX);
+    const float aCurTop  = float(aGlTop  - theCursorPos.y() * aGlSizeY);
+    if(isHmdOutput()) {
+        if(aCurLeft < float(aGlLeft) || aCurLeft > float( 1.0 - myVrMarginsRight  * 2.0)
+        || aCurTop  > float(aGlTop)  || aCurTop  < float(-1.0 + myVrMarginsBottom * 2.0)) {
+            return;
+        }
+    }
+
     const int aVPSizeX = myContext->stglViewport().width();
     const int aVPSizeY = myContext->stglViewport().height();
 
-    GLfloat aCurWidth  = 2.0f * GLfloat(myCursor->getSizeX()) / GLfloat(aVPSizeX);
-    GLfloat aCurHeight = 2.0f * GLfloat(myCursor->getSizeY()) / GLfloat(aVPSizeY);
-    if(myDevice != DEVICE_OCULUS) {
+    float aCurWidth  = 2.0f * float(myCursor->getSizeX()) / float(aVPSizeX);
+    float aCurHeight = 2.0f * float(myCursor->getSizeY()) / float(aVPSizeY);
+    if(myDevice != DEVICE_HMD) {
         switch(getPairLayout()) {
             case LAYOUT_SIDE_BY_SIDE_ANAMORPH:
                 aCurWidth  *= 0.5;
@@ -589,39 +767,80 @@
 }
 
 bool StOutDistorted::hasOrientationSensor() const {
-    if(myOvrHmd != NULL) {
+#if defined(ST_HAVE_OPENVR) || defined(ST_HAVE_LIBOVR)
+    if(myVrHmd != NULL) {
         return true;
     }
+#endif
     return StWindow::hasOrientationSensor();
 }
 
+bool StOutDistorted::toTrackOrientation() const {
+#if defined(ST_HAVE_OPENVR) || defined(ST_HAVE_LIBOVR)
+    if(myVrHmd != NULL) {
+        return myVrTrackOrient;
+    }
+#endif
+    return StWindow::toTrackOrientation();
+}
+
+void StOutDistorted::setTrackOrientation(const bool theToTrack) {
+#if defined(ST_HAVE_OPENVR) || defined(ST_HAVE_LIBOVR)
+    if(myVrHmd != NULL) {
+        myVrTrackOrient = theToTrack;
+        return;
+    }
+#endif
+
+    myVrTrackOrient = false;
+    StWindow::setTrackOrientation(theToTrack);
+}
+
 StQuaternion<double> StOutDistorted::getDeviceOrientation() const {
-    if(StWindow::toTrackOrientation()
-    && myOvrHmd != NULL
+    if(myVrTrackOrient
     && !myIsBroken) {
-        return myOvrOrient;
+    #if defined(ST_HAVE_OPENVR) || defined(ST_HAVE_LIBOVR)
+        if(myVrHmd != NULL) {
+            return myVrOrient;
+        }
+    #endif
     }
     return StWindow::getDeviceOrientation();
 }
 
+StMarginsI StOutDistorted::getMargins() const {
+    if(isHmdOutput()) {
+        const StGLBoxPx aViewPort = StWindow::stglViewport(ST_WIN_MASTER);
+        const int aSizeX = aViewPort.width();
+        const int aSizeY = aViewPort.height();
+        StMarginsI aMargins;
+        aMargins.left   = int(double(aSizeX) * myVrMarginsLeft);
+        aMargins.right  = int(double(aSizeX) * myVrMarginsRight);
+        aMargins.top    = int(double(aSizeY) * myVrMarginsTop);
+        aMargins.bottom = int(double(aSizeY) * myVrMarginsBottom);
+        return aMargins;
+    }
+    return StMarginsI();
+}
+
 GLfloat StOutDistorted::getLensDist() const {
-    return (myIsStereoOn && myDevice == DEVICE_OCULUS) ? 0.1453f : 0.0f;
+    return isHmdOutput() ? 0.1453f : 0.0f;
 }
 
 GLfloat StOutDistorted::getScaleFactor() const {
-    if(!myToReduceGui
-    || !myIsStereoOn
-    ||  myDevice != DEVICE_OCULUS) {
+    if(!isHmdOutput()) {
         return StWindow::getScaleFactor();
     }
 
+    // within direct rendering mode HMD is not visible to the system and thus is not registered as StMonitor,
+    // therefore we need to override scale factor here to avoid incorrect scaling
     return 0.8f;
 }
 
 void StOutDistorted::checkHdmiPack() {
     myIsHdmiPack = false;
     if(!StWindow::isFullScreen()
-    || myDevice == DEVICE_OCULUS) {
+    || myDevice == DEVICE_HMD) {
         return;
     }
 
@@ -635,13 +854,15 @@
     }
 }
 
+bool StOutDistorted::isStereoFullscreenOnly() const {
+    return StWindow::hasFullscreenMode();
+}
+
 void StOutDistorted::setFullScreen(const bool theFullScreen) {
     bool wasFullscreen = StWindow::isFullScreen();
     if(!theFullScreen) {
-        myMargins.left   = 0;
-        myMargins.right  = 0;
-        myMargins.top    = 0;
-        myMargins.bottom = 0;
+        StWindow::setForcedAspect(-1.0);
+        myIsStereoOn = false;
     }
     StWindow::setFullScreen(theFullScreen);
     if(!wasFullscreen) {
@@ -649,20 +870,106 @@
     }
 }
 
-void StOutDistorted::stglDrawLibOVR() {
-#ifdef ST_HAVE_LIBOVR
+void StOutDistorted::stglDrawVR() {
+#ifdef ST_HAVE_OPENVR
     const StGLBoxPx  aVPBoth    = StWindow::stglViewport(ST_WIN_ALL);
-    const StPointD_t aCursorPos = StWindow::getMousePos();
-    if(myOvrHmd == NULL
+    const StPointD_t aCursorPos = getMousePos();
+    bool hasComposError = false;
+    if(myVrHmd == NULL
     || myIsBroken) {
         return;
     }
 
-    myToReduceGui = true;
-    ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myOvrHmd);
+    if(!myFrBuffer->initLazy(*myContext, GL_RGBA8, myVrRendSizeX, myVrRendSizeY, StWindow::hasDepthBuffer())) {
+        myIsBroken = true;
+        myMsgQueue->pushError(stCString("OpenVR output - critical error:\nFrame Buffer Object resize failed!"));
+        vr::VR_Shutdown();
+        myVrHmd = NULL;
+        return;
+    }
+
+    // draw into virtual frame buffers (textures)
+    myFrBuffer->setupViewPort(*myContext);       // we set TEXTURE sizes here
+    {
+        myFrBuffer->bindBuffer(*myContext);
+        StWindow::signals.onRedraw(ST_DRAW_LEFT);
+        stglDrawCursor(aCursorPos, ST_DRAW_LEFT);
+
+        vr::Texture_t aVRTexture = { (void* )(size_t )myFrBuffer->getTextureColor()->getTextureId(),  vr::TextureType_OpenGL, vr::ColorSpace_Gamma };
+        const vr::EVRCompositorError aVRError = vr::VRCompositor()->Submit(vr::Eye_Left, &aVRTexture);
+        if(aVRError != vr::VRCompositorError_None) {
+            //myMsgQueue->pushError(getVRCompositorError(aVRError));
+            ST_ERROR_LOG(getVRCompositorError(aVRError));
+            hasComposError = true;
+        }
+        myFrBuffer->unbindBuffer(*myContext);
+    }
+    {
+        myFrBuffer->bindBuffer(*myContext);
+        StWindow::signals.onRedraw(ST_DRAW_RIGHT);
+        stglDrawCursor(aCursorPos, ST_DRAW_RIGHT);
+
+        vr::Texture_t aVRTexture = { (void* )(size_t )myFrBuffer->getTextureColor()->getTextureId(),  vr::TextureType_OpenGL, vr::ColorSpace_Gamma };
+        const vr::EVRCompositorError aVRError = vr::VRCompositor()->Submit(vr::Eye_Right, &aVRTexture);
+        if(aVRError != vr::VRCompositorError_None) {
+            //myMsgQueue->pushError(getVRCompositorError(aVRError));
+            ST_ERROR_LOG(getVRCompositorError(aVRError));
+            hasComposError = true;
+        }
+        myFrBuffer->unbindBuffer(*myContext);
+    }
+    glFinish();
+
+    {
+        const vr::EVRCompositorError aVRError = vr::VRCompositor()->WaitGetPoses(myVrTrackedPoses, vr::k_unMaxTrackedDeviceCount, NULL, 0 );
+        if(aVRError != vr::VRCompositorError_None) {
+            //myMsgQueue->pushError(getVRCompositorError(aVRError));
+            ST_ERROR_LOG(getVRCompositorError(aVRError));
+            hasComposError = true;
+        }
+
+	      if(myVrTrackedPoses[vr::k_unTrackedDeviceIndex_Hmd].bPoseIsValid) {
+            const vr::HmdMatrix34_t& aHeadPos = myVrTrackedPoses[vr::k_unTrackedDeviceIndex_Hmd].mDeviceToAbsoluteTracking;
+            double aRotMat[3][3];
+            for(int aRow = 0; aRow < 3; ++aRow) {
+                for(int aCol = 0; aCol < 3; ++aCol) {
+                    aRotMat[aCol][aRow] = aHeadPos.m[aCol][aRow];
+                }
+            }
+            myVrOrient.setMatrix(aRotMat);
+	      }
+    }
+
+    // real screen buffer
+    myContext->stglBindFramebuffer(StGLFrameBuffer::NO_FRAMEBUFFER);
+
+    if(hasComposError || myVrToDrawMsg || myVrMsgTimer.getElapsedTimeInSec() > 2.0) {
+        myContext->stglResizeViewport(aVPBoth);
+        myContext->stglResetScissorRect();
+        myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        if(!myVrFullscreenMsg.isNull()) {
+            myVrFullscreenMsg->stglDraw(*myContext);
+        }
+        StWindow::stglSwap(ST_WIN_ALL);
+        if(myVrToDrawMsg) {
+            myVrToDrawMsg = false;
+            myVrMsgTimer.restart();
+        } else if(!hasComposError) {
+            myVrMsgTimer.stop();
+        }
+    }
+#elif defined(ST_HAVE_LIBOVR)
+    const StGLBoxPx  aVPBoth    = StWindow::stglViewport(ST_WIN_ALL);
+    const StPointD_t aCursorPos = getMousePos();
+    if(myVrHmd == NULL
+    || myIsBroken) {
+        return;
+    }
+
+    ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myVrHmd);
     ovrEyeRenderDesc anEyeRenderDesc[2] = {
-        ovr_GetRenderDesc(myOvrHmd, ovrEye_Left,  anHmdDesc.DefaultEyeFov[0]),
-        ovr_GetRenderDesc(myOvrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[1])
+        ovr_GetRenderDesc(myVrHmd, ovrEye_Left,  anHmdDesc.DefaultEyeFov[0]),
+        ovr_GetRenderDesc(myVrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[1])
     };
     ovrViewScaleDesc aViewScaleDesc;
     aViewScaleDesc.HmdSpaceToWorldScaleInMeters = 1.0f;
@@ -670,9 +977,9 @@
     aViewScaleDesc.HmdToEyeViewOffset[1] = anEyeRenderDesc[1].HmdToEyeViewOffset;
 
     const StGLBoxPx aViewPortL = {{ 0, 0,
-                                    myOvrSizeX, myOvrSizeY }};
-    const StGLBoxPx aViewPortR = {{ myOvrSizeX, 0,
-                                    myOvrSizeX, myOvrSizeY }};
+                                    myVrRendSizeX, myVrRendSizeY }};
+    const StGLBoxPx aViewPortR = {{ myVrRendSizeX, 0,
+                                    myVrRendSizeX, myVrRendSizeY }};
 
     ovrLayerEyeFov aLayerFov;
     aLayerFov.Header.Type       = ovrLayerType_EyeFov;
@@ -690,13 +997,13 @@
     aLayerFov.Fov[0]            = anHmdDesc.DefaultEyeFov[0];
     aLayerFov.Fov[1]            = anHmdDesc.DefaultEyeFov[1];
     aLayerFov.SensorSampleTime  = ovr_GetTimeInSeconds();
-    const double aPredictedTime = ovr_GetPredictedDisplayTime(myOvrHmd, 0);
-    ovrTrackingState anHmdState = ovr_GetTrackingState(myOvrHmd, aPredictedTime, ovrTrue);
+    const double aPredictedTime = ovr_GetPredictedDisplayTime(myVrHmd, 0);
+    ovrTrackingState anHmdState = ovr_GetTrackingState(myVrHmd, aPredictedTime, ovrTrue);
     ovr_CalcEyePoses(anHmdState.HeadPose.ThePose, aViewScaleDesc.HmdToEyeViewOffset, aLayerFov.RenderPose);
-    myOvrOrient = StQuaternion<double>((double )aLayerFov.RenderPose[0].Orientation.x,
-                                       (double )aLayerFov.RenderPose[0].Orientation.y,
-                                       (double )aLayerFov.RenderPose[0].Orientation.z,
-                                       (double )aLayerFov.RenderPose[0].Orientation.w);
+    myVrOrient = StQuaternion<double>((double )aLayerFov.RenderPose[0].Orientation.x,
+                                      (double )aLayerFov.RenderPose[0].Orientation.y,
+                                      (double )aLayerFov.RenderPose[0].Orientation.z,
+                                      (double )aLayerFov.RenderPose[0].Orientation.w);
 
     // draw Left View into virtual frame buffer
     myContext->stglResizeViewport(aViewPortL);
@@ -713,7 +1020,7 @@
     myContext->stglBindFramebuffer(StGLFrameBuffer::NO_FRAMEBUFFER);
 
     ovrLayerHeader* aLayers = &aLayerFov.Header;
-    ovrResult anOvrRes = ovr_SubmitFrame(myOvrHmd, 0, &aViewScaleDesc, &aLayers, 1);
+    ovrResult anOvrRes = ovr_SubmitFrame(myVrHmd, 0, &aViewScaleDesc, &aLayers, 1);
     myOvrSwapTexture->CurrentIndex = myOvrSwapTexture->CurrentIndex == 0 ? 1 : 0;
     if(!OVR_SUCCESS(anOvrRes)) {
         myMsgQueue->pushError(stCString("StOutDistorted, Failed to submit swap texture!"));
@@ -742,38 +1049,32 @@
 void StOutDistorted::stglDraw() {
     myFPSControl.setTargetFPS(StWindow::getTargetFps());
 
-    const bool isStereoSource = (StWindow::isStereoSource() || params.MonoClone->getValue());
+    const bool isStereoSource = StWindow::isStereoSource()
+                             || myDevice == DEVICE_HMD
+                             || params.MonoClone->getValue();
     myIsStereoOn = isStereoSource
                 && StWindow::isFullScreen()
                 && !myIsBroken;
-#ifdef ST_HAVE_LIBOVR
-    if(myOvrHmd != NULL) {
-        myIsStereoOn = isStereoSource
-                    && !myIsBroken;
-    }
-#endif
 
-    myIsForcedStereo = myIsStereoOn && params.MonoClone->getValue();
-    if(myIsStereoOn
-    && myDevice == DEVICE_OCULUS) {
-        myMargins = myBarMargins;
-    } else {
-        myMargins.left   = 0;
-        myMargins.right  = 0;
-        myMargins.top    = 0;
-        myMargins.bottom = 0;
+    myIsForcedStereo = myIsStereoOn && (myDevice == DEVICE_HMD || params.MonoClone->getValue());
+
+    double aForcedAspect = -1.0;
+    if(isHmdOutput()) {
+        if(myVrRendSizeX != 0 && myVrRendSizeY != 0) {
+            aForcedAspect = double(myVrRendSizeX) / double(myVrRendSizeY);
+        }
     }
 
     StWinSplit aWinSplit = StWinSlave_splitOff;
     const Layout aPairLayout = getPairLayout();
     if(myIsStereoOn
-    && (myDevice == DEVICE_OCULUS
+    && (myDevice == DEVICE_HMD
      || aPairLayout == LAYOUT_SIDE_BY_SIDE
      || aPairLayout == LAYOUT_OVER_UNDER)) {
-        aWinSplit = aPairLayout == LAYOUT_OVER_UNDER && myDevice != DEVICE_OCULUS
+        aWinSplit = aPairLayout == LAYOUT_OVER_UNDER && myDevice != DEVICE_HMD
                   ? StWinSlave_splitVertical
                   : StWinSlave_splitHorizontal;
-        if(myDevice != DEVICE_OCULUS
+        if(myDevice != DEVICE_HMD
         && aPairLayout == LAYOUT_OVER_UNDER
         && myIsHdmiPack) {
             // detect special HDMI 3D modes
@@ -785,6 +1086,7 @@
             }
         }
     }
+    StWindow::setForcedAspect(aForcedAspect);
     StWindow::setAttribute(StWinAttr_SplitCfg, aWinSplit);
     if(myDevice == DEVICE_S3DV) {
         StWindow::setHardwareStereoOn(myIsStereoOn);
@@ -798,6 +1100,7 @@
 
     const StGLBoxPx aVPMaster = StWindow::stglViewport(ST_WIN_MASTER);
     if(!myIsStereoOn) {
+        myVrToDrawMsg = true;
         if(myToCompressMem) {
             myFrBuffer->release(*myContext);
         }
@@ -814,20 +1117,20 @@
         return;
     }
 
-#ifdef ST_HAVE_LIBOVR
-    if(myOvrHmd != NULL
+#if defined(ST_HAVE_OPENVR) || defined(ST_HAVE_LIBOVR)
+    if(myVrHmd != NULL
     && !myIsBroken) {
-        stglDrawLibOVR();
+        stglDrawVR();
         return;
     }
 #endif
 
     const StGLBoxPx  aVPSlave   = StWindow::stglViewport(ST_WIN_SLAVE);
     const StGLBoxPx  aVPBoth    = StWindow::stglViewport(ST_WIN_ALL);
-    const StPointD_t aCursorPos = StWindow::getMousePos();
+    const StPointD_t aCursorPos = getMousePos();
     StGLBoxPx aViewPortL = aVPMaster;
     StGLBoxPx aViewPortR = aVPSlave;
-    if(myDevice != DEVICE_OCULUS) {
+    if(myDevice != DEVICE_HMD) {
         switch(aPairLayout) {
             case LAYOUT_OVER_UNDER_ANAMORPH: {
                 aViewPortR.height() /= 2;
@@ -849,7 +1152,7 @@
     }
 
     // simple rendering without FBO
-    if(myDevice != DEVICE_OCULUS
+    if(myDevice != DEVICE_HMD
     && !myIsForcedFboUsage) {
         myContext->stglResizeViewport(aVPBoth);
         myContext->stglSetScissorRect(aVPBoth, false);
@@ -876,8 +1179,7 @@
     // resize FBO
     GLint aFrSizeX = aViewPortL.width();
     GLint aFrSizeY = aViewPortL.height();
-    if(myDevice == DEVICE_OCULUS) {
-        myToReduceGui = aFrSizeX <= 640;
+    if(myDevice == DEVICE_HMD) {
         aFrSizeX = int(std::ceil(double(aFrSizeX) * 1.25) + 0.5);
         aFrSizeY = int(std::ceil(double(aFrSizeY) * 1.25) + 0.5);
     }
@@ -920,7 +1222,7 @@
     StGLProgram*    aProgram   = myProgramFlat.access();
     StGLVarLocation aVertexLoc = myProgramFlat->getVVertexLoc();
     StGLVarLocation aTexCrdLoc = myProgramFlat->getVTexCoordLoc();
-    if(myDevice == DEVICE_OCULUS) {
+    if(myDevice == DEVICE_HMD) {
         aProgram   = myProgramBarrel.access();
         aVertexLoc = myProgramBarrel->getVVertexLoc();
         aTexCrdLoc = myProgramBarrel->getVTexCoordLoc();

sview-16_06.tar.gz/StOutDistorted/StOutDistorted.h -> sview-17_04.tar.gz/StOutDistorted/StOutDistorted.h Changed

@@ -1,6 +1,6 @@
 /**
  * StOutDistorted, class providing stereoscopic output in anamorph side by side format using StCore toolkit.
- * Copyright © 2013-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -14,11 +14,19 @@
 #include <StGL/StGLVertexBuffer.h>
 #include <StThreads/StFPSControl.h>
 
+//#define ST_HAVE_OPENVR
+
 class StSettings;
 class StProgramBarrel;
 class StProgramFlat;
 class StGLFrameBuffer;
 class StGLTexture;
+class StGLTextureQuad;
+
+namespace vr {
+    class IVRSystem;
+    struct TrackedDevicePose_t;
+}
 
 typedef struct ovrHmdStruct* ovrSession;
 typedef union ovrGLTexture_s ovrGLTexture;
@@ -26,7 +34,7 @@
 
 /**
  * This class implements stereoscopic rendering on displays
- * wich require software distortion correction.
+ * which require software distortion correction.
  */
 class StOutDistorted : public StWindow {
 
@@ -113,6 +121,11 @@
     ST_CPPEXPORT virtual void setFullScreen(const bool theFullScreen) ST_ATTR_OVERRIDE;
 
     /**
+     * Return true if 3D output requires fullscreen mode.
+     */
+    ST_CPPEXPORT virtual bool isStereoFullscreenOnly() const ST_ATTR_OVERRIDE;
+
+    /**
      * Stereo renderer.
      */
     ST_CPPEXPORT virtual void stglDraw() ST_ATTR_OVERRIDE;
@@ -129,10 +142,25 @@
     ST_CPPEXPORT virtual bool hasOrientationSensor() const ST_ATTR_OVERRIDE;
 
     /**
+     * Return TRUE if orientation tracking has been activated.
+     */
+    ST_CPPEXPORT virtual bool toTrackOrientation() const ST_ATTR_OVERRIDE;
+
+    /**
+     * Setup flag indicating that orientation tracking should be enabled
+     */
+    ST_CPPEXPORT virtual void setTrackOrientation(const bool theToTrack) ST_ATTR_OVERRIDE;
+
+    /**
      * Get head orientation.
      */
     ST_CPPEXPORT virtual StQuaternion<double> getDeviceOrientation() const ST_ATTR_OVERRIDE;
 
+    /**
+     * Return margins for working area.
+     */
+    ST_CPPEXPORT virtual StMarginsI getMargins() const ST_ATTR_OVERRIDE;
+
     ST_CPPEXPORT virtual GLfloat getLensDist() const ST_ATTR_OVERRIDE;
 
     /**
@@ -163,6 +191,11 @@
     ST_LOCAL void updateStrings();
 
     /**
+     * Update about text.
+     */
+    ST_LOCAL void updateAbout();
+
+    /**
      * On/off VSync callback.
      */
     ST_LOCAL void doSwitchVSync(const int32_t theValue);
@@ -171,10 +204,15 @@
                                  const unsigned int theView);
 
     /**
-     * Draw stereo-pair using libOVR.
+     * Draw stereo-pair for VR.
      * To be called from stglDraw().
      */
-    ST_LOCAL void stglDrawLibOVR();
+    ST_LOCAL void stglDrawVR();
+
+    ST_LOCAL bool isHmdOutput() const {
+        return myIsStereoOn
+            && myDevice == DEVICE_HMD;
+    }
 
         private:
 
@@ -185,7 +223,7 @@
     enum {
         DEVICE_AUTO         =-1,
         DEVICE_DISTORTED    = 0, //!< general output
-        DEVICE_OCULUS       = 1, //!< Oculus Rift
+        DEVICE_HMD          = 1, //!< VR HMD
         DEVICE_S3DV         = 2, //!< S3DV
         DEVICE_NB,
     };
@@ -202,7 +240,7 @@
      */
     Layout getPairLayout() const {
         switch(myDevice) {
-            case DEVICE_OCULUS:
+            case DEVICE_HMD:
                 return LAYOUT_SIDE_BY_SIDE;
             case DEVICE_S3DV:
                 return LAYOUT_SIDE_BY_SIDE_ANAMORPH;
@@ -224,6 +262,10 @@
     StOutDevicesList          myDevices;
     StHandle<StSettings>      mySettings;
     StString                  myAbout;           //!< about string
+    StString                  myAboutTitle;      //!< title for About dialog
+    StString                  myAboutVerString;  //!< version string for About dialog
+    StString                  myAboutDescr;      //!< description for About dialog
+    StString                  myAboutVrDevice;   //!< HMD info for About dialog
 
     int                       myDevice;          //!< currently active device
     bool                      myToResetDevice;
@@ -240,20 +282,28 @@
     StGLVec4                  myBarrelCoef;      //!< Barrel distortion coefficients
     StGLVec4                  myChromAb;         //!< chrome coefficients
 
-    StMarginsI                myBarMargins;      //!< GUI margins
-
-    ovrSession                myOvrHmd;
-    int                       myOvrSizeX;
-    int                       myOvrSizeY;
-    StQuaternion<double>      myOvrOrient;
-#ifdef ST_HAVE_LIBOVR
+    StQuaternion<double>      myVrOrient;        //!< HMD (head) orientation, excluding translation vector
+    double                    myVrMarginsTop;
+    double                    myVrMarginsBottom;
+    double                    myVrMarginsLeft;
+    double                    myVrMarginsRight;
+    int                       myVrRendSizeX;     //!< FBO width  for rendering into VR (can be greater then actual HMD resolution to compensate distortion)
+    int                       myVrRendSizeY;     //!< FBO height for rendering into VR
+    bool                      myVrTrackOrient;   //!< track orientation flag
+    bool                      myVrToDrawMsg;
+    StHandle<StGLTextureQuad> myVrFullscreenMsg;
+    StTimer                   myVrMsgTimer;
+#ifdef ST_HAVE_OPENVR
+    vr::IVRSystem*            myVrHmd;           //!< OpenVR session object
+    vr::TrackedDevicePose_t*  myVrTrackedPoses;  //!< array of tracked devices poses
+#elif defined(ST_HAVE_LIBOVR)
+    ovrSession                myVrHmd;
     ovrSwapTextureSet*        myOvrSwapTexture;
     GLuint                    myOvrSwapFbo[2];
     ovrGLTexture*             myOvrMirrorTexture;
     GLuint                    myOvrMirrorFbo;
 #endif
 
-    bool                      myToReduceGui;     //!< scale down GUI
     bool                      myToShowCursor;    //!< cursor visibility flag
     bool                      myToCompressMem;   //!< reduce memory usage
     bool                      myIsBroken;        //!< special flag for broke state - when FBO can not be allocated

sview-16_06.tar.gz/StOutDistorted/StOutDistorted.rc -> sview-17_04.tar.gz/StOutDistorted/StOutDistorted.rc Changed

sview-16_06.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/czech/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/czech/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng -> sview-17_04.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng Changed

sview-16_06.tar.gz/StOutDual/StOutDual.cpp -> sview-17_04.tar.gz/StOutDual/StOutDual.cpp Changed

@@ -184,7 +184,7 @@
     StString& aDescr     = aLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
         "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
     myAbout = aTitle + '\n' + aVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
-            + aDescr.format("2007-2016", "kirill@sview.ru", "www.sview.ru");
+            + aDescr.format("2007-2017", "kirill@sview.ru", "www.sview.ru");
 }
 
 StOutDual::StOutDual(const StHandle<StResourceManager>& theResMgr,
@@ -241,6 +241,8 @@
     params.SlaveMonId->signals.onChanged.connect(this, &StOutDual::doSlaveMon);
 
     params.MonoClone = new StBoolParamNamed(false, stCString("monoClone"), stCString("monoClone"));
+    updateStrings();
+
     mySettings->loadParam(params.MonoClone);
 
     // load window position
@@ -251,7 +253,6 @@
         }
         StWindow::setPlacement(aRect, true);
     }
-    updateStrings();
     StWindow::setTitle("sView - Dual Renderer");
 
     // load device settings

sview-16_06.tar.gz/StOutDual/StOutDual.rc -> sview-17_04.tar.gz/StOutDual/StOutDual.rc Changed

sview-16_06.tar.gz/StOutIZ3D/StOutIZ3D.cpp -> sview-17_04.tar.gz/StOutIZ3D/StOutIZ3D.cpp Changed

@@ -117,7 +117,7 @@
     StString& aDescr     = aLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
         "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
     myAbout = aTitle + '\n' + aVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
-            + aDescr.format("2009-2016", "kirill@sview.ru", "www.sview.ru");
+            + aDescr.format("2009-2017", "kirill@sview.ru", "www.sview.ru");
 }
 
 StOutIZ3D::StOutIZ3D(const StHandle<StResourceManager>& theResMgr,
@@ -154,6 +154,7 @@
     // shader switch option
     params.Glasses = new StEnumParam(myShaders.getMode(), stCString("tableId"), stCString("tableId"));
     params.Glasses->signals.onChanged.connect(&myShaders, &StOutIZ3DShaders::doSetMode);
+    updateStrings();
 
     // load window position
     if(isMovable()) {
@@ -163,7 +164,7 @@
         }
         StWindow::setPlacement(aRect, true);
     }
-    updateStrings();
+
     StWindow::setTitle("sView - iZ3D Renderer");
 
     // load parameters

sview-16_06.tar.gz/StOutIZ3D/StOutIZ3D.rc -> sview-17_04.tar.gz/StOutIZ3D/StOutIZ3D.rc Changed

sview-16_06.tar.gz/StOutInterlace/StOutInterlace.cpp -> sview-17_04.tar.gz/StOutInterlace/StOutInterlace.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StOutInterlace, class providing stereoscopic output in row interlaced format using StCore toolkit.
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -17,6 +17,7 @@
 #include <StSettings/StTranslations.h>
 #include <StSettings/StEnumParam.h>
 #include <StCore/StSearchMonitors.h>
+#include <StImage/StImagePlane.h>
 #include <StVersion.h>
 
 namespace {
@@ -66,6 +67,7 @@
         // parameters
         STTR_PARAMETER_REVERSE  = 1102,
         STTR_PARAMETER_BIND_MON = 1103,
+        STTR_PARAMETER_USE_MASK = 1104,
 
         // about info
         STTR_PLUGIN_TITLE       = 2000,
@@ -99,10 +101,14 @@
     if(!StGLProgram::link(theCtx)) {
         return false;
     }
-    StGLVarLocation aTextureLoc = StGLProgram::getUniformLocation(theCtx, "uTexture");
+    StGLVarLocation aTextureLoc  = StGLProgram::getUniformLocation(theCtx, "uTexture");
+    StGLVarLocation aTexture2Loc = StGLProgram::getUniformLocation(theCtx, "uMaskTexture");
     if(aTextureLoc.isValid()) {
         use(theCtx);
         theCtx.core20fwd->glUniform1i(aTextureLoc, StGLProgram::TEXTURE_SAMPLE_0); // GL_TEXTURE0
+        if(aTexture2Loc.isValid()) {
+            theCtx.core20fwd->glUniform1i(aTexture2Loc, StGLProgram::TEXTURE_SAMPLE_1); // GL_TEXTURE1
+        }
         unuse(theCtx);
     }
     return aTextureLoc.isValid();
@@ -179,6 +185,7 @@
 #if !defined(__ANDROID__)
     theList.add(params.BindToMon);
 #endif
+    theList.add(params.ToUseMask);
 }
 
 void StOutInterlace::updateStrings() {
@@ -195,6 +202,7 @@
 #endif
     params.ToReverse->setName(aLangMap.changeValueId(STTR_PARAMETER_REVERSE,  "Reverse Order"));
     params.BindToMon->setName(aLangMap.changeValueId(STTR_PARAMETER_BIND_MON, "Bind To Supported Monitor"));
+    params.ToUseMask->setName(aLangMap.changeValueId(STTR_PARAMETER_USE_MASK, "Use texture mask (compatibility)"));
 
     // about string
     StString& aTitle     = aLangMap.changeValueId(STTR_PLUGIN_TITLE,   "sView - Interlaced Output library");
@@ -202,7 +210,7 @@
     StString& aDescr     = aLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
         "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
     myAbout = aTitle + '\n' + aVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
-            + aDescr.format("2009-2016", "kirill@sview.ru", "www.sview.ru");
+            + aDescr.format("2009-2017", "kirill@sview.ru", "www.sview.ru");
 }
 
 StOutInterlace::StOutInterlace(const StHandle<StResourceManager>& theResMgr,
@@ -210,6 +218,9 @@
 : StWindow(theResMgr, theParentWindow),
   mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
   myFrmBuffer(new StGLFrameBuffer()),
+  myTextureMask(new StGLTexture(GL_ALPHA)),
+  myTexMaskDevice(DEVICE_AUTO),
+  myTexMaskReversed(false),
   myDevice(DEVICE_AUTO),
   myEDTimer(true),
   myEDIntelaceOn(new StGLProgram("ED Interlace On")),
@@ -221,6 +232,7 @@
   myIsEDactive(false),
   myIsEDCodeFinished(false),
   myToCompressMem(myInstancesNb.increment() > 1),
+  myIsFirstDraw(true),
   myIsBroken(false) {
     myWinRect.left()   = 0;
     myWinRect.right()  = 0;
@@ -243,6 +255,8 @@
     myGlProgramsRev[DEVICE_CHESSBOARD]        = new StProgramFB("Chessboard Inversed");
     myGlProgramsRev[DEVICE_ROW_INTERLACED_ED] = myGlProgramsRev[DEVICE_ROW_INTERLACED];
 
+    myGlProgramMask = new StProgramFB("Interlace Mask");
+
     // devices list
     StHandle<StOutDevice> aDevRow = new StOutDevice();
     aDevRow->PluginId = ST_OUT_PLUGIN_NAME;
@@ -284,11 +298,13 @@
     // options
     params.ToReverse = new StBoolParamNamed(false, stCString("reverse"),     stCString("reverse"));
     params.BindToMon = new StBoolParamNamed(true,  stCString("bindMonitor"), stCString("bindMonitor"));
+    params.ToUseMask = new StBoolParamNamed(false, stCString("useMask"),     stCString("useMask"));
+    updateStrings();
+
     mySettings->loadParam(params.ToReverse);
     mySettings->loadParam(params.BindToMon);
-
+    myIsFirstDraw = !mySettings->loadParam(params.ToUseMask);
     params.BindToMon->signals.onChanged.connect(this, &StOutInterlace::doSetBindToMonitor);
-    updateStrings();
 
     // load window position
     if(isMovable()) {
@@ -354,6 +370,8 @@
         myQuadVertBuf.release(*myContext);
         myQuadTexCoordBuf.release(*myContext);
         myFrmBuffer->release(*myContext);
+        myTextureMask->release(*myContext);
+        myGlProgramMask->release(*myContext);
     }
     myContext.nullify();
 
@@ -382,6 +400,7 @@
     }
     mySettings->saveParam(params.BindToMon);
     mySettings->saveParam(params.ToReverse);
+    mySettings->saveParam(params.ToUseMask);
     mySettings->saveInt32(ST_SETTING_DEVICE_ID,    myDevice);
     mySettings->flush();
 
@@ -531,11 +550,31 @@
                                        .attachShader(*myContext, aShaderChessRev)
                                        .link(*myContext);
 
+    // discard mask texture
+    StGLFragmentShader aShaderMask(myGlProgramMask->getTitle());
+    StGLAutoRelease aTmp8(*myContext, aShaderMask);
+    if(!aShaderMask.init(*myContext,
+                         "uniform sampler2D uTexture;\n"
+                         "uniform sampler2D uMaskTexture;\n"
+                         "varying vec2 fTexCoord;\n"
+                         "void main(void) {\n"
+                         "  float aMask = texture2D(uMaskTexture, fTexCoord).a;\n"
+                         "  if(aMask < 0.5) { discard; }\n"
+                         "  gl_FragColor = texture2D(uTexture, fTexCoord);\n"
+                         "}\n")) {
+        myMsgQueue->pushError(aShadersError);
+        myIsBroken = true;
+        return true;
+    }
+    myGlProgramMask->create(*myContext)
+                   .attachShader(*myContext, aVertexShader)
+                   .attachShader(*myContext, aShaderMask)
+                   .link(*myContext);
+
 #if !defined(__ANDROID__)
-    /// TODO (Kirill Gavrilov#3) fix shaders
     const StString aShadersRoot = StString("shaders" ST_FILE_SPLITTER) + ST_OUT_PLUGIN_NAME + SYS_FS_SPLITTER;
     StGLVertexShader stVShaderED("ED control");
-    StGLAutoRelease aTmp8(*myContext, stVShaderED);
+    StGLAutoRelease aTmp9(*myContext, stVShaderED);
     if(!stVShaderED.initFile(*myContext, aShadersRoot + VSHADER_ED)) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -543,7 +582,7 @@
     }
 
     StGLFragmentShader stFInterlaceOn(myEDIntelaceOn->getTitle());
-    StGLAutoRelease aTmp9(*myContext, stFInterlaceOn);
+    StGLAutoRelease aTmp10(*myContext, stFInterlaceOn);
     if(!stFInterlaceOn.initFile(*myContext, aShadersRoot + FSHADER_EDINTERLACE_ON)) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -555,7 +594,7 @@
                    .link(*myContext);
 
     StGLFragmentShader stFShaderEDOff(myEDOff->getTitle());
-    StGLAutoRelease aTmp10(*myContext, stFShaderEDOff);
+    StGLAutoRelease aTmp11(*myContext, stFShaderEDOff);
     if(!stFShaderEDOff.initFile(*myContext, aShadersRoot + FSHADER_ED_OFF)) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -643,6 +682,73 @@
     }
 }
 
+bool StOutInterlace::initTextureMask(int  theDevice,
+                                     bool theToReverse,
+                                     int  theSizeX,
+                                     int  theSizeY) {
+    if(myTextureMask->getSizeX() == theSizeX
+    && myTextureMask->getSizeY() == theSizeY
+    && myTexMaskDevice   == theDevice
+    && myTexMaskReversed == theToReverse) {
+        return true;
+    }
+
+    StImagePlane anImage;
+    if(!anImage.initTrash(StImagePlane::ImgGray, theSizeX, theSizeY)) {
+        myMsgQueue->pushError(stCString("Interlace output - critical error:\nNot enough memory for mask image!"));
+        myIsBroken = true;
+        return false;
+    }
+
+    for(int aRowIter = 0; aRowIter < theSizeY; ++aRowIter) {
+        for(int aColIter = 0; aColIter < theSizeX; ++aColIter) {
+            stUByte_t* aPixel = anImage.changeData(aRowIter, aColIter);
+            switch(theDevice) {
+                case DEVICE_ROW_INTERLACED:
+                case DEVICE_ROW_INTERLACED_ED: {
+                    if(theToReverse) {
+                        *aPixel = (aRowIter % 2 != 0) ? 255 : 0;
+                    } else {
+                        *aPixel = (aRowIter % 2 == 0) ? 255 : 0;
+                    }
+                    break;
+                }
+                case DEVICE_COL_INTERLACED: {
+                    if(theToReverse) {
+                        *aPixel = (aColIter % 2 == 0) ? 255 : 0;
+                    } else {
+                        *aPixel = (aColIter % 2 != 0) ? 255 : 0;
+                    }
+                    break;
+                }
+                case DEVICE_CHESSBOARD: {
+                    const bool isEvenX = (aRowIter % 2 == 0);
+                    const bool isEvenY = (aColIter % 2 != 0);
+                    if(theToReverse) {
+                        *aPixel =  ((isEvenX && isEvenY) || (!isEvenX && !isEvenY)) ? 255 : 0;
+                    } else {
+                        *aPixel = !((isEvenX && isEvenY) || (!isEvenX && !isEvenY)) ? 255 : 0;
+                    }
+                    break;
+                }
+                case DEVICE_AUTO:
+                case DEVICE_NB:
+                    break;
+            }
+        }
+    }
+
+    if(!myTextureMask->init(*myContext, anImage)) {
+        myMsgQueue->pushError(stCString("Interlace output - critical error:\nMask texture resize failed!"));
+        myIsBroken = true;
+        return false;
+    }
+
+    myTexMaskDevice   = theDevice;
+    myTexMaskReversed = theToReverse;
+    return true;
+}
+
 void StOutInterlace::stglDrawEDCodes() {
     if(myEDTimer.getElapsedTime() > 0.5) {
         StWindow::hide(ST_WIN_SLAVE);
@@ -705,6 +811,7 @@
     if(!StWindow::isStereoOutput() || myIsBroken) {
         if(myToCompressMem) {
             myFrmBuffer->release(*myContext);
+            myTextureMask->release(*myContext);
         }
 
         if(myDevice == DEVICE_ROW_INTERLACED_ED) {
@@ -729,6 +836,16 @@
         return;
     }
 
+    if(myIsFirstDraw) {
+        myIsFirstDraw = false;
+
+        // fall-back on known problematic devices
+        const StString aGlRenderer((const char* )myContext->core11fwd->glGetString(GL_RENDERER));
+        if(aGlRenderer.isContains(stCString("PowerVR Rogue G6200"))) {
+            params.ToUseMask->setValue(true);
+        }
+    }
+
     // reverse L/R according to window position
     bool isPixelReverse = false;
     const StRectI_t aWinRect = StWindow::getPlacement();
@@ -784,11 +901,26 @@
         isPixelReverse = !isPixelReverse;
     }
 
+    // reversed by external event
+    if(StWindow::toSwapEyesHW()) {
+        isPixelReverse = !isPixelReverse;
+    }
+
     // reversed by user?
     if(params.ToReverse->getValue()) {
         isPixelReverse = !isPixelReverse;
     }
 
+    // initialize mask texture
+    const bool toUseTexMask = params.ToUseMask->getValue();
+    if(toUseTexMask) {
+        if(!initTextureMask(aDevice, isPixelReverse, myFrmBuffer->getSizeX(), myFrmBuffer->getSizeY())) {
+            return;
+        }
+    } else {
+        myTextureMask->release(*myContext);
+    }
+
     // reduce viewport to avoid additional aliasing of narrow lines
     GLfloat aDX = GLfloat(myFrmBuffer->getVPSizeX()) / GLfloat(myFrmBuffer->getSizeX());
     GLfloat aDY = GLfloat(myFrmBuffer->getVPSizeY()) / GLfloat(myFrmBuffer->getSizeY());
@@ -810,7 +942,14 @@
 
     myContext->stglResizeViewport(aVPort);
     myFrmBuffer->bindTexture(*myContext);
-    const StHandle<StProgramFB>& aProgram = isPixelReverse ? myGlProgramsRev[aDevice] : myGlPrograms[aDevice];
+    if(toUseTexMask) {
+        myTextureMask->bind(*myContext, GL_TEXTURE1);
+    }
+    const StHandle<StProgramFB>& aProgram = toUseTexMask
+                                          ? myGlProgramMask
+                                          : (isPixelReverse
+                                            ? myGlProgramsRev[aDevice]
+                                            : myGlPrograms[aDevice]);
     aProgram->use(*myContext);
     myQuadVertBuf.bindVertexAttrib(*myContext, ST_VATTRIB_VERTEX);
     myQuadTexCoordBuf.bindVertexAttrib(*myContext, ST_VATTRIB_TCOORD);
@@ -820,6 +959,9 @@
     myQuadTexCoordBuf.unBindVertexAttrib(*myContext, ST_VATTRIB_TCOORD);
     myQuadVertBuf.unBindVertexAttrib(*myContext, ST_VATTRIB_VERTEX);
     aProgram->unuse(*myContext);
+    if(toUseTexMask) {
+        myTextureMask->unbind(*myContext);
+    }
     myFrmBuffer->unbindTexture(*myContext);
 
     if(myDevice == DEVICE_ROW_INTERLACED_ED) {

sview-16_06.tar.gz/StOutInterlace/StOutInterlace.h -> sview-17_04.tar.gz/StOutInterlace/StOutInterlace.h Changed

@@ -1,6 +1,6 @@
 /**
  * StOutInterlace, class providing stereoscopic output in row interlaced format using StCore toolkit.
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -135,6 +135,14 @@
     ST_LOCAL void stglDrawEDCodes();
 
     /**
+     * Initialize texture mask.
+     */
+    ST_LOCAL bool initTextureMask(int  theDevice,
+                                  bool theToReverse,
+                                  int  theSizeX,
+                                  int  theSizeY);
+
+    /**
      * Release GL resources before window closing.
      */
     ST_LOCAL void releaseResources();
@@ -169,6 +177,7 @@
 
         StHandle<StBoolParamNamed> ToReverse; //!< configurable flag to reverse rows order
         StHandle<StBoolParamNamed> BindToMon; //!< flag to bind to monitor
+        StHandle<StBoolParamNamed> ToUseMask; //!< use mask texture instead of straightforward discard shader
 
     } params;
 
@@ -181,6 +190,12 @@
     StHandle<StGLFrameBuffer> myFrmBuffer;                //!< OpenGL frame buffer object
     StHandle<StProgramFB>     myGlPrograms[DEVICE_NB];    //!< GLSL programs
     StHandle<StProgramFB>     myGlProgramsRev[DEVICE_NB]; //!< GLSL programs with reversed left/right condition
+
+    StHandle<StProgramFB>     myGlProgramMask;            //!< universal GLSL program which uses mask texture
+    StHandle<StGLTexture>     myTextureMask;              //!< texture holding mask for discarding pixels
+    int                       myTexMaskDevice;            //!< texture mask device
+    bool                      myTexMaskReversed;          //!< texture mask is initialized in reversed state
+
     StGLVertexBuffer          myQuadVertBuf;
     StGLVertexBuffer          myQuadTexCoordBuf;
     int                       myDevice;
@@ -202,6 +217,7 @@
     bool                      myIsEDactive;
     bool                      myIsEDCodeFinished;
     bool                      myToCompressMem;            //!< reduce memory usage
+    bool                      myIsFirstDraw;              //!< first frame draw
     bool                      myIsBroken;                 //!< special flag for broke state - when FBO can not be allocated
 
 };

sview-16_06.tar.gz/StOutInterlace/StOutInterlace.rc -> sview-17_04.tar.gz/StOutInterlace/StOutInterlace.rc Changed

sview-16_06.tar.gz/StOutInterlace/lang/chinese/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/chinese/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/czech/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/czech/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/english/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/english/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/french/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/french/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/german/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/german/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/korean/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/korean/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutInterlace/lang/russian/StOutInterlace.lng -> sview-17_04.tar.gz/StOutInterlace/lang/russian/StOutInterlace.lng Changed

sview-16_06.tar.gz/StOutPageFlip/StDXManager.cpp -> sview-17_04.tar.gz/StOutPageFlip/StDXManager.cpp Changed

@@ -83,7 +83,6 @@
 : myD3dLib(NULL),
   myD3dDevice(NULL),
   myRefreshRate(D3DPRESENT_RATE_DEFAULT),
-  myIsD3dEx(false),
   myWithAqbs(false) {
     stMemSet(&myD3dParams, 0, sizeof(myD3dParams));
     stMemSet(&myCurrMode,  0, sizeof(myCurrMode));
@@ -112,22 +111,7 @@
 
 bool StDXManager::initDxLib() {
     if(myD3dLib == NULL) {
-        IDirect3D9Ex* aD3dLibEx = NULL;
-        // we link against d3d (using Direct3DCreate9 symbol), thus it should be already loaded
-        HMODULE aLib = GetModuleHandleW(L"d3d9");
-        if(aLib != NULL) {
-            // retrieve D3D9Ex function dynamically (available only since Vista+)
-            typedef HRESULT (WINAPI* Direct3DCreate9Ex_t)(UINT , IDirect3D9Ex** );
-            Direct3DCreate9Ex_t Direct3DCreate9ExProc = (Direct3DCreate9Ex_t )GetProcAddress(aLib, "Direct3DCreate9Ex");
-            if(Direct3DCreate9ExProc != NULL) {
-                Direct3DCreate9ExProc(D3D_SDK_VERSION, &aD3dLibEx);
-            }
-        }
-        myD3dLib  = aD3dLibEx;
-        myIsD3dEx = aD3dLibEx != NULL;
-        if(myD3dLib == NULL) {
-            myD3dLib = Direct3DCreate9(D3D_SDK_VERSION);
-        }
+        Direct3DCreate9Ex(D3D_SDK_VERSION, &myD3dLib);
     }
     return myD3dLib != NULL;
 }
@@ -460,33 +444,14 @@
         return DefWindowProcW(in_hWnd, uMsg, wParam, lParam);
     }
 
-    static StCondition   THE_DX_INIT_EVENT(true);
     static volatile bool ST_DX_HAS_CACHED_INFO = false;
     static StDXInfo      ST_DX_CACHED_INFO;
 
-    SV_THREAD_FUNCTION getInfoThreadFunction(void* ) {
-        StDXInfo anInfo;
-        StDXManager::getInfo(anInfo, true);
-        THE_DX_INIT_EVENT.set();
-        return SV_THREAD_RETURN 0;
-    }
-
-}
-
-void StDXManager::initInfoAsync() {
-    if(!THE_DX_INIT_EVENT.check()) {
-        return; // already called
-    }
-
-    // start and detach thread
-    THE_DX_INIT_EVENT.reset();
-    StThread aTestThread(getInfoThreadFunction, NULL);
 }
 
 bool StDXManager::getInfo(StDXInfo&  theInfo,
                           const bool theForced) {
     if(!theForced) {
-        THE_DX_INIT_EVENT.wait();
         if(ST_DX_HAS_CACHED_INFO) {
             theInfo = ST_DX_CACHED_INFO;
             return true;

sview-16_06.tar.gz/StOutPageFlip/StDXManager.h -> sview-17_04.tar.gz/StOutPageFlip/StDXManager.h Changed

@@ -30,11 +30,6 @@
 
         public:
 
-    /**
-     * Launch test in other thread.
-     */
-    static void initInfoAsync();
-
     static bool getInfo(StDXInfo&  theInfo,
                         const bool theForced = false);
 
@@ -58,13 +53,6 @@
     virtual ~StDXManager();
 
     /**
-     * @return true if IDirect3DDevice9Ex device has been created
-     */
-    bool isD3dEx() const {
-        return myIsD3dEx;
-    }
-
-    /**
      * Access Direct3D device instance.
      */
     IDirect3DDevice9* getDevice() const {
@@ -149,12 +137,11 @@
 
         protected:
 
-    IDirect3D9*           myD3dLib;      //!< Direct3D library instance
+    IDirect3D9Ex*         myD3dLib;      //!< Direct3D library instance
     IDirect3DDevice9*     myD3dDevice;   //!< Direct3D device object
     D3DPRESENT_PARAMETERS myD3dParams;   //!< parameters for created Direct3D device
     D3DDISPLAYMODE        myCurrMode;    //!< temporary variable
     UINT                  myRefreshRate;
-    bool                  myIsD3dEx;
     bool                  myWithAqbs;    //!< indicates that device was created with AQBS flags
 
 };

sview-16_06.tar.gz/StOutPageFlip/StDXNVSurface.cpp -> sview-17_04.tar.gz/StOutPageFlip/StDXNVSurface.cpp Changed

@@ -61,14 +61,11 @@
     // those sizes only used for mono (stereo driver off / windowed;
     // otherwise NVIDIA driver will ignore them and will use header in surface itself)
     // we should used downsized values to prevent render fail
-    if(StSys::isVistaPlus()) {
-        // only one view shown if we set width/2 here as for WinXP way
-        mySrcRect.left = 0; mySrcRect.right = (LONG )theSizeX * 2;
-    } else {
-        // picture showed with wrong ratio (width/4) in other (like Vista+) way
-        mySrcRect.left = 0; mySrcRect.right = (LONG )theSizeX;
-    }
-    mySrcRect.top = 0; mySrcRect.bottom = (LONG )theSizeY;
+
+    // only one view shown if we set width/2 here as for WinXP way
+    //mySrcRect.left = 0; mySrcRect.right = (LONG )theSizeX; // WinXP
+    mySrcRect.left = 0; mySrcRect.right  = (LONG )theSizeX * 2;
+    mySrcRect.top  = 0; mySrcRect.bottom = (LONG )theSizeY;
 }
 
 StDXNVSurface::~StDXNVSurface() {
@@ -111,14 +108,14 @@
     if(theHasWglDx) {
         if(theD3d.getDevice()->CreateTexture((UINT )mySizeX, (UINT )mySizeY, 0, 0,
                                              aFormat, D3DPOOL_DEFAULT,
-                                             &myTextureL, theD3d.isD3dEx() ? &myTextureLShare : NULL) != D3D_OK
+                                             &myTextureL, &myTextureLShare) != D3D_OK
         || myTextureL->GetSurfaceLevel(0, &mySurfaceL) != D3D_OK) {
             release();
             return false;
         }
         if(theD3d.getDevice()->CreateTexture((UINT )mySizeX, (UINT )mySizeY, 0, 0,
                                              aFormat, D3DPOOL_DEFAULT,
-                                             &myTextureR, theD3d.isD3dEx() ? &myTextureRShare : NULL) != D3D_OK
+                                             &myTextureR, &myTextureRShare) != D3D_OK
         || myTextureR->GetSurfaceLevel(0, &mySurfaceR) != D3D_OK) {
             release();
             return false;

sview-16_06.tar.gz/StOutPageFlip/StOutPageFlip.cpp -> sview-17_04.tar.gz/StOutPageFlip/StOutPageFlip.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -17,11 +17,13 @@
 #include <StGL/StGLEnums.h>
 #include <StGL/StGLContext.h>
 #include <StGL/StGLArbFbo.h>
+#include <StGLMesh/StGLTextureQuad.h>
 #include <StGLCore/StGLCore20.h>
 #include <StGLStereo/StGLStereoFrameBuffer.h>
 #include <StCore/StSearchMonitors.h>
 #include <StSettings/StSettings.h>
 #include <StSettings/StTranslations.h>
+#include <StThreads/StCondition.h>
 #include <StAV/StAVImage.h>
 #include <StSys/StSys.h>
 #include <stAssert.h>
@@ -407,10 +409,34 @@
     theList.add(params.ToShowExtra);
 }
 
+namespace {
+#if !defined(__APPLE__)
+    static StCondition   THE_QB_INIT_EVENT(true);
+    static volatile bool IS_QB_SUPPORTED = false;
+    static StHandle<StThread> THE_QB_THREAD;
+
+    SV_THREAD_FUNCTION testQBThreadFunction(void* ) {
+        IS_QB_SUPPORTED = StQuadBufferCheck::testQuadBufferSupport();
+    #ifdef _WIN32
+        StDXInfo anInfo;
+        StDXManager::getInfo(anInfo, true);
+    #endif
+        THE_QB_INIT_EVENT.set();
+        return SV_THREAD_RETURN 0;
+    }
+#endif
+}
+
+
 void StOutPageFlip::initGlobalsAsync() {
-    StQuadBufferCheck::initAsync();
-#ifdef _WIN32
-    StDXManager::initInfoAsync();
+#if !defined(__APPLE__)
+    if(!THE_QB_INIT_EVENT.check()) {
+        return; // already called
+    }
+
+    // start and detach thread
+    THE_QB_INIT_EVENT.reset();
+    THE_QB_THREAD = new StThread(testQBThreadFunction, NULL);
 #endif
 }
 
@@ -458,7 +484,7 @@
     StString& aDescr     = myLangMap.changeValueId(STTR_PLUGIN_DESCRIPTION,
         "(C) {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0");
     myAbout = aTitle + '\n' + aVerString + " " + StVersionInfo::getSDKVersionString() + "\n \n"
-            + aDescr.format("2007-2016", "kirill@sview.ru", "www.sview.ru");
+            + aDescr.format("2007-2017", "kirill@sview.ru", "www.sview.ru");
 }
 
 StOutPageFlip::StOutPageFlip(const StHandle<StResourceManager>& theResMgr,
@@ -468,9 +494,6 @@
   myLangMap(theResMgr, ST_OUT_PLUGIN_NAME),
   myDevice(DEVICE_AUTO),
   myToDrawStereo(false),
-#ifdef _WIN32
-  myIsVistaPlus(StSys::isVistaPlus()),
-#endif
   myToResetDevice(false) {
     StWindow::signals.onAnotherMonitor = stSlot(this, &StOutPageFlip::doNewMonitor);
     const StSearchMonitors& aMonitors = StWindow::getMonitors();
@@ -484,14 +507,19 @@
     if(aMon.getFreqMax() >= 110) {
         aSupportLevelShutters = ST_DEVICE_SUPPORT_HIGHT;
     }
-#ifndef __APPLE__
-    // actually almost always available on mac but... is it useful?
-    hasQuadBufferGl = StQuadBufferCheck::isSupported();
-#endif
 
-#ifdef _WIN32
-    hasQuadBufferD3D = StDXManager::getInfo(myDxInfo) // && !hasQuadBufferGl
-                    && (myDxInfo.hasNvStereoSupport || myDxInfo.hasAqbsSupport);
+#if !defined(__APPLE__)
+    // actually almost always available on mac but... is it useful?
+    if(THE_QB_INIT_EVENT.wait(5000)) {
+        THE_QB_THREAD.nullify();
+        hasQuadBufferGl = IS_QB_SUPPORTED;
+    #if defined(_WIN32)
+        hasQuadBufferD3D = StDXManager::getInfo(myDxInfo) // && !hasQuadBufferGl
+                        && (myDxInfo.hasNvStereoSupport || myDxInfo.hasAqbsSupport);
+    #endif
+    } else {
+        stError("OpenGL driver was not responded in a reasonable time");
+    }
 #endif
     if(hasQuadBufferGl || hasQuadBufferD3D) {
         aSupportLevelShutters = ST_DEVICE_SUPPORT_FULL;
@@ -870,7 +898,7 @@
         aDataSize = aWarnRes->getSize();
     }
     if(anImage.load(!aWarnRes.isNull() ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
-        myWarning = new StGLTexture(GL_RGBA8);
+        myWarning = new StGLTextureQuad();
         if(!myWarning->init(*myContext, anImage.getPlane())) {
             ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture can not be initialized!");
             myWarning->release(*myContext);
@@ -976,55 +1004,11 @@
 #endif
 }
 
-void StOutPageFlip::stglDrawWarning() {
-    if(myWarning.isNull()) {
-        return;
-    }
-
-#if !defined(GL_ES_VERSION_2_0)
-    myContext->core20fwd->glDisable(GL_DEPTH_TEST);
-    myContext->core20fwd->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    myContext->core20fwd->glEnable(GL_BLEND);
-    myContext->core11->glEnable(GL_TEXTURE_2D);
-
-    myWarning->bind(*myContext);
-
-    const StGLBoxPx aVPort = StWindow::stglViewport(ST_WIN_MASTER);
-    const int aWinSizeX = aVPort.width();
-    const int aWinSizeY = aVPort.height();
-    const GLfloat aWidth  = (aWinSizeX > 0) ?        GLfloat(myWarning->getSizeX()) / GLfloat(aWinSizeX) : 1.0f;
-    const GLfloat aBottom = (aWinSizeY > 0) ? 100.0f / GLfloat(aWinSizeY) : 0.0f;
-    const GLfloat aHeight = (aWinSizeY > 0) ? 2.0f * GLfloat(myWarning->getSizeY()) / GLfloat(aWinSizeY) : 1.0f;
-
-    const GLfloat aVerts[] = {
-         aWidth, -1.0f + aBottom + aHeight,
-         aWidth, -1.0f + aBottom,
-        -aWidth, -1.0f + aBottom + aHeight,
-        -aWidth, -1.0f + aBottom,
-    };
-
-    const GLfloat aTCrds[] = {
-        1.0f, 0.0f, // top-right
-        1.0f, 1.0f, // bottom-right
-        0.0f, 0.0f, // top-left
-        0.0f, 1.0f  // bottom-left
-    };
-
-    myContext->core11->glLoadIdentity();
-
-    myContext->core11->glEnableClientState(GL_VERTEX_ARRAY);
-    myContext->core11->glVertexPointer(2, GL_FLOAT, 0, aVerts);
-    myContext->core11->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    myContext->core11->glTexCoordPointer(2, GL_FLOAT, 0, aTCrds);
-
-    myContext->core11fwd->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-    myContext->core11->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    myContext->core11->glDisableClientState(GL_VERTEX_ARRAY);
-
-    myWarning->unbind(*myContext);
-    myContext->core11->glDisable(GL_TEXTURE_2D);
-    myContext->core20fwd->glDisable(GL_BLEND);
+bool StOutPageFlip::isStereoFullscreenOnly() const {
+#ifdef _WIN32
+    return params.QuadBuffer->getValue() == QUADBUFFER_HARD_D3D_ANY;
+#else
+    return false;
 #endif
 }
 
@@ -1106,7 +1090,9 @@
             #endif
                 StWindow::signals.onRedraw(ST_DRAW_RIGHT);
                 StWindow::signals.onRedraw(ST_DRAW_LEFT);
-                stglDrawWarning();
+                if(!myWarning.isNull()) {
+                    myWarning->stglDraw(*myContext);
+                }
             } else {
             #if !defined(GL_ES_VERSION_2_0)
                 myContext->core20fwd->glDrawBuffer(GL_BACK_LEFT);
@@ -1229,7 +1215,9 @@
                 StWindow::signals.onRedraw(ST_DRAW_RIGHT); // reverse order to avoid non-smooth mono->stereo transition
                 StWindow::signals.onRedraw(ST_DRAW_LEFT);
 
-                stglDrawWarning();
+                if(!myWarning.isNull()) {
+                    myWarning->stglDraw(*myContext);
+                }
 
                 myFPSControl.sleepToTarget();
                 StWindow::stglSwap(ST_WIN_MASTER);

sview-16_06.tar.gz/StOutPageFlip/StOutPageFlip.h -> sview-17_04.tar.gz/StOutPageFlip/StOutPageFlip.h Changed

@@ -1,6 +1,6 @@
 /**
  * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
- * Copyright © 2007-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -24,6 +24,7 @@
 class StWindow;
 class StVuzixSDK;
 class StGLFrameBuffer;
+class StGLTextureQuad;
 class StDXNVWindow;
 
 /**
@@ -130,6 +131,11 @@
      */
     ST_LOCAL virtual void doChangeLanguage() ST_ATTR_OVERRIDE;
 
+    /**
+     * Return true if 3D output requires fullscreen mode.
+     */
+    ST_CPPEXPORT virtual bool isStereoFullscreenOnly() const ST_ATTR_OVERRIDE;
+
         protected:
 
     ST_LOCAL void setupDevice();
@@ -175,7 +181,6 @@
      */
     ST_LOCAL void doSwitchVSync(const int32_t theValue);
 
-    ST_LOCAL         void stglDrawWarning();
     ST_LOCAL virtual void stglDrawExtra(unsigned int theView, int theMode);
 
         protected:
@@ -210,15 +215,12 @@
     StString              myAbout;      //!< about string
     StHandle<StGLContext> myContext;
     StHandle<StVuzixSDK>  myVuzixSDK;   //!< Vuzix HMD control
-    StHandle<StGLTexture> myWarning;
+    StHandle<StGLTextureQuad> myWarning;
     StTranslations        myLangMap;
     DeviceEnum            myDevice;
     StDXInfo              myDxInfo;
     StFPSControl          myFPSControl;
     bool                  myToDrawStereo;
-#ifdef _WIN32
-    bool                  myIsVistaPlus;
-#endif
     bool                  myToResetDevice;
 
     class StGLDXFrameBuffer;

sview-16_06.tar.gz/StOutPageFlip/StOutPageFlip.rc -> sview-17_04.tar.gz/StOutPageFlip/StOutPageFlip.rc Changed

sview-16_06.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp -> sview-17_04.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp Changed

@@ -121,14 +121,8 @@
 
     // request slave
     if(params.ControlCode->getValue() != DEVICE_CONTROL_NONE) {
-#ifdef _WIN32
-    if(myIsVistaPlus) {
-#endif
         StWindow::setAttribute(StWinAttr_SlaveCfg, StWinSlave_slaveHLineTop);
         StWindow::hide(ST_WIN_SLAVE);
-#ifdef _WIN32
-    }
-#endif
     }
     if(!StOutPageFlip::create()) {
         return false;
@@ -160,11 +154,7 @@
             return;
         }
 
-        if(!StWindow::isFullScreen()
-    #ifdef _WIN32
-        && myIsVistaPlus
-    #endif
-        ) {
+        if(!StWindow::isFullScreen()) {
             const StSearchMonitors& aMonitors = StWindow::getMonitors();
             if(myMonitor.isNull()) {
                 myMonitor = new StMonitor(aMonitors[aRect.center()]);
@@ -195,11 +185,7 @@
         return;
     }
 
-    const bool toDrawWindowed = !StWindow::isFullScreen()
-#ifdef _WIN32
-        && myIsVistaPlus
-#endif
-    ;
+    const bool toDrawWindowed = !StWindow::isFullScreen();
     if(!toDrawWindowed) {
         StWindow::hide(ST_WIN_SLAVE);
     }

sview-16_06.tar.gz/StOutPageFlip/StQuadBufferCheck.cpp -> sview-17_04.tar.gz/StOutPageFlip/StQuadBufferCheck.cpp Changed

@@ -1,6 +1,6 @@
 /**
  * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
- * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -10,7 +10,6 @@
 #include "StQuadBufferCheck.h"
 
 #include <StStrings/StLogger.h>
-#include <StThreads/StCondition.h>
 #include <StThreads/StThread.h>
 
 #ifdef _WIN32
@@ -55,7 +54,7 @@
     HWND aWindow = CreateWindowExW(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE,
                                    QUAD_TEST_CLASS.toCString(),
                                    L"GL Quad Buffer test",
-                                   WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                                   WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_DISABLED,
                                    32, 32, 32, 32,
                                    NULL, NULL, anAppInst, NULL);
     if(aWindow == NULL) {
@@ -116,31 +115,3 @@
 }
 
 #endif // !__APPLE__
-
-namespace {
-
-    static StCondition   THE_QB_INIT_EVENT(true);
-    static volatile bool IS_QB_SUPPORTED = false;
-
-    SV_THREAD_FUNCTION testQBThreadFunction(void* ) {
-        IS_QB_SUPPORTED = StQuadBufferCheck::testQuadBufferSupport();
-        THE_QB_INIT_EVENT.set();
-        return SV_THREAD_RETURN 0;
-    }
-
-};
-
-bool StQuadBufferCheck::isSupported() {
-    THE_QB_INIT_EVENT.wait();
-    return IS_QB_SUPPORTED;
-}
-
-void StQuadBufferCheck::initAsync() {
-    if(!THE_QB_INIT_EVENT.check()) {
-        return; // already called
-    }
-
-    // start and detach thread
-    THE_QB_INIT_EVENT.reset();
-    StThread aTestThread(testQBThreadFunction, NULL);
-}

sview-16_06.tar.gz/StOutPageFlip/StQuadBufferCheck.h -> sview-17_04.tar.gz/StOutPageFlip/StQuadBufferCheck.h Changed

sview-16_06.tar.gz/StShared/StAVImage.cpp -> sview-17_04.tar.gz/StShared/StAVImage.cpp Changed

@@ -129,6 +129,11 @@
                           StImage& theImageTo,   AVPixelFormat theFormatTo) {
     ST_DEBUG_LOG("StAVImage, convert from " + stAV::PIX_FMT::getString(theFormatFrom) + " " + theImageFrom.getSizeX() + "x" + theImageFrom.getSizeY()
                + " to " + stAV::PIX_FMT::getString(theFormatTo) + " " + theImageTo.getSizeX() + "x" + theImageTo.getSizeY());
+    if(theFormatFrom == stAV::PIX_FMT::NONE
+    || theFormatTo   == stAV::PIX_FMT::NONE) {
+        return false;
+    }
+
     SwsContext* aCtxToRgb = sws_getContext((int )theImageFrom.getSizeX(), (int )theImageFrom.getSizeY(), theFormatFrom, // source
                                            (int )theImageTo.getSizeX(),   (int )theImageTo.getSizeY(),   theFormatTo,   // destination
                                            SWS_BICUBIC, NULL, NULL, NULL);
@@ -197,13 +202,6 @@
     }
 }
 
-bool StAVImage::load(const StString& theFilePath,
-                     ImageType       theImageType,
-                     uint8_t*        theDataPtr,
-                     int             theDataSize) {
-    return loadExtra(theFilePath, theImageType, theDataPtr, theDataSize, false);
-}
-
 bool StAVImage::loadExtra(const StString& theFilePath,
                           ImageType       theImageType,
                           uint8_t*        theDataPtr,
@@ -544,6 +542,11 @@
     }
 
     AVPixelFormat aPFormatAV = (AVPixelFormat )getAVPixelFormat(*this);
+    if(aPFormatAV == stAV::PIX_FMT::NONE) {
+        setState("Specific pixel format convertion is not supported");
+        return false;
+    }
+
     StImage anImage;
     switch(theImageType) {
         case ST_TYPE_PNG:
@@ -580,6 +583,8 @@
             myCodecCtx->pix_fmt = aPFormatAV;
             myCodecCtx->width   = (int )anImage.getSizeX();
             myCodecCtx->height  = (int )anImage.getSizeY();
+            myCodecCtx->time_base.num = 1;
+            myCodecCtx->time_base.den = 1;
             myCodecCtx->compression_level = 9; // 0..9
             break;
         }

sview-16_06.tar.gz/StShared/StDevILImage.cpp -> sview-17_04.tar.gz/StShared/StDevILImage.cpp Changed

sview-16_06.tar.gz/StShared/StFreeImage.cpp -> sview-17_04.tar.gz/StShared/StFreeImage.cpp Changed

sview-16_06.tar.gz/StShared/StGLContext.cpp -> sview-17_04.tar.gz/StShared/StGLContext.cpp Changed

@@ -145,41 +145,39 @@
     //
 }
 
-#if !defined(GL_ES_VERSION_2_0)
 static void APIENTRY debugCallbackWrap(unsigned int theSource,
                                        unsigned int theType,
                                        unsigned int theId,
                                        unsigned int theSeverity,
-                                       int                 theLength,
-                                       const char*   theMessage,
-                                       const void*   theUserParam) {
+                                       int          theLength,
+                                       const char*  theMessage,
+                                       const void*  theUserParam) {
     ((StGLContext* )theUserParam)->stglDebugCallback(theSource, theType, theId, theSeverity, theLength, theMessage);
 }
-#endif
 
 static const StCString THE_DBGMSG_SOURCE_UNKNOWN = stCString("UNKNOWN");
 static const StCString THE_DBGMSG_SOURCES[] = {
-    stCString("OpenGL"),          // GL_DEBUG_SOURCE_API_ARB
-    stCString("Window System"),   // GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB
-    stCString("Shader Compiler"), // GL_DEBUG_SOURCE_SHADER_COMPILER_ARB
-    stCString("Third Party"),     // GL_DEBUG_SOURCE_THIRD_PARTY_ARB
-    stCString("Application"),     // GL_DEBUG_SOURCE_APPLICATION_ARB
-    stCString("Other"),           // GL_DEBUG_SOURCE_OTHER_ARB
+    stCString("OpenGL"),          // GL_DEBUG_SOURCE_API
+    stCString("Window System"),   // GL_DEBUG_SOURCE_WINDOW_SYSTEM
+    stCString("Shader Compiler"), // GL_DEBUG_SOURCE_SHADER_COMPILER
+    stCString("Third Party"),     // GL_DEBUG_SOURCE_THIRD_PARTY
+    stCString("Application"),     // GL_DEBUG_SOURCE_APPLICATION
+    stCString("Other"),           // GL_DEBUG_SOURCE_OTHER
 };
 
 static const StCString THE_DBGMSG_TYPE_UNKNOWN = stCString("UNKNOWN");
 static const StCString THE_DBGMSG_TYPES[] = {
-    stCString("Error"),              // GL_DEBUG_TYPE_ERROR_ARB
-    stCString("Deprecated"),         // GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB
-    stCString("Undefined behavior"), // GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB
-    stCString("Portability"),        // GL_DEBUG_TYPE_PORTABILITY_ARB
-    stCString("Performance"),        // GL_DEBUG_TYPE_PERFORMANCE_ARB
-    stCString("Other"),              // GL_DEBUG_TYPE_OTHER_ARB
+    stCString("Error"),              // GL_DEBUG_TYPE_ERROR
+    stCString("Deprecated"),         // GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR
+    stCString("Undefined behavior"), // GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR
+    stCString("Portability"),        // GL_DEBUG_TYPE_PORTABILITY
+    stCString("Performance"),        // GL_DEBUG_TYPE_PERFORMANCE
+    stCString("Other"),              // GL_DEBUG_TYPE_OTHER
 };
 
-static const StCString THE_DBGMSG_SEV_HIGH   = stCString("High");   // GL_DEBUG_SEVERITY_HIGH_ARB
-static const StCString THE_DBGMSG_SEV_MEDIUM = stCString("Medium"); // GL_DEBUG_SEVERITY_MEDIUM_ARB
-static const StCString THE_DBGMSG_SEV_LOW    = stCString("Low");    // GL_DEBUG_SEVERITY_LOW_ARB
+static const StCString THE_DBGMSG_SEV_HIGH   = stCString("High");   // GL_DEBUG_SEVERITY_HIGH
+static const StCString THE_DBGMSG_SEV_MEDIUM = stCString("Medium"); // GL_DEBUG_SEVERITY_MEDIUM
+static const StCString THE_DBGMSG_SEV_LOW    = stCString("Low");    // GL_DEBUG_SEVERITY_LOW
 
 void StGLContext::stglDebugCallback(unsigned int theSource,
                                     unsigned int theType,
@@ -187,46 +185,36 @@
                                     unsigned int theSeverity,
                                     int          /*theLength*/,
                                     const char*  theMessage) {
-  if(myGlVendor == GlVendor_NVIDIA) {
-      // filter too verbose messages
-      if(theId == 131185) {
-          return;
-      }
-  }
-
-#ifdef GL_DEBUG_SOURCE_API_ARB
-    const StCString& aSrc = (theSource >= GL_DEBUG_SOURCE_API_ARB
-                          && theSource <= GL_DEBUG_SOURCE_OTHER_ARB)
-                          ? THE_DBGMSG_SOURCES[theSource - GL_DEBUG_SOURCE_API_ARB]
+    if(myGlVendor == GlVendor_NVIDIA) {
+        // filter too verbose messages
+        if(theId == 131185) {
+            return;
+        }
+    }
+
+    const StCString& aSrc = (theSource >= GL_DEBUG_SOURCE_API
+                          && theSource <= GL_DEBUG_SOURCE_OTHER)
+                          ? THE_DBGMSG_SOURCES[theSource - GL_DEBUG_SOURCE_API]
                           : THE_DBGMSG_SOURCE_UNKNOWN;
-    const StCString& aType = (theType >= GL_DEBUG_TYPE_ERROR_ARB
-                           && theType <= GL_DEBUG_TYPE_OTHER_ARB)
-                           ? THE_DBGMSG_TYPES[theType - GL_DEBUG_TYPE_ERROR_ARB]
+    const StCString& aType = (theType >= GL_DEBUG_TYPE_ERROR
+                           && theType <= GL_DEBUG_TYPE_OTHER)
+                           ? THE_DBGMSG_TYPES[theType - GL_DEBUG_TYPE_ERROR]
                            : THE_DBGMSG_TYPE_UNKNOWN;
-    const StCString& aSev = theSeverity == GL_DEBUG_SEVERITY_HIGH_ARB
+    const StCString& aSev = theSeverity == GL_DEBUG_SEVERITY_HIGH
                           ? THE_DBGMSG_SEV_HIGH
-                          : (theSeverity == GL_DEBUG_SEVERITY_MEDIUM_ARB
+                          : (theSeverity == GL_DEBUG_SEVERITY_MEDIUM
                            ? THE_DBGMSG_SEV_MEDIUM
                            : THE_DBGMSG_SEV_LOW);
     StString aMsg = StString("Source:")   + aSrc
-                + StString(" | Type:")     + aType
-                + StString(" | ID:")       + theId
-                + StString(" | Severity:") + aSev
-                + StString(" | Message:\n  ") + theMessage + "\n";
+               + StString(" | Type:")     + aType
+               + StString(" | ID:")       + theId
+               + StString(" | Severity:") + aSev
+               + StString(" | Message:\n  ") + theMessage + "\n";
     StLogger::GetDefault().write(aMsg,
-        theType == GL_DEBUG_TYPE_ERROR_ARB ? StLogger::ST_ERROR : StLogger::ST_WARNING);
+        theType == GL_DEBUG_TYPE_ERROR ? StLogger::ST_ERROR : StLogger::ST_WARNING);
     //if(!myMsgQueue.isNull()) {
-    //    theType == GL_DEBUG_TYPE_ERROR_ARB ? myMsgQueue->pushError(aMsg) : myMsgQueue->pushInfo (aMsg);
+    //    theType == GL_DEBUG_TYPE_ERROR ? myMsgQueue->pushError(aMsg) : myMsgQueue->pushInfo (aMsg);
     //}
-#else
-    // need GL_KHR_debug
-    StString aMsg = StString("Source:")         + theSource
-                  + StString(" | Type:")        + theType
-                  + StString(" | ID:")          + theId
-                  + StString(" | Severity:")    + theSeverity
-                  + StString(" | Message:\n  ") + theMessage + "\n";
-    StLogger::GetDefault().write(aMsg, StLogger::ST_WARNING);
-#endif
 }
 
 void StGLContext::setMessagesQueue(const StHandle<StMsgQueue>& theQueue) {
@@ -314,9 +302,17 @@
 }
 
 void StGLContext::stglResetErrors() {
-    GLenum anErr = glGetError();
-    for(int aLimit = 1000; (anErr != GL_NO_ERROR) && (aLimit > 0); --aLimit, anErr = glGetError()) {
+    GLenum aPrevErr = GL_NO_ERROR;
+    for(GLenum anErr = glGetError(); anErr != GL_NO_ERROR; anErr = glGetError()) {
+        if(anErr == aPrevErr) {
+            if(aPrevErr != GL_NO_ERROR) {
+                ST_DEBUG_LOG("GL error cannot be released - broken GL context?");
+            }
+            return;
+        }
+
         ST_DEBUG_LOG("Unhandled GL error (" + stglErrorToString(anErr) + ")");
+        aPrevErr = anErr;
     }
 }
 
@@ -522,6 +518,20 @@
         theMap.add(StDictEntry("Free GPU memory",
                    StString() + (aDedicatedFree / 1024)  + " MiB (from " + (aDedicated / 1024) + " MiB)"));
     }
+#if defined(_WIN32)
+    else if(myFuncs->wglGetGPUInfoAMD != NULL
+         && myFuncs->wglGetContextGPUIDAMD != NULL) {
+        GLuint aVMemMiB = 0;
+        HGLRC aGlRc = wglGetCurrentContext();
+        if(aGlRc != NULL) {
+            UINT anAmdId = myFuncs->wglGetContextGPUIDAMD(aGlRc);
+            if(anAmdId != 0
+            && myFuncs->wglGetGPUInfoAMD(anAmdId, WGL_GPU_RAM_AMD, GL_UNSIGNED_INT, sizeof(aVMemMiB), &aVMemMiB) > 0) {
+                theMap.add(StDictEntry("GPU memory", StString() + aVMemMiB  + " MiB"));
+            }
+        }
+    }
+#endif
 #endif
 
 #if !defined(GL_ES_VERSION_2_0) && !defined(__APPLE__) && !defined(_WIN32)
@@ -710,6 +720,11 @@
             STGL_READ_FUNC(wglDXLockObjectsNV);
             STGL_READ_FUNC(wglDXUnlockObjectsNV);
         }
+        if(stglCheckExtension(aWglExts, "WGL_AMD_gpu_association")) {
+            STGL_READ_FUNC(wglGetGPUIDsAMD);
+            STGL_READ_FUNC(wglGetGPUInfoAMD);
+            STGL_READ_FUNC(wglGetContextGPUIDAMD);
+        }
     }
 #elif defined(__APPLE__)
     //
@@ -759,6 +774,29 @@
         hasHighp = true;
     }
 
+#if defined(ST_DEBUG_GL)
+    // this extension is buggy on OpenGL ES - enable it only for debug builds
+    if(stglCheckExtension("GL_KHR_debug")) {
+        // According to GL_KHR_debug spec, all functions should have KHR suffix.
+        // However, some implementations can export these functions without suffix.
+        stglFindProc("glDebugMessageControlKHR",  myFuncs->glDebugMessageControl);
+        stglFindProc("glDebugMessageInsertKHR",   myFuncs->glDebugMessageInsert);
+        stglFindProc("glDebugMessageCallbackKHR", myFuncs->glDebugMessageCallback);
+        stglFindProc("glGetDebugMessageLogKHR",   myFuncs->glGetDebugMessageLog);
+        if(myFuncs->glDebugMessageCallback != NULL) {
+            // setup default callback
+            myFuncs->glDebugMessageCallback(debugCallbackWrap, this);
+            core11fwd->glEnable(GL_DEBUG_OUTPUT);
+            // note that some broken implementations (e.g. simulators) might generate error message on this call
+            core11fwd->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+        } else {
+            pushError(stCString("GL_KHR_debug is broken!"));
+        }
+    }
+#else
+    (void )debugCallbackWrap;
+#endif
+
     //ST_DEBUG_LOG("glGetString(GL_EXTENSIONS)=\n" + (const char* )glGetString(GL_EXTENSIONS));
 #else
     hasTexRGBA8 = true;
@@ -766,20 +804,6 @@
     arbNPTW     = stglCheckExtension("GL_ARB_texture_non_power_of_two");
     arbTexRG    = stglCheckExtension("GL_ARB_texture_rg");
 
-    if(stglCheckExtension("GL_ARB_debug_output")) {
-        STGL_READ_FUNC(glDebugMessageControlARB);
-        STGL_READ_FUNC(glDebugMessageInsertARB);
-        STGL_READ_FUNC(glDebugMessageCallbackARB);
-        STGL_READ_FUNC(glGetDebugMessageLogARB);
-        if(myFuncs->glDebugMessageCallbackARB != NULL) {
-            // setup default callback
-            myFuncs->glDebugMessageCallbackARB(debugCallbackWrap, this);
-        #if defined(ST_DEBUG) || defined(ST_DEBUG_GL)
-            core11fwd->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
-        #endif
-        }
-    }
-
     // load OpenGL 1.2 new functions
     has12 = isGlGreaterEqual(1, 2)
          && STGL_READ_FUNC(glBlendColor)
@@ -1504,6 +1528,25 @@
          && STGL_READ_FUNC(glBindImageTextures)
          && STGL_READ_FUNC(glBindVertexBuffers);
 
+    if(stglCheckExtension("GL_ARB_debug_output")) {
+        if(!has43) {
+            stglFindProc("glDebugMessageControlARB",  myFuncs->glDebugMessageControl);
+            stglFindProc("glDebugMessageInsertARB",   myFuncs->glDebugMessageInsert);
+            stglFindProc("glDebugMessageCallbackARB", myFuncs->glDebugMessageCallback);
+            stglFindProc("glGetDebugMessageLogARB",   myFuncs->glGetDebugMessageLog);
+        }
+        if(myFuncs->glDebugMessageCallback != NULL) {
+            // setup default callback
+            myFuncs->glDebugMessageCallback(debugCallbackWrap, this);
+        #if defined(ST_DEBUG) || defined(ST_DEBUG_GL)
+            if(has43) {
+                core11fwd->glEnable(GL_DEBUG_OUTPUT);
+            }
+            core11fwd->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+        #endif
+        }
+    }
+
 #endif // OpenGL desktop or ES
 
     const StString aGlVendor((const char* )core11fwd->glGetString(GL_VENDOR));
@@ -1513,6 +1556,10 @@
         myGlVendor = GlVendor_AMD;
     } else if(aGlVendor.isContains(stCString("Intel"))) {
         myGlVendor = GlVendor_Intel;
+    } else if(aGlVendor.isContains(stCString("Qualcomm"))) {
+        myGlVendor = GlVendor_Qualcomm;
+    } else if(aGlVendor.isContains(stCString("Imagination Technologies"))) {
+        myGlVendor = GlVendor_ImaginationTechnologies;
     }
 
     const StString aGlRenderer((const char* )core11fwd->glGetString(GL_RENDERER));
@@ -1525,6 +1572,10 @@
         myGpuName = GPU_RADEON;
     } else if(aGlRenderer.isContains(stCString("FireGL"))) {
         myGpuName = GPU_FIREGL;
+    } else if(aGlRenderer.isContains(stCString("Adreno"))) {
+        myGpuName = GPU_Adreno;
+    } else if(aGlRenderer.isContains(stCString("PowerVR"))) {
+        myGpuName = GPU_PowerVR;
     } else {
         myGpuName = GPU_UNKNOWN;
     }

sview-16_06.tar.gz/StShared/StGLProjCamera.cpp -> sview-17_04.tar.gz/StShared/StGLProjCamera.cpp Changed

sview-16_06.tar.gz/StShared/StGLTextFormatter.cpp -> sview-17_04.tar.gz/StShared/StGLTextFormatter.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2012-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2012-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -13,7 +13,7 @@
 /**
  * Auxiliary function to translate rectangles by the vector.
  */
-inline void move(StArray<StGLTile>& theRects,
+inline void move(std::vector<StGLTile>& theRects,
                  const StGLVec2&    theMoveVec,
                  size_t             theCharFrom,
                  const size_t       theCharTo) {
@@ -26,7 +26,7 @@
 /**
  * Auxiliary function to translate rectangles in horizontal direction.
  */
-inline void moveX(StArray<StGLTile>& theRects,
+inline void moveX(std::vector<StGLTile>& theRects,
                   const GLfloat      theMoveVec,
                   size_t             theCharFrom,
                   const size_t       theCharTo) {
@@ -39,7 +39,7 @@
 /**
  * Auxiliary function to translate rectangles in vertical direction.
  */
-inline void moveY(StArray<StGLTile>& theRects,
+inline void moveY(std::vector<StGLTile>& theRects,
                   const GLfloat      theMoveVec,
                   size_t             theCharFrom,
                   const size_t       theCharTo) {
@@ -97,13 +97,42 @@
     return theVec;
 }
 
-void StGLTextFormatter::getResult(StArrayList<GLuint>&                               theTextures,
-                                  StArrayList< StHandle <StArrayList <StGLVec2> > >& theVertsPerTexture,
-                                  StArrayList< StHandle <StArrayList <StGLVec2> > >& theTCrdsPerTexture) const {
+void StGLTextFormatter::getResult(std::vector<GLuint>&                               theTextures,
+                                  std::vector< StHandle <std::vector <StGLVec2> > >& theVertsPerTexture,
+                                  std::vector< StHandle <std::vector <StGLVec2> > >& theTCrdsPerTexture) const {
     StGLVec2 aVec(0.0f, 0.0f);
     theTextures.clear();
     theVertsPerTexture.clear();
     theTCrdsPerTexture.clear();
+
+    std::vector<size_t> aNbRectPerTexture;
+    for(size_t aRectIter = 0; aRectIter < myRectsNb; ++aRectIter) {
+        const GLuint aTexture = myRects[aRectIter].texture;
+
+        size_t aListId = 0;
+        for(aListId = 0; aListId < theTextures.size(); ++aListId) {
+            if(theTextures[aListId] == aTexture) {
+                break;
+            }
+        }
+        if(aListId >= theTextures.size()) {
+            theTextures.push_back(aTexture);
+            theVertsPerTexture.push_back(new std::vector<StGLVec2>());
+            theTCrdsPerTexture.push_back(new std::vector<StGLVec2>());
+            aNbRectPerTexture.push_back(0);
+        }
+
+        ++aNbRectPerTexture[aListId];
+    }
+
+    for(size_t aTexIter = 0; aTexIter < theTextures.size(); ++aTexIter) {
+        const size_t aNbTexTris = aNbRectPerTexture[aTexIter] * 6;
+        std::vector<StGLVec2>& aVerts = *theVertsPerTexture[aTexIter];
+        std::vector<StGLVec2>& aTCrds = *theTCrdsPerTexture[aTexIter];
+        aVerts.reserve(aNbTexTris);
+        aTCrds.reserve(aNbTexTris);
+    }
+
     for(size_t aRectIter = 0; aRectIter < myRectsNb; ++aRectIter) {
         const StGLRect& aRect    = myRects[aRectIter].px;
         const StGLRect& aRectUV  = myRects[aRectIter].uv;
@@ -115,39 +144,34 @@
                 break;
             }
         }
-        if(aListId >= theTextures.size()) {
-            theTextures.add(aTexture);
-            theVertsPerTexture.add(new StArrayList<StGLVec2>());
-            theTCrdsPerTexture.add(new StArrayList<StGLVec2>());
-        }
 
-        StArrayList<StGLVec2>& aVerts = *theVertsPerTexture.changeValue(aListId);
-        StArrayList<StGLVec2>& aTCrds = *theTCrdsPerTexture.changeValue(aListId);
+        std::vector<StGLVec2>& aVerts = *theVertsPerTexture[aListId];
+        std::vector<StGLVec2>& aTCrds = *theTCrdsPerTexture[aListId];
 
         // apply floor on position to avoid blurring issues
         // due to cross-pixel coordinates
-        aVerts.add(floor(aRect.getBottomLeft(aVec)));
-        aVerts.add(floor(aRect.getTopLeft(aVec)));
-        aVerts.add(floor(aRect.getTopRight(aVec)));
-        aTCrds.add(aRectUV.getBottomLeft(aVec));
-        aTCrds.add(aRectUV.getTopLeft(aVec));
-        aTCrds.add(aRectUV.getTopRight(aVec));
-
-        aVerts.add(floor(aRect.getBottomLeft(aVec)));
-        aVerts.add(floor(aRect.getTopRight(aVec)));
-        aVerts.add(floor(aRect.getBottomRight(aVec)));
-        aTCrds.add(aRectUV.getBottomLeft(aVec));
-        aTCrds.add(aRectUV.getTopRight(aVec));
-        aTCrds.add(aRectUV.getBottomRight(aVec));
+        aVerts.push_back(floor(aRect.getBottomLeft(aVec)));
+        aVerts.push_back(floor(aRect.getTopLeft(aVec)));
+        aVerts.push_back(floor(aRect.getTopRight(aVec)));
+        aTCrds.push_back(aRectUV.getBottomLeft(aVec));
+        aTCrds.push_back(aRectUV.getTopLeft(aVec));
+        aTCrds.push_back(aRectUV.getTopRight(aVec));
+
+        aVerts.push_back(floor(aRect.getBottomLeft(aVec)));
+        aVerts.push_back(floor(aRect.getTopRight(aVec)));
+        aVerts.push_back(floor(aRect.getBottomRight(aVec)));
+        aTCrds.push_back(aRectUV.getBottomLeft(aVec));
+        aTCrds.push_back(aRectUV.getTopRight(aVec));
+        aTCrds.push_back(aRectUV.getBottomRight(aVec));
     }
 }
 
 void StGLTextFormatter::getResult(StGLContext&                                theCtx,
-                                  StArrayList<GLuint>&                        theTextures,
+                                  std::vector<GLuint>&                        theTextures,
                                   StArrayList< StHandle <StGLVertexBuffer> >& theVertsPerTexture,
                                   StArrayList< StHandle <StGLVertexBuffer> >& theTCrdsPerTexture) const {
-    StArrayList< StHandle <StArrayList <StGLVec2> > > aVertsPerTexture;
-    StArrayList< StHandle <StArrayList <StGLVec2> > > aTCrdsPerTexture;
+    std::vector< StHandle < std::vector<StGLVec2> > > aVertsPerTexture;
+    std::vector< StHandle < std::vector<StGLVec2> > > aTCrdsPerTexture;
     getResult(theTextures, aVertsPerTexture, aTCrdsPerTexture);
 
     if(theVertsPerTexture.size() != theTextures.size()) {
@@ -169,8 +193,8 @@
     }
 
     for(size_t aTextureIter = 0; aTextureIter < theTextures.size(); ++aTextureIter) {
-        const StArrayList<StGLVec2>& aVerts = *aVertsPerTexture[aTextureIter];
-        const StArrayList<StGLVec2>& aTCrds = *aTCrdsPerTexture[aTextureIter];
+        const std::vector<StGLVec2>& aVerts = *aVertsPerTexture[aTextureIter];
+        const std::vector<StGLVec2>& aTCrds = *aTCrdsPerTexture[aTextureIter];
         theVertsPerTexture[aTextureIter]->init(theCtx, aVerts);
         theTCrdsPerTexture[aTextureIter]->init(theCtx, aTCrds);
     }
@@ -222,7 +246,7 @@
         theFont.renderGlyph(theCtx,
                             aCharThis, aCharNext,
                             aTile, myPen);
-        myRects.add(aTile);
+        myRects.push_back(aTile);
 
         ++myRectsNb;
     }

sview-16_06.tar.gz/StShared/StGLTexture.cpp -> sview-17_04.tar.gz/StShared/StGLTexture.cpp Changed

@@ -16,9 +16,10 @@
 #include <StStrings/StLogger.h>
 #include <stAssert.h>
 
-bool StGLTexture::getInternalFormat(const StGLContext&  /*theCtx*/,
+bool StGLTexture::getInternalFormat(const StGLContext&  theCtx,
                                     const StImagePlane& theData,
                                     GLint&              theInternalFormat) {
+    (void )theCtx;
     // sized formats are not supported by OpenGL ES
     switch(theData.getFormat()) {
         case StImagePlane::ImgRGBAF:
@@ -52,12 +53,36 @@
             theInternalFormat = GL_RGBA16;
         #endif
             return true;
-        case StImagePlane::ImgRGB:
-        case StImagePlane::ImgBGR:
-        case StImagePlane::ImgRGB32:
+        case StImagePlane::ImgRGB: {
+            theInternalFormat = GL_RGB8;
+            return true;
+        }
+        case StImagePlane::ImgRGB32: {
+        #if defined(GL_ES_VERSION_2_0)
+            theInternalFormat = GL_RGBA8;
+        #else
+            theInternalFormat = GL_RGB8;
+        #endif
+            return true;
+        }
+        case StImagePlane::ImgBGR: {
+            theInternalFormat = GL_RGB8;
+        #if defined(GL_ES_VERSION_2_0)
+            return false;
+        #else
+            return true;
+        #endif
+        }
         case StImagePlane::ImgBGR32:
         #if defined(GL_ES_VERSION_2_0)
-            theInternalFormat = GL_RGB;
+            theInternalFormat = GL_RGB8;
+            if(!theCtx.extTexBGRA8) {
+                return false;
+            }
+
+            // GL_EXT_texture_format_BGRA8888 has been introduced for OpenGL ES 1.0
+            // and does not defined sized format supported by OpenGL ES 3.0+
+            theInternalFormat = GL_BGRA_EXT;
         #else
             theInternalFormat = GL_RGB8;
         #endif
@@ -287,6 +312,8 @@
         case GL_RGBA16:   return "GL_RGBA16";
         case GL_RGBA16F:  return "GL_RGBA16F"; // half-float
         case GL_RGBA32F:  return "GL_RGBA32F"; // float
+        //
+        case GL_BGRA_EXT:  return "GL_BGRA";
         // ALPHA variations (deprecated)
         case GL_ALPHA:     return "GL_ALPHA";
         case GL_ALPHA8:    return "GL_ALPHA8";
@@ -327,6 +354,8 @@
         case GL_RGBA16F:
         case GL_RGBA32F:
             return GL_RGBA;
+        case GL_BGRA_EXT:
+            return GL_BGRA_EXT;
         // ALPHA variations (deprecated)
         case GL_ALPHA:
         case GL_ALPHA8:
@@ -479,10 +508,10 @@
 
     GLint anInternalFormat = myTextFormat;
 #if defined(GL_ES_VERSION_2_0)
-    //if(!theCtx.isGlGreaterEqual(3, 0)) {
+    if(!theCtx.isGlGreaterEqual(3, 0)) {
         // sized formats are not supported here
         anInternalFormat = theDataFormat;
-    //}
+    }
 #endif
 
     if(myTarget == GL_TEXTURE_CUBE_MAP) {

sview-16_06.tar.gz/StShared/StJpegParser.cpp -> sview-17_04.tar.gz/StShared/StJpegParser.cpp Changed

sview-16_06.tar.gz/StShared/StRawFile.cpp -> sview-17_04.tar.gz/StShared/StRawFile.cpp Changed

@@ -16,6 +16,14 @@
 #include <fstream>
 #include <limits>
 
+#if defined(_WIN32)
+    #define ftell64(a)     _ftelli64(a)
+    #define fseek64(a,b,c) _fseeki64(a,b,c)
+#else
+    #define ftell64(a)     ftello(a)
+    #define fseek64(a,b,c) fseeko(a,b,c)
+#endif
+
 #ifdef max
     #undef max
 #endif
@@ -123,7 +131,8 @@
 }
 
 bool StRawFile::readFile(const StCString& theFilePath,
-                         const int        theOpenedFd) {
+                         const int        theOpenedFd,
+                         const size_t     theReadMax) {
     freeBuffer();
 
     if(!openFile(StRawFile::READ, theFilePath, theOpenedFd)) {
@@ -134,8 +143,17 @@
         int64_t aFileLen = avio_size(myContextIO);
         if(aFileLen > 0) {
             // stream of known size - create a buffer and read the data
-            initBuffer(aFileLen <= int64_t(std::numeric_limits<ptrdiff_t>::max()) ? size_t(aFileLen) : 0);
-            if(myBuffSize != size_t(aFileLen)) {
+            size_t aReadLen = 0;
+            if(aFileLen <= int64_t(std::numeric_limits<ptrdiff_t>::max())) {
+                aReadLen = theReadMax != 0 ? (size_t )stMin(int64_t(theReadMax), aFileLen) : size_t(aFileLen);
+            } else if(theReadMax != 0) {
+                aReadLen = theReadMax;
+            } else {
+                return false;
+            }
+
+            initBuffer(aReadLen);
+            if(myBuffSize != aReadLen) {
                 return false;
             }
 
@@ -180,13 +198,18 @@
                 break;
             }
 
-            if(uint64_t(aFileLen) + 4096 > uint64_t(std::numeric_limits<ptrdiff_t>::max())) {
+            const uint64_t aReadLen = uint64_t(aFileLen) + uint64_t(aReadBytes);
+            if(aReadLen > uint64_t(std::numeric_limits<ptrdiff_t>::max())) {
                 isOk = false;
                 break;
             }
 
             aFileLen += aReadBytes;
             aChunks.add(aChunk);
+            if(theReadMax != 0
+            && aReadLen >= uint64_t(theReadMax)) {
+                break;
+            }
         }
         closeFile();
 
@@ -214,18 +237,28 @@
     }
 
     // determine length of file
-    fseek(myFileHandle, 0, SEEK_END);
-    long aFileLen = ftell(myFileHandle);
+    fseek64(myFileHandle, 0, SEEK_END);
+    int64_t aFileLen = ftell64(myFileHandle);
     if(aFileLen <= 0L) {
         closeFile();
         return false;
     }
 
+    size_t aReadLen = 0;
+    if(aFileLen <= int64_t(std::numeric_limits<ptrdiff_t>::max())) {
+        aReadLen = theReadMax != 0 ? (size_t )stMin(int64_t(theReadMax), aFileLen) : size_t(aFileLen);
+    } else if(theReadMax != 0) {
+        aReadLen = theReadMax;
+    } else {
+        closeFile();
+        return false;
+    }
+
     // create a buffer and read the data
-    initBuffer(size_t(aFileLen));
+    initBuffer(aReadLen);
 
-    fseek(myFileHandle, 0, SEEK_SET);
-    if(myBuffSize == size_t(aFileLen)) {
+    fseek64(myFileHandle, 0, SEEK_SET);
+    if(myBuffSize == aReadLen) {
         size_t aCountRead = fread(myBuffer, 1, myBuffSize, myFileHandle);
         (void )aCountRead;
     }

sview-16_06.tar.gz/StShared/StResourceManager.cpp -> sview-17_04.tar.gz/StShared/StResourceManager.cpp Changed

@@ -85,72 +85,41 @@
   myLang("en") {
 
 #if defined(_WIN32)
-    typedef HRESULT (WINAPI *SHGetKnownFolderPath_t)(const GUID* , DWORD , HANDLE , PWSTR* );
-    HMODULE aShell32Module = GetModuleHandleW(L"Shell32"); // should be already loaded
-    SHGetKnownFolderPath_t aGetFolder = aShell32Module != NULL
-                                      ? (SHGetKnownFolderPath_t )GetProcAddress(aShell32Module, "SHGetKnownFolderPath")
-                                      : (SHGetKnownFolderPath_t )NULL;
     StString anAppDataLocal, anAppDataLocalLow, anAppDataRoam;
-    if(aGetFolder != NULL) {
-        // Vista+
-        wchar_t* aPath = NULL;
-
-        const GUID THE_FOLDER_APPLOC = { 0xF1B32785, 0x6FBA, 0x4FCF, {0x9D, 0x55, 0x7B, 0x8E, 0x7F, 0x15, 0x70, 0x91} }; // FOLDERID_LocalAppData
-        const GUID THE_FOLDER_APPLOW = { 0xA520A1A4, 0x1780, 0x4FF6, {0xBD, 0x18, 0x16, 0x73, 0x43, 0xC5, 0xAF, 0x16} }; // FOLDERID_LocalAppDataLow
-        const GUID THE_FOLDER_APPROA = { 0x3EB685DB, 0x65F9, 0x4CF6, {0xA0, 0x3A, 0xE3, 0xEF, 0x65, 0x72, 0x9F, 0x3D} }; // FOLDERID_RoamingAppData
-        const GUID THE_FOLDER_DOCS   = { 0xFDD39AD0, 0x238F, 0x46AF, {0xAD, 0xB4, 0x6C, 0x85, 0x48, 0x03, 0x69, 0xC7} }; // FOLDERID_Documents
-
-        const GUID THE_FOLDER_DOWN   = { 0x374DE290, 0x123F, 0x4565, {0x91, 0x64, 0x39, 0xC4, 0x92, 0x5E, 0x46, 0x7B} }; // FOLDERID_Downloads
-        const GUID THE_FOLDER_PICS   = { 0x33E28130, 0x4E1E, 0x4676, {0x83, 0x5A, 0x98, 0x39, 0x5C, 0x3B, 0xC3, 0xBB} }; // FOLDERID_Pictures
-        const GUID THE_FOLDER_MUSIC  = { 0x4BD8D571, 0x6D19, 0x48D3, {0xBE, 0x97, 0x42, 0x22, 0x20, 0x08, 0x0E, 0x43} }; // FOLDERID_Music
-        const GUID THE_FOLDER_VIDS   = { 0x18989B1D, 0x99B5, 0x455B, {0x84, 0x1C, 0xAB, 0x7C, 0x74, 0xE4, 0xDD, 0xFC} }; // FOLDERID_Videos
-
-        if(aGetFolder(&THE_FOLDER_APPLOC, 0, NULL, &aPath) == S_OK) {
-            anAppDataLocal.fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_APPLOW, 0, NULL, &aPath) == S_OK) {
-            anAppDataLocalLow.fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_APPROA, 0, NULL, &aPath) == S_OK) {
-            anAppDataRoam.fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_DOCS, 0, NULL, &aPath) == S_OK) {
-            myUserHomeFolder.fromUnicode(aPath);
-            myUserHomeFolder += "\\";
-            ::CoTaskMemFree(aPath);
-        }
+    wchar_t* aPath = NULL;
+    if(::SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &aPath) == S_OK) {
+        anAppDataLocal.fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0, NULL, &aPath) == S_OK) {
+        anAppDataLocalLow.fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &aPath) == S_OK) {
+        anAppDataRoam.fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &aPath) == S_OK) {
+        myUserHomeFolder.fromUnicode(aPath);
+        myUserHomeFolder += "\\";
+        ::CoTaskMemFree(aPath);
+    }
 
-        if(aGetFolder(&THE_FOLDER_DOWN, 0, NULL, &aPath) == S_OK) {
-            myFolders[FolderId_Downloads].fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_PICS, 0, NULL, &aPath) == S_OK) {
-            myFolders[FolderId_Pictures].fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_MUSIC, 0, NULL, &aPath) == S_OK) {
-            myFolders[FolderId_Music].fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-        if(aGetFolder(&THE_FOLDER_VIDS, 0, NULL, &aPath) == S_OK) {
-            myFolders[FolderId_Videos].fromUnicode(aPath);
-            ::CoTaskMemFree(aPath);
-        }
-    } else {
-        wchar_t aPath[MAX_PATH];
-        if(::SHGetFolderPathW(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, 0, aPath) == S_OK) {
-            anAppDataLocal.fromUnicode(aPath);
-        }
-        if(::SHGetFolderPathW(NULL, CSIDL_FLAG_CREATE | CSIDL_APPDATA, NULL, 0, aPath) == S_OK) {
-            anAppDataRoam.fromUnicode(aPath);
-        }
-        if(::SHGetFolderPathW(NULL, CSIDL_FLAG_CREATE | CSIDL_PERSONAL, NULL, 0, aPath) == S_OK) {
-            myUserHomeFolder.fromUnicode(aPath);
-            myUserHomeFolder += "\\";
-        }
+    if(::SHGetKnownFolderPath(FOLDERID_Downloads, 0, NULL, &aPath) == S_OK) {
+        myFolders[FolderId_Downloads].fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_Pictures, 0, NULL, &aPath) == S_OK) {
+        myFolders[FolderId_Pictures].fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_Music, 0, NULL, &aPath) == S_OK) {
+        myFolders[FolderId_Music].fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
+    }
+    if(::SHGetKnownFolderPath(FOLDERID_Videos, 0, NULL, &aPath) == S_OK) {
+        myFolders[FolderId_Videos].fromUnicode(aPath);
+        ::CoTaskMemFree(aPath);
     }
 
     StString anAppData;

sview-16_06.tar.gz/StShared/StShared.cbp -> sview-17_04.tar.gz/StShared/StShared.cbp Changed

sview-16_06.tar.gz/StShared/StShared.rc -> sview-17_04.tar.gz/StShared/StShared.rc Changed

sview-16_06.tar.gz/StShared/StShared.vcxproj -> sview-17_04.tar.gz/StShared/StShared.vcxproj Changed

sview-16_06.tar.gz/StShared/StThread.cpp -> sview-17_04.tar.gz/StShared/StThread.cpp Changed

@@ -121,6 +121,15 @@
 #endif
 }
 
+bool StThread::wait(const int theTimeMilliseconds) {
+#ifdef _WIN32
+    return isValid() && (WaitForSingleObject((HANDLE )myThread, (DWORD )theTimeMilliseconds) != WAIT_TIMEOUT);
+#else
+    (void )theTimeMilliseconds;
+    return isValid() && (pthread_join(myThread, NULL) == 0);
+#endif
+}
+
 void StThread::kill() {
     if(isValid()) {
     #ifdef _WIN32
@@ -146,21 +155,7 @@
 }
 
 namespace {
-#ifdef _WIN32
-    // for a 64-bit app running under 64-bit Windows, this is FALSE
-    static bool isWow64() {
-        typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE , PBOOL );
-        BOOL bIsWow64 = FALSE;
-        HMODULE aKern32Module = GetModuleHandleW(L"kernel32");
-        LPFN_ISWOW64PROCESS aFunIsWow64 = aKern32Module == NULL
-                                        ? (LPFN_ISWOW64PROCESS )NULL
-                                        : (LPFN_ISWOW64PROCESS )GetProcAddress(aKern32Module, "IsWow64Process");
-        return aFunIsWow64 != NULL
-            && aFunIsWow64(GetCurrentProcess(), &bIsWow64)
-            && bIsWow64 != FALSE;
-    }
-
-#elif defined(__ANDROID__)
+#if defined(__ANDROID__)
 
     /**
      * Simple number parser.
@@ -257,21 +252,8 @@
         return aNumLogicalProcessors;
     }
 
-    // GetSystemInfo() will return the number of processors in a data field in a SYSTEM_INFO structure.
     SYSTEM_INFO aSysInfo;
-    if(isWow64()) {
-        typedef BOOL (WINAPI *LPFN_GSI)(LPSYSTEM_INFO );
-        HMODULE aKern32 = GetModuleHandleW(L"kernel32");
-        LPFN_GSI aFuncSysInfo = (LPFN_GSI )GetProcAddress(aKern32, "GetNativeSystemInfo");
-        // So, they suggest 32-bit apps should call this instead of the other in WOW64
-        if(aFuncSysInfo != NULL) {
-            aFuncSysInfo(&aSysInfo);
-        } else {
-            GetSystemInfo(&aSysInfo);
-        }
-    } else {
-        GetSystemInfo(&aSysInfo);
-    }
+    ::GetNativeSystemInfo(&aSysInfo);
     aNumLogicalProcessors = aSysInfo.dwNumberOfProcessors;
     return aNumLogicalProcessors;
 #else

sview-16_06.tar.gz/StShared/StWebPImage.cpp -> sview-17_04.tar.gz/StShared/StWebPImage.cpp Changed

@@ -161,10 +161,11 @@
 #endif
 }
 
-bool StWebPImage::load(const StString& theFilePath,
-                       ImageType       theImageType,
-                       uint8_t*        theDataPtr,
-                       int             theDataSize) {
+bool StWebPImage::loadExtra(const StString& theFilePath,
+                            ImageType       theImageType,
+                            uint8_t*        theDataPtr,
+                            int             theDataSize,
+                            bool            theIsOnlyRGB) {
 #ifndef ST_HAVE_WEBP
     setState("WebP library is not initialized");
     return false;
@@ -193,7 +194,7 @@
     switch(theImageType) {
         case ST_TYPE_NONE:
         case ST_TYPE_WEBP: {
-            return loadInternal(theFilePath, theDataPtr, theDataSize, false);
+            return loadInternal(theFilePath, theDataPtr, theDataSize, theIsOnlyRGB);
         }
         case ST_TYPE_WEBPLL: {
             return loadInternal(theFilePath, theDataPtr, theDataSize, true);

sview-16_06.tar.gz/clean - Full.bat -> sview-17_04.tar.gz/clean - Full.bat Changed

sview-16_06.tar.gz/distribution/build.bat -> sview-17_04.tar.gz/distribution/build.bat Changed

sview-16_06.tar.gz/distribution/build.iss -> sview-17_04.tar.gz/distribution/build.iss Changed

@@ -147,7 +147,7 @@
 
 [Tasks]
 Name: desktopicon;           Description: "{cm:CreateDesktopIcon}";     GroupDescription: "{cm:AdditionalIcons}";  Flags: unchecked
-Name: quicklaunchicon;       Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}";  Flags: unchecked
+Name: quicklaunchicon;       Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}";  Flags: unchecked; OnlyBelowVersion: 0,6.1
 Name: flagOpenAL51;          Description: "{cm:OpenALSoft51}";          GroupDescription: "{cm:AdditionalIcons}" ; Components: StDrawers\StMoviePlayer; Flags: unchecked
 Name: flagAssocStereoImages; Description: "{cm:AssocStereoImages}";     GroupDescription: "{cm:FileAssociations}"; Components: StDrawers\StImageViewer
 Name: flagAssocImages;       Description: "{cm:AssocImages}";           GroupDescription: "{cm:FileAssociations}"; Components: StDrawers\StImageViewer; Flags: unchecked
@@ -214,8 +214,10 @@
 Source: {#SVIEW_DISTR_PATH_AMD64}\StOutPageFlip.dll;              DestDir: {app}\amd64;                        Flags: 64bit ignoreversion;                Components: StRenderers\StOutPageFlip; Check: IsWin64
 ; StRenderers -> StOutDistorted
 Source: {#SVIEW_DISTR_PATH_x86}\StOutDistorted.dll;               DestDir: {app};                              Flags: 32bit ignoreversion;                Components: StRenderers\StOutDistorted
+Source: {#SVIEW_DISTR_PATH_x86}\openvr_api.dll;                   DestDir: {app};                              Flags: 32bit ignoreversion;                Components: StRenderers\StOutDistorted
 Source: {#SVIEW_DISTR_PATH_x86}\lang\*StOutDistorted.lng;         DestDir: {app}\lang;                         Flags: 32bit ignoreversion recursesubdirs; Components: StRenderers\StOutDistorted
 Source: {#SVIEW_DISTR_PATH_AMD64}\StOutDistorted.dll;             DestDir: {app}\amd64;                        Flags: 64bit ignoreversion;                Components: StRenderers\StOutDistorted; Check: IsWin64
+Source: {#SVIEW_DISTR_PATH_AMD64}\openvr_api.dll;                 DestDir: {app}\amd64;                        Flags: 64bit ignoreversion;                Components: StRenderers\StOutDistorted; Check: IsWin64
 
 ; StDrawers
 Source: {#SVIEW_DISTR_PATH_x86}\textures\*;                    DestDir: {app}\textures;        Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer or StDrawers\StMoviePlayer or StBrowserPlugins or StActiveXPlugin
@@ -243,6 +245,7 @@
 Source: {#SVIEW_DISTR_PATH_x86}\web\*.htm;                     DestDir: {app}\web;             Flags: 32bit ignoreversion recursesubdirs; Components: StDrawers\StMoviePlayer
 Source: {#SVIEW_DISTR_PATH_x86}\OpenAL32.dll;                  DestDir: {app};                 Flags: 32bit ignoreversion; Components: StCore
 Source: alsoft51.ini;                                          DestDir: {userappdata};   DestName: "alsoft.ini";     Tasks: flagOpenAL51; Components: StCore
+Source: openal\hrtf\*;                                         DestDir: {commonappdata}\openal\hrtf; Components: StCore
 Source: {#SVIEW_DISTR_PATH_AMD64}\StMoviePlayer.dll;           DestDir: {app}\amd64;           Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
 Source: {#SVIEW_DISTR_PATH_AMD64}\OpenAL32.dll;                DestDir: {app}\amd64;           Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
 
@@ -251,8 +254,8 @@
 ;Source: {#SVIEW_DISTR_PATH_AMD64}\StCADViewer.exe;             DestDir: {app}\amd64;           Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
 
 [Icons]
-Name: {group}\sView - Image Viewer; Filename: {app}\{#SVIEW_EXE_NAME};       Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}";  IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: not IsWin64
-Name: {group}\sView - Image Viewer; Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}";  IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: IsWin64
+Name: {group}\sView - Image Viewer; Filename: {app}\{#SVIEW_EXE_NAME};       Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}";  IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: not IsWin64
+Name: {group}\sView - Image Viewer; Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}";  IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: IsWin64
 Name: {group}\sView - Movie Player; Filename: {app}\{#SVIEW_EXE_NAME};       Components: StDrawers\StMoviePlayer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StMoviePlayer}";  IconIndex: 0; Parameters: "--in=video"; Check: not IsWin64
 Name: {group}\sView - Movie Player; Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Components: StDrawers\StMoviePlayer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StMoviePlayer}";  IconIndex: 0; Parameters: "--in=video"; Check: IsWin64
 Name: {group}\Extras\sView - Failsafe;                    Filename: {app}\{#SVIEW_EXE_NAME};       Components: StDrawers\StImageViewer and StRenderers\StOutAnaglyph; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: Failsafe sView launch; IconIndex: 0; Parameters: --out=StOutAnaglyph --in=image
@@ -267,10 +270,10 @@
 
 ;Name: {group}\user manual;          Filename: {app}\info\manual.pdf;         Comment: User manual; Tasks: ; Languages:
 Name: {group}\{cm:UninstallProgram,{#SVIEW_NAME}}; Filename: {uninstallexe}
-Name: {commondesktop}\{#SVIEW_NAME};Filename: {app}\{#SVIEW_EXE_NAME};       Tasks: desktopicon; Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: not IsWin64
-Name: {commondesktop}\{#SVIEW_NAME};Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Tasks: desktopicon; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: IsWin64
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SVIEW_NAME}; Filename: {app}\{#SVIEW_EXE_NAME};       Tasks: quicklaunchicon; Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: not IsWin64
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SVIEW_NAME}; Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Tasks: quicklaunchicon; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image - ""{app}\demo.jps"""; Check: IsWin64
+Name: {commondesktop}\{#SVIEW_NAME};Filename: {app}\{#SVIEW_EXE_NAME};       Tasks: desktopicon; Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: not IsWin64
+Name: {commondesktop}\{#SVIEW_NAME};Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Tasks: desktopicon; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: IsWin64
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SVIEW_NAME}; Filename: {app}\{#SVIEW_EXE_NAME};       Tasks: quicklaunchicon; Components: StDrawers\StImageViewer; IconFilename: {app}\{#SVIEW_EXE_NAME};       Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: not IsWin64
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SVIEW_NAME}; Filename: {app}\amd64\{#SVIEW_EXE_NAME}; Tasks: quicklaunchicon; Components: StDrawers\StImageViewer; IconFilename: {app}\amd64\{#SVIEW_EXE_NAME}; Comment: "{cm:StImageViewer}"; IconIndex: 0; Parameters: "--in=image --demo=""{app}\demo.jps"""; Check: IsWin64
 
 [Run]
 ;Filename: {app}\{#SVIEW_EXE_NAME}; WorkingDir: {app}; Components: StDrawers\StImageViewer; Description: {cm:LaunchProgram,{#SVIEW_NAME}}; Parameters: --in=image - demo.jps; Flags: nowait postinstall skipifsilent
@@ -314,8 +317,8 @@
 
 Root: HKCR; SubKey: .bmp;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .jpg;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
-Root: HKCR; SubKey: .jpeg                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
-Root: HKCR; SubKey: .jpe                                       ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
+Root: HKCR; SubKey: .jpeg;                                     ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
+Root: HKCR; SubKey: .jpe;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .j2k;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .jp2;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .tga;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey

sview-17_04.tar.gz/distribution/openal Added

sview-17_04.tar.gz/distribution/openal/hrtf Added

sview-17_04.tar.gz/distribution/openal/hrtf/default-44100.mhr Added

sview-17_04.tar.gz/distribution/openal/hrtf/default-48000.mhr Added

sview-16_06.tar.gz/docs/INSTALL.md -> sview-17_04.tar.gz/docs/INSTALL.md Changed

@@ -38,11 +38,11 @@
 yum install ffmpeg-devel
 ~~~~~
 
-On Windows and Mac OS X please refer to official documentation for each project.
-Notice that DevIL and FreeImage libraries are optional and need not for building sView
+On Windows and macOS please refer to official documentation for each project.
+Notice that DevIL and FreeImage libraries are optional and are not required for building sView
 (libraries are loaded dynamically if available).
 
-## II. Makefile on Linux
+## II. Makefile (Linux, macOS, Android)
 
 Current Makefile has been written only for DEB/RPM source packages
 and lacks configuration flexibility (means there NO any ./configure and so on).
@@ -53,6 +53,23 @@
   make && make install
 ~~~~~
 
+### Android
+
+sView for Android is build in two steps:
+
+* Building native libraries using UNIX Makefile.
+  Paths to NDK and 3rd-party libraries can be specified through command-line options to **make** or by editing Makefile itself.
+  sView does not provide .mk files - it uses UNIX Makefile for building native code.
+~~~~~
+  make android ANDROID_NDK=$SVIEW_NDK FFMPEG_ROOT=$SVIEW_FFMPEG FREETYPE_ROOT=$SVIEW_FREETYPE OPENAL_ROOT=$SVIEW_OPENAL LIBCONFIG_ROOT=$SVIEW_LIBCONFIG
+~~~~~
+* Compiling Java classes and putting everything into APK file using Eclipse.
+  Eclipse performs building automatically (by default), but APK file is not created by this action.
+  APK export can be started from context menu on project sView (in the tree) -> Export -> Android -> Export Android Application.
+  Android Studio is currently can not be used for this purpose (not tested).
+
+This instruction has been tested only on Linux host.
+
 ## III. Code::Blocks
 
 Code::Blocks is an official way for building and development of sView.

sview-16_06.tar.gz/include/StAV/StAVImage.h -> sview-17_04.tar.gz/include/StAV/StAVImage.h Changed

@@ -66,15 +66,11 @@
     /**
      * Decode image from specified file or memory pointer.
      */
-    ST_CPPEXPORT virtual bool load(const StString& theFilePath,
-                                   ImageType       theImageType = ST_TYPE_NONE,
-                                   uint8_t* theDataPtr = NULL, int theDataSize = 0);
-
-    ST_CPPEXPORT bool loadExtra(const StString& theFilePath,
-                                ImageType       theImageType,
-                                uint8_t*        theDataPtr,
-                                int             theDataSize,
-                                bool            theIsOnlyRGB);
+    ST_CPPEXPORT virtual bool loadExtra(const StString& theFilePath,
+                                        ImageType       theImageType,
+                                        uint8_t*        theDataPtr,
+                                        int             theDataSize,
+                                        bool            theIsOnlyRGB) ST_ATTR_OVERRIDE;
 
     /**
      * Save image to specified path.

sview-16_06.tar.gz/include/StAV/stAV.h -> sview-17_04.tar.gz/include/StAV/stAV.h Changed

sview-16_06.tar.gz/include/StCore/StAndroidGlue.h -> sview-17_04.tar.gz/include/StCore/StAndroidGlue.h Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2014-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -219,15 +219,23 @@
      * Turn orientation sensor on/off.
      * Has no effect in case if sensor is unavailable.
      */
-    ST_CPPEXPORT void setTrackOrientation(const bool theToTrack);
+    ST_CPPEXPORT void setTrackOrientation(bool theToTrack);
+
+    /**
+     * Setup visibility of system bars.
+     */
+    ST_CPPEXPORT void setHideSystemBars(bool theToHideStatusBar,
+                                        bool theToHideNavBar);
 
     /**
      * Fetch current state:
      * @param theNewFile pop onNewIntent() open file event
      * @param theQuaternion device orientation
+     * @param theToSwapEyes swap left/right views
      */
     ST_CPPEXPORT void fetchState(StString&             theNewFile,
-                                 StQuaternion<double>& theQuaternion);
+                                 StQuaternion<double>& theQuaternion,
+                                 bool&                 theToSwapEyes);
 
     /**
      * Return device memory class.
@@ -350,6 +358,11 @@
      */
     ST_LOCAL void setOrientation(float theAzimuthDeg, float thePitchDeg, float theRollDeg, float theScreenRotDeg);
 
+    /**
+     * Define device Left/Right eyes swap flag.
+     */
+    ST_LOCAL void setSwapEyes(bool theToSwapLR);
+
         private: //! @name ANativeActivity callbacks
 
     ST_LOCAL static void processInputWrapper(StAndroidGlue*       theApp,
@@ -470,6 +483,9 @@
     bool                    myHasOrientSensor;   //!< flag indicating that device has orientation sensors
     bool                    myIsPoorOrient;      //!< flag indicating that available orientation sensor provides imprecise values
     bool                    myToTrackOrient;     //!< track device orientation
+    bool                    myToHideStatusBar;   //!< hide system-provided status bar
+    bool                    myToHideNavBar;      //!< hide system-provided navigation bar
+    bool                    myToSwapEyesHW;      //!< flag to swap LR views on external event
 
     bool                    myIsRunning;
     bool                    myIsStateSaved;

sview-16_06.tar.gz/include/StCore/StEvent.h -> sview-17_04.tar.gz/include/StCore/StEvent.h Changed

sview-16_06.tar.gz/include/StCore/StWindow.h -> sview-17_04.tar.gz/include/StCore/StWindow.h Changed

@@ -1,6 +1,6 @@
 /**
  * StCore, window system independent C++ toolkit for writing OpenGL applications.
- * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -88,6 +88,7 @@
     StWinAttr_GlQuadStereo,        //!< boolean, request OpenGL context with Quad Buffer, turned OFF by default
     StWinAttr_GlDebug,             //!< boolean, request Debug OpenGL context, FALSE by default
     StWinAttr_GlDepthSize,         //!< integer, minimum size of Depth Buffer (in bits) or 0 if not needed, 16 bit by default
+    StWinAttr_GlStencilSize,       //!< integer, size of Stencil Buffer (in bits) or 0 if not needed, 0 bit by default
     StWinAttr_ToBlockSleepSystem,  //!< boolean, prevent system  going to sleep (display could be turned off), FALSE by default
     StWinAttr_ToBlockSleepDisplay, //!< boolean, prevent display going to sleep, FALSE by default
     StWinAttr_GlobalMediaKeys,     //!< boolean, register system hot-key to capture multimedia even without window focus, FALSE by default
@@ -257,15 +258,20 @@
     /**
      * @return GUI margins
      */
-    ST_CPPEXPORT const StMarginsI& getMargins() const;
+    ST_CPPEXPORT virtual StMarginsI getMargins() const;
 
     /**
      * @return point relative to window mouse position
-     * (0,0) - is top left of the window and (1,1) right buttom.
+     * (0,0) - is top left of the window and (1,1) right bottom.
      */
     ST_CPPEXPORT StPointD_t getMousePos() const;
 
     /**
+     * @return TRUE if last mouse cursor position was updated by precise input device (e.g. mouse)
+     */
+    ST_CPPEXPORT bool isPreciseCursor() const;
+
+    /**
      * Function creates a GL window.
      * @return true on success
      */
@@ -336,6 +342,11 @@
     ST_CPPEXPORT void stglSwap();
 
     /**
+     * Return window aspect ratio (width / height in normal case).
+     */
+    ST_CPPEXPORT double stglAspectRatio() const;
+
+    /**
      * Get viewport for specified subwindow (to handle tiled presentation).
      * @param theWinEnum subwindow ID
      * @return rectangle within window from bottom-left corner (ready for OpenGL calls)
@@ -394,6 +405,11 @@
     ST_CPPEXPORT virtual void getDevices(StOutDevicesList& theList) const;
 
     /**
+     * Return true if 3D output requires fullscreen mode.
+     */
+    ST_CPPEXPORT virtual bool isStereoFullscreenOnly() const;
+
+    /**
      * @return true if stereo output enabled
      */
     ST_CPPEXPORT bool isStereoOutput() const;
@@ -448,6 +464,12 @@
     ST_CPPEXPORT virtual void setTrackOrientation(const bool theToTrack);
 
     /**
+     * Setup visibility of system bars.
+     */
+    ST_CPPEXPORT void setHideSystemBars(bool theToHideStatusBar,
+                                        bool theToHideNavBar);
+
+    /**
      * Return device orientation (for head-tracking) within right-handed coordinate system:
      * - Y is positive in up direction (towards the sky, perpendicular to the ground).
      * - X is positive to the right (tangential to the ground).
@@ -456,6 +478,11 @@
     ST_CPPEXPORT virtual StQuaternion<double> getDeviceOrientation() const;
 
     /**
+     * Return TRUE if Left/Right eyes should be swapped by external event.
+     */
+    ST_CPPEXPORT virtual bool toSwapEyesHW() const;
+
+    /**
      * Retrieve options list.
      */
     ST_CPPEXPORT virtual void getOptions(StParamsList& theList) const;
@@ -573,6 +600,12 @@
      */
     ST_CPPEXPORT StRectI_t defaultRect(const StMonitor* theMon = NULL) const;
 
+    /**
+     * Setup forced window aspect ratio.
+     * When negative value is given (default is -1), aspect ratio will be automatically computed as window (width/height).
+     */
+    ST_CPPEXPORT void setForcedAspect(double theAspect);
+
         public:
 
     ST_CPPEXPORT void* getNativeOglWin() const;
@@ -587,7 +620,6 @@
         protected:
 
     StHandle<StMsgQueue>        myMsgQueue;       //!< messages queue
-    StMarginsI                  myMargins;        //!< GUI margins
     bool                        myWasUsed;        //!< flag indicates that window has been actually used (created)
     bool                        myIsForcedStereo; //!< flag to force stereo output for mono sources

sview-16_06.tar.gz/include/StFile/StRawFile.h -> sview-17_04.tar.gz/include/StFile/StRawFile.h Changed

sview-16_06.tar.gz/include/StGL/StGLContext.h -> sview-17_04.tar.gz/include/StGL/StGLContext.h Changed

sview-16_06.tar.gz/include/StGL/StGLFunctions.h -> sview-17_04.tar.gz/include/StGL/StGLFunctions.h Changed

@@ -61,6 +61,31 @@
     #define GL_RGBA8 0x8058
     // GL_EXT_texture_format_BGRA8888
     #define GL_BGRA_EXT 0x80E1 // same as GL_BGRA on desktop
+
+    // debug ARB extension
+    #define GL_DEBUG_OUTPUT                   0x92E0
+    #define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+    #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+    #define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+    #define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+    #define GL_DEBUG_SOURCE_API               0x8246
+    #define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+    #define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+    #define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+    #define GL_DEBUG_SOURCE_APPLICATION       0x824A
+    #define GL_DEBUG_SOURCE_OTHER             0x824B
+    #define GL_DEBUG_TYPE_ERROR               0x824C
+    #define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+    #define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+    #define GL_DEBUG_TYPE_PORTABILITY         0x824F
+    #define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+    #define GL_DEBUG_TYPE_OTHER               0x8251
+    #define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+    #define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+    #define GL_DEBUG_LOGGED_MESSAGES          0x9145
+    #define GL_DEBUG_SEVERITY_HIGH            0x9146
+    #define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+    #define GL_DEBUG_SEVERITY_LOW             0x9148
 #else
     #include <GL/gl.h>
 #endif
@@ -614,6 +639,27 @@
         }
     }
 
+        public: //! @name GL_KHR_debug (optional)
+
+    typedef void   (APIENTRY  *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam);
+
+    typedef void   (APIENTRYP glDebugMessageControl_t ) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+    typedef void   (APIENTRYP glDebugMessageInsert_t  ) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
+    typedef void   (APIENTRYP glDebugMessageCallback_t) (GLDEBUGPROCARB callback, const void* userParam);
+    typedef GLuint (APIENTRYP glGetDebugMessageLog_t  ) (GLuint   count,
+                                                         GLsizei  bufSize,
+                                                         GLenum*  sources,
+                                                         GLenum*  types,
+                                                         GLuint*  ids,
+                                                         GLenum*  severities,
+                                                         GLsizei* lengths,
+                                                         GLchar*  messageLog);
+
+    glDebugMessageControl_t  glDebugMessageControl;
+    glDebugMessageInsert_t   glDebugMessageInsert;
+    glDebugMessageCallback_t glDebugMessageCallback;
+    glGetDebugMessageLog_t   glGetDebugMessageLog;
+
 #else
 
         public: //! @name OpenGL 1.2
@@ -1303,13 +1349,6 @@
     PFNGLBINDIMAGETEXTURESPROC glBindImageTextures;
     PFNGLBINDVERTEXBUFFERSPROC glBindVertexBuffers;
 
-        public: //! @name GL_ARB_debug_output (optional)
-
-    PFNGLDEBUGMESSAGECONTROLARBPROC  glDebugMessageControlARB;
-    PFNGLDEBUGMESSAGEINSERTARBPROC   glDebugMessageInsertARB;
-    PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
-    PFNGLGETDEBUGMESSAGELOGARBPROC   glGetDebugMessageLogARB;
-
 #if defined(_WIN32)
         public: //! @name wgl extensions
 
@@ -1459,6 +1498,28 @@
     #define WGL_ACCESS_WRITE_DISCARD_NV 0x0002
 #endif
 
+        // WGL_AMD_gpu_association
+
+#ifndef WGL_GPU_VENDOR_AMD
+    #define WGL_GPU_VENDOR_AMD                 0x1F00
+    #define WGL_GPU_RENDERER_STRING_AMD        0x1F01
+    #define WGL_GPU_OPENGL_VERSION_STRING_AMD  0x1F02
+    #define WGL_GPU_FASTEST_TARGET_GPUS_AMD    0x21A2
+    #define WGL_GPU_RAM_AMD                    0x21A3
+    #define WGL_GPU_CLOCK_AMD                  0x21A4
+    #define WGL_GPU_NUM_PIPES_AMD              0x21A5
+    #define WGL_GPU_NUM_SIMD_AMD               0x21A6
+    #define WGL_GPU_NUM_RB_AMD                 0x21A7
+    #define WGL_GPU_NUM_SPI_AMD                0x21A8
+#endif
+
+    typedef UINT (WINAPI *wglGetGPUIDsAMD_t       )(UINT theMaxCount, UINT* theIds);
+    typedef INT  (WINAPI *wglGetGPUInfoAMD_t      )(UINT theId, INT theProperty, GLenum theDataType, UINT theSize, void* theData);
+    typedef UINT (WINAPI *wglGetContextGPUIDAMD_t )(HGLRC theHglrc);
+    wglGetGPUIDsAMD_t       wglGetGPUIDsAMD;
+    wglGetGPUInfoAMD_t      wglGetGPUInfoAMD;
+    wglGetContextGPUIDAMD_t wglGetContextGPUIDAMD;
+
 #elif defined(__APPLE__)
         public: //! @name CGL extensions

sview-16_06.tar.gz/include/StGL/StGLTextFormatter.h -> sview-17_04.tar.gz/include/StGL/StGLTextFormatter.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2012-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2012-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -11,6 +11,8 @@
 
 #include <StGL/StGLFont.h>
 
+#include <vector>
+
 class StGLVertexBuffer;
 
 template<> inline void StArray< StHandle <StArrayList <StGLVec2> > >::sort() {}
@@ -125,15 +127,15 @@
     /**
      * Retrieve formatting results.
      */
-    ST_CPPEXPORT void getResult(StArrayList<GLuint>&                               theTextures,
-                                StArrayList< StHandle <StArrayList <StGLVec2> > >& theVertsPerTexture,
-                                StArrayList< StHandle <StArrayList <StGLVec2> > >& theTCrdsPerTexture) const;
+    ST_CPPEXPORT void getResult(std::vector<GLuint>&                               theTextures,
+                                std::vector< StHandle < std::vector<StGLVec2> > >& theVertsPerTexture,
+                                std::vector< StHandle < std::vector<StGLVec2> > >& theTCrdsPerTexture) const;
 
     /**
      * Retrieve formatting results.
      */
     ST_CPPEXPORT void getResult(StGLContext&                                theCtx,
-                                StArrayList<GLuint>&                        theTextures,
+                                std::vector<GLuint>&                        theTextures,
                                 StArrayList< StHandle <StGLVertexBuffer> >& theVertsPerTexture,
                                 StArrayList< StHandle <StGLVertexBuffer> >& theTCrdsPerTexture) const;
 
@@ -186,7 +188,7 @@
 
     StString              myString;        //!< currently rendered text
     StGLVec2              myPen;           //!< current pen position
-    StArrayList<StGLTile> myRects;         //!< glyphs rectangles
+    std::vector<StGLTile> myRects;         //!< glyphs rectangles
     size_t                myRectsNb;       //!< rectangles number
     GLfloat               myLineSpacing;   //!< line spacing (computed as maximum of all fonts involved in text formatting)
     GLfloat               myAscender;      //!<

sview-16_06.tar.gz/include/StGL/StGLVertexBuffer.h -> sview-17_04.tar.gz/include/StGL/StGLVertexBuffer.h Changed

@@ -14,6 +14,8 @@
 #include <StGL/StGLVec.h>
 #include <StGL/StGLResource.h>
 
+#include <vector>
+
 /**
  * Enumeration indicates the data stored in VBO.
  */
@@ -105,6 +107,21 @@
         return init(theCtx, 4, GLsizeiptr(theArray.size()), theArray.getFirst().getData());
     }
 
+    ST_LOCAL bool init(StGLContext& theCtx,
+                       const std::vector<StGLVec2>& theArray) {
+        return init(theCtx, 2, GLsizeiptr(theArray.size()), theArray.front().getData());
+    }
+
+    ST_LOCAL bool init(StGLContext& theCtx,
+                       const std::vector<StGLVec3>& theArray) {
+        return init(theCtx, 3, GLsizeiptr(theArray.size()), theArray.front().getData());
+    }
+
+    ST_LOCAL bool init(StGLContext& theCtx,
+                       const std::vector<StGLVec4>& theArray) {
+        return init(theCtx, 4, GLsizeiptr(theArray.size()), theArray.front().getData());
+    }
+
     ST_CPPEXPORT bool init(StGLContext&   theCtx,
                            GLsizeiptr     theElemSize,
                            GLsizeiptr     theElemsCount,

sview-16_06.tar.gz/include/StGL/StParams.h -> sview-17_04.tar.gz/include/StGL/StParams.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -15,35 +15,38 @@
 #include <StTemplates/StHandle.h>
 
 /**
+ * Surface to map image onto.
+ */
+enum StViewSurface {
+    StViewSurface_Plain,   //!< normal 2D image
+    StViewSurface_Cubemap, //!< cubemap texture
+    StViewSurface_Sphere,  //!< spherical panorama
+    //StViewSurface_Cylinder, //!< cylindrical panorama
+};
+
+/**
  * Common parameters for stereo image representation.
  */
 class StStereoParams {
 
         public:
 
-    enum ViewMode {
-        FLAT_IMAGE,        //!< normal 2D image
-        PANORAMA_CUBEMAP,  //!< cubemap texture
-        PANORAMA_SPHERE,   //!< spherical panorama
-        //PANORAMA_CYLINDER, //!< cylindrical panorama
-    };
-
-    static StString GET_VIEW_MODE_NAME(ViewMode theViewMode) {
+    static StString GET_VIEW_MODE_NAME(StViewSurface theViewMode) {
         switch(theViewMode) {
-            case PANORAMA_CUBEMAP: return "cubemap";
-            case PANORAMA_SPHERE:  return "sphere";
-            case FLAT_IMAGE:
-            default:               return "flat";
+            case StViewSurface_Cubemap: return "cubemap";
+            case StViewSurface_Sphere:  return "sphere";
+            case StViewSurface_Plain:   return "flat";
         }
+        return "flat";
     }
 
-    static ViewMode GET_VIEW_MODE_FROM_STRING(const StString& theViewModeStr) {
+    static StViewSurface GET_VIEW_MODE_FROM_STRING(const StString& theViewModeStr) {
         if(theViewModeStr.isStartsWithIgnoreCase(stCString("cubemap"))) {
-            return PANORAMA_CUBEMAP;
+            return StViewSurface_Cubemap;
         } else if(theViewModeStr.isStartsWithIgnoreCase(stCString("sphere"))) {
-            return PANORAMA_SPHERE;
+            return StViewSurface_Sphere;
         } else {
-            return FLAT_IMAGE;
+            return StViewSurface_Plain;
         }
     }
 
@@ -57,13 +60,12 @@
       Src1SizeY(0),
       Src2SizeX(0),
       Src2SizeY(0),
-      ViewingMode(FLAT_IMAGE),
+      ViewingMode(StViewSurface_Plain),
       Timestamp(0.0f),
       StereoFormat(StFormat_Mono),
       ToSwapLR(false),
+      ToFlipCubeZ(false),
       PanCenter(0.0f, 0.0f),
-      PanTheta(0.0f),
-      PanPhi(0.0f),
       ScaleFactor(1.0f),
       mySepDxPx(0),
       mySepDxZeroPx(0),
@@ -72,6 +74,10 @@
       myXRotateDegrees(0.0f),
       myYRotateDegrees(0.0f),
       myZRotateDegrees(0.0f),
+      myPanYaw(0.0f),
+      myPanPitch(0.0f),
+      myPanYawZero(0.0f),
+      myPanPitchZero(0.0f),
       myZRotateZero(0.0f) {
         //
     }
@@ -84,36 +90,24 @@
     }
 
     /**
-     * Switch to the next viewing mode.
-     */
-    void nextViewMode() {
-        switch(ViewingMode) {
-            case FLAT_IMAGE:        ViewingMode = PANORAMA_SPHERE; break;
-            case PANORAMA_CUBEMAP:
-            case PANORAMA_SPHERE:
-            default:                ViewingMode = FLAT_IMAGE;
-        }
-    }
-
-    /**
      * @return horizontal separation in pixels.
      * This number means delta between views.
      */
-    GLint getSeparationDx() const {
+    int getSeparationDx() const {
         return mySepDxZeroPx + mySepDxPx;
     }
 
     /**
      * Set horizontal separation in pixels.
      */
-    void setSeparationDx(const GLint theValue) {
+    void setSeparationDx(int theValue) {
         mySepDxPx = theValue - mySepDxZeroPx;
     }
 
     /**
      * Setup neutral point.
      */
-    void setSeparationNeutral(const GLint theSepDx = 0) {
+    void setSeparationNeutral(int theSepDx = 0) {
         mySepDxZeroPx = theSepDx;
     }
 
@@ -128,67 +122,99 @@
     /**
      * Set vertical separation in pixels.
      */
-    void setSeparationDy(const GLint theValue) {
+    void setSeparationDy(int theValue) {
         mySepDyPx = theValue;
     }
 
     /**
      * @return angular separation between views in degrees.
      */
-    GLfloat getSepRotation() const {
+    float getSepRotation() const {
         return mySepRotDegrees;
     }
 
     /**
      * @return angular separation between views in degrees.
      */
-    void setSepRotation(GLfloat theValue) {
+    void setSepRotation(float theValue) {
         mySepRotDegrees = theValue;
     }
 
     /**
+     * @return angle for panorama view
+     */
+    float getPanYaw() const {
+        return myPanYawZero + myPanYaw;
+    }
+
+    /**
+     * @return angle for panorama view
+     */
+    float getPanPitch() const {
+        return myPanPitchZero + myPanPitch;
+    }
+
+    /**
      * @return rotation angle in degrees.
      */
-    GLfloat getXRotate() const {
+    float getXRotate() const {
         return myXRotateDegrees;
     }
 
     /**
      * Change rotation angle in degrees.
      */
-    void setXRotate(const GLfloat theValue) {
+    void setXRotate(float theValue) {
         myXRotateDegrees = theValue;
     }
 
     /**
      * @return rotation angle in degrees.
      */
-    GLfloat getYRotate() const {
+    float getYRotate() const {
         return myYRotateDegrees;
     }
 
     /**
      * Change rotation angle in degrees.
      */
-    void setYRotate(const GLfloat theValue) {
+    void setYRotate(float theValue) {
         myYRotateDegrees = theValue;
     }
 
     /**
      * @return rotation angle in degrees.
      */
-    GLfloat getZRotate() const {
+    float getZRotate() const {
         return myZRotateZero + myZRotateDegrees;
     }
 
     /**
      * @param theAngleDegrees - rotation angle in degrees.
      */
-    void setZRotateZero(const GLfloat theAngleDegrees) {
+    void setZRotateZero(float theAngleDegrees) {
         myZRotateZero = theAngleDegrees;
     }
 
     /**
+     * Setup default rotation.
+     */
+    void setRotateZero(float theYaw, float thePitch, float theRoll) {
+        myPanYawZero   = theYaw;
+        myPanPitchZero = thePitch;
+        myZRotateZero  = theRoll;
+    }
+
+    /**
+     * @return true if rotation is not modified
+     */
+    bool isZeroRotate() const {
+        return myPanYaw == 0.0f
+            && myPanPitch == 0.0f
+            && myZRotateDegrees == 0.0f;
+    }
+
+    /**
      * @param toSwapLR set swap Left/Right flag.
      */
     void setSwapLR(const bool theToSwapLR) {
@@ -239,25 +265,31 @@
     }
 
     void moveSphere(const StGLVec2& theMoveVec) {
-        PanPhi   += theMoveVec.x();
-        PanTheta = clipPitch(PanTheta + theMoveVec.y());
+        myPanYaw += theMoveVec.x();
+        myPanPitch = clipPitch(myPanPitch + theMoveVec.y());
     }
 
-    void moveToRight(const GLfloat theDuration = 0.02f) {
+    void moveToRight(const float theDuration = 0.02f) {
         switch(ViewingMode) {
-            case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP: PanPhi += 100.0f * theDuration; break;
-            case FLAT_IMAGE:
-            default: PanCenter.x() += 0.5f * theDuration / ScaleFactor;
+            case StViewSurface_Sphere:
+            case StViewSurface_Cubemap:
+                myPanYaw += 100.0f * theDuration;
+                break;
+            case StViewSurface_Plain:
+                PanCenter.x() += 0.5f * theDuration / ScaleFactor;
+                break;
         }
     }
 
-    void moveToLeft(const GLfloat theDuration = 0.02f) {
+    void moveToLeft(const float theDuration = 0.02f) {
         switch(ViewingMode) {
-            case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP: PanPhi -= 100.0f * theDuration; break;
-            case FLAT_IMAGE:
-            default: PanCenter.x() -= 0.5f * theDuration / ScaleFactor;
+            case StViewSurface_Sphere:
+            case StViewSurface_Cubemap:
+                myPanYaw -= 100.0f * theDuration;
+                break;
+            case StViewSurface_Plain:
+                PanCenter.x() -= 0.5f * theDuration / ScaleFactor;
+                break;
         }
     }
 
@@ -273,27 +305,25 @@
         return thePitchDeg;
     }
 
-    void moveToDown(const GLfloat theDuration = 0.02f) {
+    void moveToDown(const float theDuration = 0.02f) {
         switch(ViewingMode) {
-            case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP:
-                PanTheta = clipPitch(PanTheta - 100.0f * theDuration);
+            case StViewSurface_Sphere:
+            case StViewSurface_Cubemap:
+                myPanPitch = clipPitch(myPanPitch - 100.0f * theDuration);
                 break;
-            case FLAT_IMAGE:
-            default:
+            case StViewSurface_Plain:
                 PanCenter.y() -= 0.5f * theDuration / ScaleFactor;
                 break;
         }
     }
 
-    void moveToUp(const GLfloat theDuration = 0.02f) {
+    void moveToUp(const float theDuration = 0.02f) {
         switch(ViewingMode) {
-            case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP:
-                PanTheta = clipPitch(PanTheta + 100.0f * theDuration);
+            case StViewSurface_Sphere:
+            case StViewSurface_Cubemap:
+                myPanPitch = clipPitch(myPanPitch + 100.0f * theDuration);
                 break;
-            case FLAT_IMAGE:
-            default:
+            case StViewSurface_Plain:
                 PanCenter.y() += 0.5f * theDuration / ScaleFactor;
                 break;
         }
@@ -326,8 +356,8 @@
         myZRotateDegrees = 0.0f;
         PanCenter.x() = 0.0f;
         PanCenter.y() = 0.0f;
-        PanTheta      = 0.0f;
-        PanPhi        = 0.0f;
+        myPanPitch    = 0.0f;
+        myPanYaw      = 0.0f;
         ScaleFactor   = 1.0f;
         ToSwapLR      = false;
     }
@@ -339,28 +369,30 @@
     size_t       Src2SizeX;        //!< width  of the 2nd original image
     size_t       Src2SizeY;        //!< height of the 2nd original image
 
-    ViewMode     ViewingMode;      //!< viewing mode - panorama or flat image
+    StViewSurface ViewingMode;     //!< viewing mode - panorama or flat image
     GLfloat      Timestamp;        //!< playback timestamp
 
     StFormat     StereoFormat;     //!< stereoscopic format
     bool         ToSwapLR;         //!< reverse left/right views
+    bool         ToFlipCubeZ;      //!< reverse Z-coordinate in cubemap
 
     StGLVec2     PanCenter;        //!< relative position
-    GLfloat      PanTheta;         //!< angle for panorama view
-    GLfloat      PanPhi;           //!< angle for panorama view
-
     GLfloat      ScaleFactor;      //!< scaling factor
 
         private:
 
-    GLint        mySepDxPx;        //!< horizontal    separation in pixels
-    GLint        mySepDxZeroPx;    //!< zero-parallax separation in pixels
-    GLint        mySepDyPx;        //!< vertical      separation in pixels
-    GLfloat      mySepRotDegrees;  //!< angular separation in degrees
-    GLfloat      myXRotateDegrees; //!< rotation angle in degrees
-    GLfloat      myYRotateDegrees; //!< rotation angle in degrees
-    GLfloat      myZRotateDegrees; //!< rotation angle in degrees
-    GLfloat      myZRotateZero;    //!< zero-rotation angle in degrees
+    int   mySepDxPx;        //!< horizontal    separation in pixels
+    int   mySepDxZeroPx;    //!< zero-parallax separation in pixels
+    int   mySepDyPx;        //!< vertical      separation in pixels
+    float mySepRotDegrees;  //!< angular separation in degrees
+    float myXRotateDegrees; //!< rotation angle in degrees
+    float myYRotateDegrees; //!< rotation angle in degrees
+    float myZRotateDegrees; //!< rotation angle in degrees
+    float myPanYaw;         //!< angle for panorama view
+    float myPanPitch;       //!< angle for panorama view
+    float myPanYawZero;     //!< zero-rotation angle in degrees
+    float myPanPitchZero;   //!< zero-rotation angle in degrees
+    float myZRotateZero;    //!< zero-rotation angle in degrees
 
 };

sview-17_04.tar.gz/include/StGLMesh/StGLTextureQuad.h Added

@@ -0,0 +1,80 @@
+/**
+ * Copyright © 2017 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef __StGLTextureQuad_h_
+#define __StGLTextureQuad_h_
+
+#include <StGL/StGLTexture.h>
+
+#include "StGLMesh.h"
+
+#include <StGLCore/StGLCore20.h>
+
+class StGLTextureQuad : public StGLTexture {
+
+        public:
+
+    StGLTextureQuad() : StGLTexture(GL_RGBA8) {
+        //
+    }
+
+    void stglDraw(StGLContext& theCtx) {
+        if(!isValid()) {
+            return;
+        }
+
+    #if !defined(GL_ES_VERSION_2_0)
+        theCtx.core20fwd->glDisable(GL_DEPTH_TEST);
+        theCtx.core20fwd->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        theCtx.core20fwd->glEnable(GL_BLEND);
+        theCtx.core11->glEnable(GL_TEXTURE_2D);
+
+        StGLTexture::bind(theCtx);
+
+        const StGLBoxPx aVPort = theCtx.stglViewport();
+        const int aWinSizeX = aVPort.width();
+        const int aWinSizeY = aVPort.height();
+        const GLfloat aWidth  = (aWinSizeX > 0) ?        GLfloat(getSizeX()) / GLfloat(aWinSizeX) : 1.0f;
+        const GLfloat aBottom = (aWinSizeY > 0) ? 100.0f / GLfloat(aWinSizeY) : 0.0f;
+        const GLfloat aHeight = (aWinSizeY > 0) ? 2.0f * GLfloat(getSizeY()) / GLfloat(aWinSizeY) : 1.0f;
+
+        const GLfloat aVerts[] = {
+             aWidth, -1.0f + aBottom + aHeight,
+             aWidth, -1.0f + aBottom,
+            -aWidth, -1.0f + aBottom + aHeight,
+            -aWidth, -1.0f + aBottom,
+        };
+
+        const GLfloat aTCrds[] = {
+            1.0f, 0.0f, // top-right
+            1.0f, 1.0f, // bottom-right
+            0.0f, 0.0f, // top-left
+            0.0f, 1.0f  // bottom-left
+        };
+
+        theCtx.core11->glLoadIdentity();
+
+        theCtx.core11->glEnableClientState(GL_VERTEX_ARRAY);
+        theCtx.core11->glVertexPointer(2, GL_FLOAT, 0, aVerts);
+        theCtx.core11->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        theCtx.core11->glTexCoordPointer(2, GL_FLOAT, 0, aTCrds);
+
+        theCtx.core11fwd->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+        theCtx.core11->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        theCtx.core11->glDisableClientState(GL_VERTEX_ARRAY);
+
+        StGLTexture::unbind(theCtx);
+        theCtx.core11->glDisable(GL_TEXTURE_2D);
+        theCtx.core20fwd->glDisable(GL_BLEND);
+    #endif
+    }
+
+};
+
+#endif // __StGLTextureQuad_h_

sview-16_06.tar.gz/include/StGLStereo/StGLProjCamera.h -> sview-17_04.tar.gz/include/StGLStereo/StGLProjCamera.h Changed

sview-16_06.tar.gz/include/StGLStereo/StGLStereoTexture.h -> sview-17_04.tar.gz/include/StGLStereo/StGLStereoTexture.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLDescription.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLDescription.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLImageProgram.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLImageProgram.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLImageRegion.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLImageRegion.h Changed

@@ -112,6 +112,27 @@
     ST_CPPEXPORT StHandle<StStereoParams> getSource();
 
     /**
+     * Compute the head orientation.
+     * @param theView view identifier (to apply stereo separation)
+     * @param theToApplyDefShift if TRUE the default transformation will be applied (stored in the file + 90 degrees Yaw shift)
+     */
+    ST_LOCAL StGLQuaternion getHeadOrientation(unsigned int theView,
+                                               const bool theToApplyDefShift) const {
+        StGLQuaternion anOri;
+        getHeadOrientation(anOri, theView, theToApplyDefShift);
+        return anOri;
+    }
+
+    /**
+     * Compute the head orientation.
+     * @param theView view identifier (to apply stereo separation)
+     * @param theToApplyDefShift if TRUE the default transformation will be applied (stored in the file + 90 degrees Yaw shift)
+     */
+    ST_CPPEXPORT bool getHeadOrientation(StGLQuaternion& theOrient,
+                                         unsigned int theView,
+                                         const bool theToApplyDefShift) const;
+
+    /**
      * Return true if there is any video stream.
      */
     ST_LOCAL bool hasVideoStream() { return myHasVideoStream; }
@@ -125,7 +146,8 @@
     }
 
     ST_CPPEXPORT virtual ~StGLImageRegion();
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& thePointZo) ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& thePointZo,
+                                         bool theIsPreciseInput) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool stglInit() ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool tryClick  (const StClickEvent& theEvent, bool& theIsItemClicked)   ST_ATTR_OVERRIDE;
@@ -221,16 +243,16 @@
     ST_LOCAL void doParamsModeNext(const size_t ) {
         const int aMode = params.ViewMode->getValue();
         switch(aMode) {
-            case StStereoParams::FLAT_IMAGE: {
-                params.ViewMode->setValue(StStereoParams::PANORAMA_SPHERE);
+            case StViewSurface_Plain: {
+                params.ViewMode->setValue(StViewSurface_Sphere);
                 return;
             }
-            case StStereoParams::PANORAMA_CUBEMAP: {
-                params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+            case StViewSurface_Cubemap: {
+                params.ViewMode->setValue(StViewSurface_Plain);
                 return;
             }
-            case StStereoParams::PANORAMA_SPHERE: {
-                params.ViewMode->setValue(StStereoParams::PANORAMA_CUBEMAP);
+            case StViewSurface_Sphere: {
+                params.ViewMode->setValue(StViewSurface_Cubemap);
                 return;
             }
         }
@@ -269,10 +291,10 @@
 
 
     ST_LOCAL StGLVec2 getMouseMoveFlat(const StPointD_t& theCursorZoFrom,
-                                       const StPointD_t& theCursorZoTo);
+                                       const StPointD_t& theCursorZoTo) const;
     ST_LOCAL StGLVec2 getMouseMoveSphere(const StPointD_t& theCursorZoFrom,
-                                         const StPointD_t& theCursorZoTo);
-    ST_LOCAL StGLVec2 getMouseMoveSphere();
+                                         const StPointD_t& theCursorZoTo) const;
+    ST_LOCAL StGLVec2 getMouseMoveSphere() const;
 
     ST_LOCAL void scaleAt(const StPointD_t& thePoint,
                           const float       theStep);

sview-16_06.tar.gz/include/StGLWidgets/StGLMenuItem.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLMenuItem.h Changed

@@ -46,7 +46,8 @@
 
     ST_CPPEXPORT virtual ~StGLMenuItem();
 
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo) ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                         bool theIsPreciseInput) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual void stglResize() ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool stglInit() ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
@@ -148,8 +149,9 @@
 
         protected:
 
-    ST_LOCAL void stglUpdateTextArea(const StPointD_t& theCursorZo) {
-        StGLTextArea::stglUpdate(theCursorZo);
+    ST_LOCAL void stglUpdateTextArea(const StPointD_t& theCursorZo,
+                                     bool theIsPreciseInput) {
+        StGLTextArea::stglUpdate(theCursorZo, theIsPreciseInput);
     }
 
         private: //! @name private methods
@@ -183,7 +185,8 @@
         public:
 
     ST_CPPEXPORT StGLPassiveMenuItem(StGLMenu* theParent);
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo) ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                         bool theIsPreciseInput) ST_ATTR_OVERRIDE;
 
 };

sview-16_06.tar.gz/include/StGLWidgets/StGLMsgStack.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLMsgStack.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLPlayList.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLPlayList.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLRangeFieldFloat32.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLRangeFieldFloat32.h Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -11,17 +11,22 @@
 #define __StGLRangeFieldFloat32_h_
 
 #include <StSettings/StFloat32Param.h>
-#include <StGLWidgets/StGLWidget.h>
+#include <StGLWidgets/StGLSeekBar.h>
 
 class StGLTextArea;
 
 /**
  * This is radio button for float value.
  */
-class StGLRangeFieldFloat32 : public StGLWidget {
+class StGLRangeFieldFloat32 : public StGLSeekBar {
 
         public:
 
+    enum RangeStyle {
+        RangeStyle_PlusMinus,
+        RangeStyle_Seekbar,
+    };
+
     enum FieldColor {
         FieldColor_Default,
         FieldColor_Positive,
@@ -36,11 +41,15 @@
      */
     ST_CPPEXPORT StGLRangeFieldFloat32(StGLWidget* theParent,
                                        const StHandle<StFloat32Param>& theTrackedValue,
-                                       const int theLeft = 0, const int theTop = 0,
-                                       const StGLCorner theCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+                                       int theLeft = 0, int theTop = 0,
+                                       StGLCorner theCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                                       RangeStyle theStyle = RangeStyle_PlusMinus,
+                                       int theMargin = 0);
 
     ST_CPPEXPORT virtual ~StGLRangeFieldFloat32();
     ST_CPPEXPORT virtual bool stglInit() ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglResize() ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglDraw(unsigned int theView) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool doScroll(const StScrollEvent& theEvent) ST_ATTR_OVERRIDE;
 
         public:
@@ -58,6 +67,9 @@
     ST_CPPEXPORT void doDecrement(const size_t );
     ST_CPPEXPORT void doIncrement(const size_t );
 
+    ST_CPPEXPORT void doSeekClick(const int    theMouseBtn,
+                                  const double theValue);
+
         private:
 
     ST_LOCAL void onValueChange(const float theValue);
@@ -68,6 +80,7 @@
     StGLVec3                 myColors[FieldColorNb];
     StGLTextArea*            myValueText;  //!< text area
     StString                 myFormat;     //!< value format
+    RangeStyle               myRangeStyle;
 
 };

sview-16_06.tar.gz/include/StGLWidgets/StGLRootWidget.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLRootWidget.h Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2016 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -268,16 +268,46 @@
         return myScaleGlY;
     }
 
-    inline StRectD_t getRootRectGl() const {
+    /**
+     * Return the full width of the window (including non-working area)
+     */
+    ST_LOCAL int getRootFullSizeX() const {
+        return myRectPxFull.width();
+    }
+
+    /**
+     * Return the full height of the window (including non-working area)
+     */
+    ST_LOCAL int getRootFullSizeY() const {
+        return myRectPxFull.height();
+    }
+
+    /**
+     * Return GL coordinates for entire root widget (including non-working area).
+     */
+    ST_LOCAL StRectD_t getRootRectGl() const {
         return myRectGl;
     }
 
+    /**
+     * Return GL coordinates for working area within root widget.
+     */
+    ST_LOCAL StRectD_t getRootWorkRectGl() const {
+        return myRectWorkGl;
+    }
+
     ST_LOCAL const StMarginsI& getRootMargins() const {
         return myMarginsPx;
     }
 
-    ST_LOCAL StMarginsI& changeRootMargins() {
-        return myMarginsPx;
+    /**
+     * Return scale factor to downscale the main image for VR (e.g. with HMD having great FOV),
+     * or 1.0 for normal displays.
+     */
+    ST_LOCAL double getVrZoomOut() const {
+        return myMarginsPx.top != 0
+             ? 0.74 //1.0 - double(myMarginsPx.top) / double(getRootFullSizeY())
+             : 1.0;
     }
 
     /**
@@ -303,7 +333,11 @@
      */
     ST_CPPEXPORT static size_t generateShareId();
 
-    ST_LOCAL StGLProjCamera* getCamera() {
+    ST_LOCAL const StGLProjCamera* getCamera() const {
+        return &myProjCamera;
+    }
+
+    ST_LOCAL StGLProjCamera* changeCamera() {
         return &myProjCamera;
     }
 
@@ -388,12 +422,22 @@
      * Returns mouse cursor position in GL coordinates.
      */
     ST_LOCAL const StPointD_t& getCursorZo() const {
-        return cursorZo;
+        return myCursorZo;
     }
 
     using StGLWidget::stglResize;
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo) ST_ATTR_OVERRIDE;
-    ST_CPPEXPORT virtual void stglResize(const StGLBoxPx&  theRectPx);
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                         bool theIsPreciseInput) ST_ATTR_OVERRIDE;
+
+    /**
+     * Resize root widget in sync with window.
+     * @param theViewPort new viewport (width and height)
+     * @param theMargins  new margins defining a working area
+     * @param theAspect   new aspect ratio (normally width / height)
+     */
+    ST_CPPEXPORT virtual void stglResize(const StGLBoxPx& theViewPort,
+                                         const StMarginsI& theMargins,
+                                         float theAspect);
 
     /**
      * @return viewport dimensions from bound GL context (4-indices array)
@@ -466,11 +510,13 @@
     bool                      myIsMobile;      //!< flag indicating mobile device
     StMarginsI                myMarginsPx;     //!< active area margins in pixels
     StRectD_t                 myRectGl;        //!< rectangle in GL coordinates
+    StRectD_t                 myRectWorkGl;    //!< rectangle of working area in GL coordinates
+    StRectI_t                 myRectPxFull;    //!< full rectangle (including non-working area)
     GLdouble                  myScaleGlX;      //!< scale factor to optimize convertion from Pixels -> GL coordinates
     GLdouble                  myScaleGlY;      //!< scale factor to optimize convertion from Pixels -> GL coordinates
     GLfloat                   myScaleGUI;      //!< scale factor for GUI elements (text, icons), 1.0 by default
     unsigned int              myResolution;    //!< resolution in DPI (for text rendering), 72 by default, stored with myScaleGUI applied
-    StPointD_t                cursorZo;        //!< mouse cursor position
+    StPointD_t                myCursorZo;      //!< mouse cursor position
     GLint                     myViewport[4];   //!< cached GL viewport
 
     StArrayList<StGLWidget*>  myDestroyList;   //!< list of widgets to be destroyed

sview-16_06.tar.gz/include/StGLWidgets/StGLScrollArea.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLScrollArea.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLSeekBar.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLSeekBar.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLSubtitles.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLSubtitles.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLTextArea.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLTextArea.h Changed

sview-16_06.tar.gz/include/StGLWidgets/StGLTextureButton.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLTextureButton.h Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -15,6 +15,8 @@
 #include <StGL/StGLVertexBuffer.h>
 #include <StGL/StGLTexture.h>
 
+class StAction;
+
 /**
  * Widget of the clickable button with image face.
  */
@@ -44,6 +46,16 @@
     ST_CPPEXPORT virtual ~StGLTextureButton();
 
     /**
+     * Return action to be triggered on button click.
+     */
+    ST_LOCAL const StHandle<StAction>& getAction() const { return myAction; }
+
+    /**
+     * Set action to be triggered on button click.
+     */
+    ST_CPPEXPORT void setAction(const StHandle<StAction>& theAction);
+
+    /**
      * Return scale factor to be applied to the widget opacity, 1.0 by default.
      */
     ST_LOCAL float getOpacityScale() const { return myOpacityScale; }
@@ -111,7 +123,8 @@
     ST_CPPEXPORT virtual void stglResize() ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool stglInit() ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual void stglDraw  (unsigned int theView) ST_ATTR_OVERRIDE;
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo) ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                         bool theIsPreciseInput) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool tryClick  (const StClickEvent& theEvent, bool& theIsItemClicked)   ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool tryUnClick(const StClickEvent& theEvent, bool& theIsItemUnclicked) ST_ATTR_OVERRIDE;
     ST_CPPEXPORT virtual bool doScroll(const StScrollEvent& theEvent) ST_ATTR_OVERRIDE;
@@ -150,6 +163,7 @@
 
         protected:
 
+    StHandle<StAction>         myAction;       //!< action on button click
     StGLVertexBuffer           myVertBuf;      //!< vertices VBO
     StGLVertexBuffer           myTCrdBuf;      //!< texture coordinates VBO
     StGLVec4                   myColor;        //!< button color for alpha-textures

sview-16_06.tar.gz/include/StGLWidgets/StGLWidget.h -> sview-17_04.tar.gz/include/StGLWidgets/StGLWidget.h Changed

@@ -1,6 +1,6 @@
 /**
  * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2017 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -83,18 +83,18 @@
     /**
      * @return root (absolute parent) widget
      */
-    inline StGLRootWidget* getRoot() {
+    ST_LOCAL StGLRootWidget* getRoot() {
         return myRoot;
     }
 
     /**
      * @return parent widget (one level up)
      */
-    inline StGLWidget* getParent() {
+    ST_LOCAL StGLWidget* getParent() {
         return myParent;
     }
 
-    inline StGLWidgetList* getChildren() {
+    ST_LOCAL StGLWidgetList* getChildren() {
         return &myChildren;
     }
 
@@ -109,7 +109,7 @@
     /**
      * @return link to previous item in the list
      */
-    inline StGLWidget* getPrev() {
+    ST_LOCAL StGLWidget* getPrev() {
         return myPrev;
     }
 
@@ -121,7 +121,7 @@
     /**
      * @return link to next item in the list
      */
-    inline StGLWidget* getNext() {
+    ST_LOCAL StGLWidget* getNext() {
         return myNext;
     }
 
@@ -133,14 +133,14 @@
     /**
      * @return true if this item not first in the list
      */
-    inline bool hasPrev() const {
+    ST_LOCAL bool hasPrev() const {
         return myPrev != NULL;
     }
 
     /**
      * @return true if this item not last in the list
      */
-    inline bool hasNext() const {
+    ST_LOCAL bool hasNext() const {
         return myNext != NULL;
     }
 
@@ -180,7 +180,7 @@
      * @return rectangle
      */
     ST_LOCAL const StRectI_t& getRectPx() const {
-        return rectPx;
+        return myRectPx;
     }
 
     /**
@@ -188,7 +188,7 @@
      */
     ST_LOCAL void setRectPx(const StRectI_t& theRectPx) {
         myIsResized = true;
-        this->rectPx = theRectPx;
+        myRectPx = theRectPx;
     }
 
     /**
@@ -197,7 +197,7 @@
      */
     ST_LOCAL StRectI_t& changeRectPx() {
         myIsResized = true;
-        return rectPx;
+        return myRectPx;
     }
 
     /**
@@ -269,7 +269,7 @@
     /**
      * @return true if widget can process input events
      */
-    inline bool isTopWidget() const {
+    ST_LOCAL bool isTopWidget() const {
         return myIsTopWidget;
     }
 
@@ -278,14 +278,14 @@
      * @param theMouseBtn mouse button id
      * @return isClicked
      */
-    ST_CPPEXPORT bool isClicked(const int& theMouseBtn) const;
+    ST_CPPEXPORT bool isClicked(int theMouseBtn) const;
 
     /**
      * Change clicking state.
      * @param theMouseBtn mouse button id
      * @param isClicked.
      */
-    ST_CPPEXPORT void setClicked(const int& theMouseBtn, bool isClicked);
+    ST_CPPEXPORT void setClicked(int theMouseBtn, bool isClicked);
 
     /**
      * Function iterate children and self to change clicking state.
@@ -352,7 +352,8 @@
      * Update parameters.
      * @param theCursorZo mouse cursor
      */
-    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo);
+    ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& theCursorZo,
+                                         bool theIsPreciseInput);
 
     /**
      * Update widget and sub-widgets according to new backing store dimensions.
@@ -373,15 +374,15 @@
     /**
      * @return user-defined data
      */
-    inline size_t getUserData() const {
-        return userData;
+    ST_LOCAL size_t getUserData() const {
+        return myUserData;
     }
 
     /**
      * @param userData user-defined data
      */
-    inline void setUserData(const size_t theUserData) {
-        this->userData = theUserData;
+    ST_LOCAL void setUserData(const size_t theUserData) {
+        myUserData = theUserData;
     }
 
     /**
@@ -434,7 +435,12 @@
     /**
      * Returns link to the projection camera from root widget.
      */
-    ST_CPPEXPORT StGLProjCamera* getCamera();
+    ST_CPPEXPORT const StGLProjCamera* getCamera() const;
+
+    /**
+     * Returns link to the projection camera from root widget.
+     */
+    ST_CPPEXPORT StGLProjCamera* changeCamera();
 
     /**
      * @return OpenGL context from root widget.
@@ -450,10 +456,10 @@
     StGLWidget*     myPrev;          //!< previous item in array
     StGLWidget*     myNext;          //!< next item in array
 
-    size_t          userData;        //!< user-defined data
-    StRectI_t       rectPx;          //!< area coordinates in pixels
+    size_t          myUserData;      //!< user-defined data
+    StRectI_t       myRectPx;        //!< area coordinates in pixels
     StMarginsI      myMargins;       //!< extra margins before main content of the widget (text, image, etc.)
-    bool mouseClicked[ST_MOUSE_MAX_ID + 1]; // mouse clicking state
+    bool myMouseClicked[ST_MOUSE_MAX_ID + 1]; //!< mouse clicking state
 
         protected: //! @name fields available to inheritors
 
@@ -473,9 +479,9 @@
         public: //! @name public methods
 
     ST_CPPEXPORT StGLContainer(StGLWidget* theParent,
-                               const int   theLeft = 32, const int    theTop = 32,
-                               const StGLCorner theCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
-                               const int  theWidth = 32, const int theHeight = 32);
+                               int theLeft = 32,  int theTop = 32,
+                               StGLCorner theCorner = StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                               int theWidth = 32, int theHeight = 32);
 
     ST_CPPEXPORT virtual ~StGLContainer();

sview-16_06.tar.gz/include/StImage/StDevILImage.h -> sview-17_04.tar.gz/include/StImage/StDevILImage.h Changed

sview-16_06.tar.gz/include/StImage/StFreeImage.h -> sview-17_04.tar.gz/include/StImage/StFreeImage.h Changed

sview-16_06.tar.gz/include/StImage/StImageFile.h -> sview-17_04.tar.gz/include/StImage/StImageFile.h Changed

@@ -117,16 +117,31 @@
     ///virtual size_t getFramesCount() const = 0;
 
     /**
+     * Load the image from specified source.
+     * @param theFilePath  path to the file
+     * @param theImageType image type, should be set for files with undefined extension (mpo/jps/pns...)
+     * @param theDataPtr   data in the memory, image will be read from file if this data empty
+     * @param theDataSize  size of data in memory
+     * @return true on success
+     */
+    bool load(const StString& theFilePath,
+              ImageType theImageType = ST_TYPE_NONE,
+              uint8_t* theDataPtr = NULL, int theDataSize = 0) { return loadExtra(theFilePath, theImageType, theDataPtr, theDataSize, false); }
+
+    /**
      * This virtual function should be implemented by inheritors.
-     * @param theFilePath (const StString& ) path to the file;
-     * @param theImageType (int ) image type, should be set for files with undefined extension (mpo/jps/pns...);
-     * @param theDataPtr (uint8_t* ) data in the memory, image will be read from file if this data empty;
-     * @param theDataSize (int ) size of data in memory;
-     * @return true on success.
+     * @param theFilePath  path to the file
+     * @param theImageType image type, should be set for files with undefined extension (mpo/jps/pns...)
+     * @param theDataPtr   data in the memory, image will be read from file if this data empty
+     * @param theDataSize  size of data in memory
+     * @param theIsOnlyRGB option to convert YUV image data into RGB format
+     * @return true on success
      */
-    virtual bool load(const StString& theFilePath,
-                      ImageType theImageType = ST_TYPE_NONE,
-                      uint8_t* theDataPtr = NULL, int theDataSize = 0) = 0;
+    virtual bool loadExtra(const StString& theFilePath,
+                           ImageType       theImageType,
+                           uint8_t*        theDataPtr,
+                           int             theDataSize,
+                           bool            theIsOnlyRGB) = 0;
 
     /**
      * Close the file after it was opened with read() method.

sview-16_06.tar.gz/include/StImage/StJpegParser.h -> sview-17_04.tar.gz/include/StImage/StJpegParser.h Changed

sview-16_06.tar.gz/include/StImage/StWebPImage.h -> sview-17_04.tar.gz/include/StImage/StWebPImage.h Changed

sview-16_06.tar.gz/include/StSettings/StFloat32Param.h -> sview-17_04.tar.gz/include/StSettings/StFloat32Param.h Changed

@@ -26,6 +26,8 @@
     : StParam<float>(theValue),
       myMinValue(-1E+37f),
       myMaxValue( 1E+37f),
+      myEffMinValue(-1E+37f),
+      myEffMaxValue(-1E+37f),
       myDefValue(0.0f),
       myValueStep(1.0f),
       myTolerance(0.0001f),
@@ -41,6 +43,8 @@
     : StParam<float>(theValue),
       myMinValue(-1E+37f),
       myMaxValue( 1E+37f),
+      myEffMinValue(-1E+37f),
+      myEffMaxValue(-1E+37f),
       myDefValue(0.0f),
       myValueStep(1.0f),
       myTolerance(0.0001f) {
@@ -59,6 +63,8 @@
     : StParam<float>(theValue),
       myMinValue(theMinValue),
       myMaxValue(theMaxValue),
+      myEffMinValue(theMinValue),
+      myEffMaxValue(theMaxValue),
       myDefValue(theDefValue),
       myValueStep(theStep),
       myTolerance(theTolerance) {
@@ -105,6 +111,7 @@
      */
     ST_LOCAL void setMinValue(float theValue) {
         myMinValue = theValue;
+        myEffMinValue = theValue;
     }
 
     /**
@@ -126,6 +133,7 @@
      */
     ST_LOCAL void setMaxValue(float theValue) {
         myMaxValue = theValue;
+        myEffMaxValue = theValue;
     }
 
     /**
@@ -135,6 +143,31 @@
                                   float theMaxValue) {
         myMinValue = theMinValue;
         myMaxValue = theMaxValue;
+        myEffMinValue = theMinValue;
+        myEffMaxValue = theMaxValue;
+    }
+
+    /**
+     * Return minimum effective value (can be greater then minimum allowed value).
+     */
+    ST_LOCAL float getEffectiveMinValue() const {
+        return myEffMinValue;
+    }
+
+    /**
+     * Return maximum effective value (can be less then maximum allowed value).
+     */
+    ST_LOCAL float getEffectiveMaxValue() const {
+        return myEffMaxValue;
+    }
+
+    /**
+     * Set effective minimum and maximum allowed values.
+     */
+    ST_LOCAL void setEffectiveMinMaxValues(float theMinValue,
+                                           float theMaxValue) {
+        myEffMinValue = theMinValue;
+        myEffMaxValue = theMaxValue;
     }
 
     /**
@@ -268,26 +301,35 @@
      * Return value within 0..1 range (taking into account min/max values).
      */
     ST_LOCAL float getNormalizedValue() const {
-        return (getValue() - myMinValue) / (myMaxValue - myMinValue);
+        return (getValue() - myEffMinValue) / (myEffMaxValue - myEffMinValue);
     }
 
     /**
      * Setup value within 0..1 range (to be scaled according to min/max values).
      */
-    ST_LOCAL bool setNormalizedValue(const float theValue) {
-        return setValue(myMinValue + theValue * (myMaxValue - myMinValue));
+    ST_LOCAL bool setNormalizedValue(float theValue,
+                                     bool  theToRoundToStep = false) {
+        float aValue = myEffMinValue + theValue * (myEffMaxValue - myEffMinValue);
+        if(theToRoundToStep) {
+            aValue = aValue >= 0.0
+                   ? (std::floor(aValue / myValueStep + 0.5f) * myValueStep)
+                   : (std::ceil (aValue / myValueStep + 0.5f) * myValueStep);
+        }
+        return setValue(aValue);
     }
 
         protected:
 
-    float    myMinValue;  //!< minimal allowed value
-    float    myMaxValue;  //!< maximal allowed value
-    float    myDefValue;  //!< default value
-    float    myValueStep; //!< default increment step
-    float    myTolerance; //!< tolerance for equality check
+    float    myMinValue;    //!< minimal allowed value
+    float    myMaxValue;    //!< maximal allowed value
+    float    myEffMinValue; //!< effective minimal allowed value
+    float    myEffMaxValue; //!< effective maximal allowed value
+    float    myDefValue;    //!< default value
+    float    myValueStep;   //!< default increment step
+    float    myTolerance;   //!< tolerance for equality check
 
-    StString myParamKey;  //!< parameter key (id)
-    StString myParamName; //!< parameter name (label)
+    StString myParamKey;    //!< parameter key (id)
+    StString myParamName;   //!< parameter name (label)
 
 };

sview-16_06.tar.gz/include/StSys/StSys.h -> sview-17_04.tar.gz/include/StSys/StSys.h Changed

sview-17_04.tar.gz/include/StTemplates/StArrayStreamBuffer.h Added

@@ -0,0 +1,156 @@
+/**
+ * Copyright © 2016 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef __StArrayStreamBuffer_h__
+#define __StArrayStreamBuffer_h__
+
+#include <stTypes.h>
+
+#include <fstream>
+
+/**
+ * Custom buffer for streaming from allocated memory.
+ */
+class StArrayStreamBuffer : public std::streambuf {
+
+        public:
+
+    //! Main constructor.
+    StArrayStreamBuffer(const char*  theBegin,
+                        const size_t theSize)
+    : myBegin  (theBegin),
+      myEnd    (theBegin + theSize),
+      myCurrent(theBegin) {}
+
+        private:
+
+    /**
+     * Get character on underflow.
+     * Virtual function called by other member functions to get the current character
+     * in the controlled input sequence without changing the current position.
+     */
+    virtual int_type underflow() ST_ATTR_OVERRIDE {
+        if(myCurrent == myEnd) {
+            return traits_type::eof();
+        }
+
+        return traits_type::to_int_type(*myCurrent);
+    }
+
+    /**
+     * Get character on underflow and advance position.
+     * Virtual function called by other member functions to get the current character
+     * in the controlled input sequence and then advance the position indicator to the next character.
+     */
+    virtual int_type uflow() ST_ATTR_OVERRIDE {
+        if(myCurrent == myEnd) {
+            return traits_type::eof();
+        }
+
+        return traits_type::to_int_type(*myCurrent++);
+    }
+
+    /**
+     * Put character back in the case of backup underflow.
+     * Virtual function called by other member functions to put a character back
+     * into the controlled input sequence and decrease the position indicator.
+     */
+    virtual int_type pbackfail(int_type ch) ST_ATTR_OVERRIDE {
+        if(myCurrent == myBegin
+        || (ch != traits_type::eof()
+         && ch != myCurrent[-1])) {
+            return traits_type::eof();
+        }
+
+        return traits_type::to_int_type(*--myCurrent);
+    }
+
+    /**
+     * Get number of characters available.
+     * Virtual function (to be read s-how-many-c) called by other member functions
+     * to get an estimate on the number of characters available in the associated input sequence.
+     */
+    virtual std::streamsize showmanyc() ST_ATTR_OVERRIDE {
+        if(myCurrent > myEnd) {
+            // assert
+        }
+        return myEnd - myCurrent;
+    }
+
+    /**
+     * Seek to specified position.
+     */
+    virtual std::streampos seekoff(std::streamoff theOff,
+                                   std::ios_base::seekdir theWay,
+                                   std::ios_base::openmode theWhich) ST_ATTR_OVERRIDE {
+        switch(theWay) {
+            case std::ios_base::beg: {
+                myCurrent = myBegin + theOff;
+                if(myCurrent >= myEnd) {
+                    myCurrent = myEnd;
+                }
+                break;
+            }
+            case std::ios_base::cur: {
+                myCurrent += theOff;
+                if(myCurrent >= myEnd) {
+                    myCurrent = myEnd;
+                }
+                break;
+            }
+            case std::ios_base::end: {
+                myCurrent = myEnd - theOff;
+                if(myCurrent < myBegin) {
+                    myCurrent = myBegin;
+                }
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+        (void )theWhich;
+        return myCurrent - myBegin;
+    }
+
+        public:
+
+    /**
+     * Read a bunch of bytes at once.
+     */
+    virtual std::streamsize xsgetn(char* thePtr,
+                                   std::streamsize theCount) ST_ATTR_OVERRIDE {
+        const char* aCurrent = myCurrent + theCount;
+        if(aCurrent >= myEnd) {
+            aCurrent = myEnd;
+        }
+        size_t aCopied = aCurrent - myCurrent;
+        if(aCopied == 0) {
+            return 0;
+        }
+        memcpy(thePtr, myCurrent, aCopied);
+        myCurrent = aCurrent;
+        return aCopied;
+    }
+
+        private:
+
+    // copying is not allowed
+    StArrayStreamBuffer           (const StArrayStreamBuffer& );
+    StArrayStreamBuffer& operator=(const StArrayStreamBuffer& );
+
+        private:
+
+    const char* const myBegin;
+    const char* const myEnd;
+    const char* myCurrent;
+
+};
+
+
+#endif // __StArrayStreamBuffer_h__

sview-16_06.tar.gz/include/StTemplates/StQuaternion.h -> sview-17_04.tar.gz/include/StTemplates/StQuaternion.h Changed

@@ -75,6 +75,24 @@
     Element_t w() const { return myV.w(); }
 
     /**
+     * Rotate vector by quaternion as rotation operator.
+     */
+    StVec3<Element_t> multiply(const StVec3<Element_t>& theVec) const {
+        StQuaternion aRot(theVec.x() * w() + theVec.z() * y() - theVec.y() * z(),
+                          theVec.y() * w() + theVec.x() * z() - theVec.z() * x(),
+                          theVec.z() * w() + theVec.y() * x() - theVec.x() * y(),
+                          theVec.x() * x() + theVec.y() * y() + theVec.z() * z());
+        return StVec3<Element_t>(w() * aRot.x() + x() * aRot.w() + y() * aRot.z() - z() * aRot.y(),
+                                 w() * aRot.y() + y() * aRot.w() + z() * aRot.x() - x() * aRot.z(),
+                                 w() * aRot.z() + z() * aRot.w() + x() * aRot.y() - y() * aRot.x()) * (Element_t(1) / squareNorm());
+    }
+
+    /**
+     * Rotate vector by quaternion as rotation operator.
+     */
+    StVec3<Element_t> operator*(const StVec3<Element_t>& theVec) const { return multiply(theVec); }
+
+    /**
      * Multiply two quaternions (e.g. rotate object by theQ2 and then by theQ1 - order is important!).
      */
     static StQuaternion multiply(const StQuaternion& theQ1,
@@ -85,6 +103,122 @@
                             theQ1.w() * theQ2.w() - theQ1.x() * theQ2.x() - theQ1.y() * theQ2.y() - theQ1.z() * theQ2.z());
     }
 
+    /**
+     * Initialize the quaternion from 3x3 rotation matrix.
+     */
+    void setMatrix(const Element_t theMat[3][3]) {
+        Element_t aTrace = theMat[0][0] + theMat[1][1] + theMat[2][2];
+        if(aTrace > 0.0) {
+            // if trace positive than "w" is biggest component
+            myV.x() = theMat[1][2] - theMat[2][1];
+            myV.y() = theMat[2][0] - theMat[0][2];
+            myV.z() = theMat[0][1] - theMat[1][0];
+            myV.w() = aTrace + Element_t(1);
+            scale(Element_t(0.5) / std::sqrt(w())); // "w" contain the "norm * 4"
+        } else if((theMat[0][0] > theMat[1][1])
+               && (theMat[0][0] > theMat[2][2])) {
+            // some of vector components is bigger
+            myV.x() = Element_t(1) + theMat[0][0] - theMat[1][1] - theMat[2][2];
+            myV.y() = theMat[1][0] + theMat[0][1];
+            myV.z() = theMat[2][0] + theMat[0][2];
+            myV.w() = theMat[1][2] - theMat[2][1];
+            scale(Element_t(0.5) / std::sqrt(x()));
+        } else if(theMat[1][1] > theMat[2][2]) {
+            myV.x() = theMat[1][0] + theMat[0][1];
+            myV.y() = Element_t(1) + theMat[1][1] - theMat[0][0] - theMat[2][2];
+            myV.z() = theMat[2][1] + theMat[1][2];
+            myV.w() = theMat[2][0] - theMat[0][2];
+            scale(Element_t(0.5) / std::sqrt(y()));
+        } else {
+            myV.x() = theMat[2][0] + theMat[0][2];
+            myV.y() = theMat[2][1] + theMat[1][2];
+            myV.z() = Element_t(1) + theMat[2][2] - theMat[0][0] - theMat[1][1];
+            myV.w() = theMat[0][1] - theMat[1][0];
+            scale(Element_t(0.5) / std::sqrt(z()));
+        }
+    }
+
+    /**
+     * Return square norm of quaternion.
+     */
+    Element_t squareNorm() const {
+        return x() * x() + y() * y() + z() * z() + w() * w();
+    }
+
+    /**
+     * Return norm of quaternion.
+     */
+    Element_t norm() const {
+        return std::sqrt(squareNorm());
+    }
+
+    /**
+     * Scale quaternion that its norm goes to 1.
+     * The appearing of 0 magnitude or near is a error, so we can be sure that can divide by magnitude
+     */
+    void normalize() {
+        Element_t aMagn = norm();
+        if(aMagn == Element_t(0)) {
+            stabilizeLength();
+            aMagn = norm();
+        }
+        scale(Element_t(1) / aMagn);
+    }
+
+    /**
+     * Stabilize quaternion length within 1 - 1/4.
+     * This operation is a faster than normalization and preserve length goes to 0 or infinity.
+     */
+    void stabilizeLength() {
+        Element_t aCs = std::abs(x()) + std::abs(y()) + std::abs(z()) + std::abs(w());
+        if(aCs > Element_t(0)) {
+            myV.x() /= aCs;
+            myV.y() /= aCs;
+            myV.z() /= aCs;
+            myV.w() /= aCs;
+        } else {
+            setIdent();
+        }
+    }
+
+    /**
+     * Make identity quaternion (zero-rotation).
+     */
+    void setIdent() {
+        myV.x() = myV.y() = myV.z() = Element_t(0);
+        myV.w() = Element_t(1);
+    }
+
+    /**
+     * Reverse direction of rotation (conjugate quaternion)
+     */
+    void reverse() {
+        myV.x() = -myV.x();
+        myV.y() = -myV.y();
+        myV.z() = -myV.z();
+    }
+
+    /**
+     * Return rotation with reversed direction (conjugated quaternion)
+     */
+    StQuaternion reversed() const {
+        StQuaternion aCopy(*this);
+        aCopy.reverse();
+        return aCopy;
+    }
+
+        private:
+
+    /**
+     * Apply scale factor.
+     */
+    inline void scale(const Element_t theScale) {
+        myV.x() *= theScale;
+        myV.y() *= theScale;
+        myV.z() *= theScale;
+        myV.w() *= theScale;
+    }
+
         private:
 
     StVec4<Element_t> myV;

sview-16_06.tar.gz/include/StTemplates/StVec2.h -> sview-17_04.tar.gz/include/StTemplates/StVec2.h Changed

sview-16_06.tar.gz/include/StTemplates/StVec3.h -> sview-17_04.tar.gz/include/StTemplates/StVec3.h Changed

sview-16_06.tar.gz/include/StTemplates/StVec4.h -> sview-17_04.tar.gz/include/StTemplates/StVec4.h Changed

@@ -141,6 +141,28 @@
     operator Element_t*() { return v; }
 
     /**
+     * Check this vector with another vector for equality (without tolerance!).
+     */
+    bool isEqual(const StVec4& theOther) const {
+        return v[0] == theOther.v[0]
+            && v[1] == theOther.v[1]
+            && v[2] == theOther.v[2]
+            && v[3] == theOther.v[3];
+    }
+
+    /**
+     * Check this vector with another vector for equality (without tolerance!).
+     */
+    bool operator==(const StVec4& theOther)       { return isEqual(theOther); }
+    bool operator==(const StVec4& theOther) const { return isEqual(theOther); }
+
+    /**
+     * Check this vector with another vector for non-equality (without tolerance!).
+     */
+    bool operator!=(const StVec4& theOther)       { return !isEqual(theOther); }
+    bool operator!=(const StVec4& theOther) const { return !isEqual(theOther); }
+
+    /**
      * Compute per-component summary.
      */
     StVec4& operator+=(const StVec4& add) {

sview-16_06.tar.gz/include/StThreads/StThread.h -> sview-17_04.tar.gz/include/StThreads/StThread.h Changed

@@ -69,14 +69,10 @@
      * Returns the CPU architecture used to build the program (may not match the system).
      */
     ST_LOCAL static const char* getArchString() {
-    #if defined(__arm__) || defined(__arm64__)
-        #if defined(__ARM_ARCH_8A__)
-            #if defined(__LP64__)
-                return "ARMv8-A 64-bit";
-            #else
-                return "ARMv8-A 32-bit";
-            #endif
-        #elif defined(__ARM_ARCH_7A__)
+    #if defined(__aarch64__) && defined(__LP64__)
+        return "AArch64 64-bit";
+    #elif defined(__arm__) || defined(__arm64__)
+        #if defined(__ARM_ARCH_7A__)
             return "ARMv7-A 32-bit";
         #elif defined(__ARM_ARCH_7R__)
             return "ARMv7-R 32-bit";
@@ -158,6 +154,12 @@
     ST_CPPEXPORT bool wait();
 
     /**
+     * Wait for thread return with specified timeout.
+     * Warning - timeout is supported only on Windows!
+     */
+    ST_CPPEXPORT bool wait(const int theTimeMilliseconds);
+
+    /**
      *  This is a dangerous function that should only be used in the most extreme case!
      */
     ST_CPPEXPORT void kill();

sview-16_06.tar.gz/include/stTypes.h -> sview-17_04.tar.gz/include/stTypes.h Changed

@@ -27,7 +27,9 @@
  */
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
     //#define _USE_ATTRIBUTES_FOR_SAL 1 // doesn't work without /analyze option!
-    #include <CodeAnalysis/SourceAnnotations.h>
+    #if (_MSC_VER < 1900)
+      #include <CodeAnalysis/SourceAnnotations.h>
+    #endif
     //#define ST_ATTR_CHECK_RETURN [returnvalue:vc_attributes::Post(MustCheck=vc_attributes::Yes)]
     //#include <sal.h>
     #define ST_ATTR_CHECK_RETURN _Check_return_
@@ -61,10 +63,11 @@
 #endif
 
 #include <cmath>       // fabs
+#include <cfloat>
 #include <cstddef>     // size_t, NULL
 #include <cstdlib>
 #include <cstring>     // for memcpy
-#if !defined(__arm__) && !defined(__arm__)
+#if defined(__i386) || defined(__x86_64) || defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64)
     #include <xmmintrin.h> // for memory alignment
 #endif
 #include <stdio.h>     // for _snprintf on MinGW
@@ -131,7 +134,7 @@
 #endif
 
 /**
- * Mordern compilers provide fixed-size primitives like int32_t.
+ * Modern compilers provide fixed-size primitives like int32_t.
  * Some developers can use these types in function overloads
  * to logically cover all variations depending on primitive size.
  * However some language primitives can recall to the same
@@ -428,8 +431,8 @@
  *  - ST_CIMPORT   Import symbol, C-style
  *  - ST_CPPEXPORT Export symbol, C++-style (with name decorations)
  *  - ST_CPPIMPORT Import symbol, C++-style
- *  - ST_EXPORT    Depricated macro, alias to ST_CEXPORT
- *  - ST_IMPORT    Depricated macro, alias to ST_CIXPORT
+ *  - ST_EXPORT    Deprecated macro, alias to ST_CEXPORT
+ *  - ST_IMPORT    Deprecated macro, alias to ST_CIXPORT
  *
  * Notice that function/class definition without extra specifiers
  * leads to different behaviour on different platforms!
@@ -437,7 +440,7 @@
  *  - On Linux (and others), symbol considered for export
  *
  * On Windows exported and imported symbols should be marked with different specifiers
- * which leads to extra comlications in library headers
+ * which leads to extra complications in library headers
  * (library should be build with export specifier whilst
  * application based on it should see import specifier).
  * However C++ method could be marked as "exported" in both cases.
@@ -540,6 +543,19 @@
     return isOddNumber(number) ? (number + 1) : number;
 }
 
+namespace st {
+    /**
+     * Return true for NaN.
+     */
+    inline bool isNaN(double theValue) {
+    #if defined(_MSC_VER)
+        return ::_isnan(theValue) != 0;
+    #else
+        return std::isnan(theValue);
+    #endif
+    }
+}
+
 #include <StTemplates/StTemplates.h> // include commonly-used templates
 
 /**

sview-16_06.tar.gz/sview/AndroidManifest.xml -> sview-17_04.tar.gz/sview/AndroidManifest.xml Changed

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.sview"
-          android:versionCode="12"
-          android:versionName="16.03">
+          android:versionCode="16"
+          android:versionName="16.12"
+          android:installLocation="auto">
     <application android:label="@string/app_name"
                  android:hasCode="true"
                  android:icon="@drawable/ic_launcher">
@@ -223,6 +224,7 @@
             </intent-filter>
         </activity>
         
+        <activity android:name="com.sview.CrashReportActivity" android:label="@string/app_crash_name" android:configChanges="orientation|keyboardHidden"><intent-filter><action android:name="android.intent.action.MAIN" /><category android:name="android.intent.category.DEFAULT" /></intent-filter></activity>
     </application>
 
     <uses-sdk android:minSdkVersion="15" />

sview-16_06.tar.gz/sview/Contents/Info.plist -> sview-17_04.tar.gz/sview/Contents/Info.plist Changed

sview-16_06.tar.gz/sview/Resources/English.lproj/MainMenu.xib -> sview-17_04.tar.gz/sview/Resources/English.lproj/MainMenu.xib Changed

sview-16_06.tar.gz/sview/res/values/strings.xml -> sview-17_04.tar.gz/sview/res/values/strings.xml Changed

sview-17_04.tar.gz/sview/src/com/sview/CrashReportActivity.java Added

@@ -0,0 +1,46 @@
+/**
+ * This is source code for sView
+ *
+ * Copyright © Kirill Gavrilov, 2017
+ */
+package com.sview;
+
+import android.app.Activity;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.text.method.ScrollingMovementMethod;
+import android.widget.TextView;
+import android.os.Bundle;
+
+/**
+ * sView Crash Report activity.
+ */
+public class CrashReportActivity extends Activity {
+
+	public static final String THE_ERROR_REPORT_ID = "ERROR_REPORT";
+
+    @Override
+    public void onCreate(Bundle theSavedInstanceState) {
+        super.onCreate(theSavedInstanceState);
+
+        // create folder for external storage
+        myContext = new ContextWrapper(this);
+        myContext.getExternalFilesDir(null);
+
+        Intent anIntent = getIntent();
+        Bundle anExtras = anIntent != null ? getIntent().getExtras() : null;
+        String anErrorText = "";
+        if(anExtras != null) {
+            anErrorText = anExtras.getString(THE_ERROR_REPORT_ID);
+        }
+
+        myTextView = new TextView(this);
+        myTextView.setMovementMethod(new ScrollingMovementMethod());
+        myTextView.setText("sView Crash Report: " + anErrorText);
+        setContentView(myTextView);
+    }
+
+    private TextView       myTextView;
+    private ContextWrapper myContext;
+
+}

sview-16_06.tar.gz/sview/src/com/sview/StActivity.java -> sview-17_04.tar.gz/sview/src/com/sview/StActivity.java Changed

@@ -1,7 +1,7 @@
 /**
  * This is source code for sView
  *
- * Copyright © Kirill Gavrilov, 2014-2016
+ * Copyright © Kirill Gavrilov, 2014-2017
  */
 package com.sview;
 
@@ -47,6 +47,11 @@
         });
         AlertDialog aDialog = aBuilder.create();
         aDialog.show();
+
+        Intent anIntent = new Intent(theActivity, CrashReportActivity.class);
+        anIntent.putExtra(CrashReportActivity.THE_ERROR_REPORT_ID, theError);
+        anIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        theActivity.startActivity(anIntent);
     }
 
     /**
@@ -89,11 +94,11 @@
         if(!loadLibVerbose("gnustl_shared",   theInfo)
         //|| !loadLibVerbose("config++",        theInfo)
         || !loadLibVerbose("freetype",        theInfo)
-        || !loadLibVerbose("avutil-55",       theInfo)
-        || !loadLibVerbose("swresample-2",    theInfo)
-        || !loadLibVerbose("avcodec-57",      theInfo)
-        || !loadLibVerbose("avformat-57",     theInfo)
-        || !loadLibVerbose("swscale-4",       theInfo)
+        || !loadLibVerbose("avutil",          theInfo)
+        || !loadLibVerbose("swresample",      theInfo)
+        || !loadLibVerbose("avcodec",         theInfo)
+        || !loadLibVerbose("avformat",        theInfo)
+        || !loadLibVerbose("swscale",         theInfo)
         || !loadLibVerbose("openal",          theInfo)
         || !loadLibVerbose("StShared",        theInfo)
         || !loadLibVerbose("StGLWidgets",     theInfo)
@@ -115,6 +120,16 @@
         return true;
     }
 
+    /**
+     * Define device Left/Right eyes swap flag.
+     * Considering this flag depends on device output implementation.
+     */
+    public void setSwapEyes(boolean theToSwap) {
+        if(myCppGlue != 0) {
+            cppSetSwapEyes(myCppGlue, theToSwap);
+        }
+    }
+
 //endregion
 
 //region Overridden methods of NativeActivity class
@@ -140,7 +155,21 @@
             myIsPoorOri = mySensorMgr.getDefaultSensor(Sensor.TYPE_GYROSCOPE) == null;
         }
         myS3dvSurf = new StS3dvSurface();
-        super.onCreate(theSavedInstanceState);
+
+        try {
+            super.onCreate(theSavedInstanceState);
+        } catch(java.lang.UnsatisfiedLinkError theError) {
+            anInfo.append("Error: native library is unavailable:\n  " + theError.getMessage());
+            StActivity.exitWithError(this, "Broken apk?\n" + anInfo);
+        } catch(SecurityException theError) {
+            anInfo.append("Error: native library can not be loaded for security reasons:\n  " + theError.getMessage());
+            StActivity.exitWithError(this, "Broken apk?\n" + anInfo);
+        } catch(Exception theError) {
+            anInfo.append("Error: unhandled exception:\n  " + theError.getMessage());
+            StActivity.exitWithError(this, "Broken apk?\n" + anInfo);
+        }
+
+        updateHideSystemBars(myToHideStatusBar, myToHideNavBar);
     }
 
     /**
@@ -161,6 +190,15 @@
         if(myToTrackOrient) {
             updateTrackOrientation(true);
         }
+        updateHideSystemBars(myToHideStatusBar, myToHideNavBar);
+
+        android.os.Handler aHandler = new android.os.Handler();
+        aHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                updateHideSystemBars(myToHideStatusBar, myToHideNavBar);
+            }
+        }, 500);
     }
 
     /**
@@ -352,6 +390,37 @@
         }
     }
 
+    /**
+     * Wrapper to show/hide navigation bar.
+     */
+    protected void updateHideSystemBars(boolean theToHideStatusBar,
+                                        boolean theToHideNavBar) {
+        if(android.os.Build.VERSION.SDK_INT < 19) {
+            return;
+        }
+
+        int anOptions = 0;
+
+        // Status bar can not be restored by these flags if
+        // "@android:style/Theme.NoTitleBar.Fullscreen" is set in manifest!
+        if(theToHideStatusBar) {
+            anOptions = anOptions
+                      | 0x00000004  // SYSTEM_UI_FLAG_FULLSCREEN
+                      | 0x00001000  // SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                      | 0x00000100; // SYSTEM_UI_FLAG_LAYOUT_STABLE
+        }
+        if(theToHideNavBar) {
+            anOptions = anOptions
+                      | android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                      | 0x00001000  // SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                      | 0x00000200  // SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                      | 0x00000100; // SYSTEM_UI_FLAG_LAYOUT_STABLE
+        }
+
+        final android.view.View aDecorView = getWindow().getDecorView();
+        aDecorView.setSystemUiVisibility(anOptions);
+    }
+
 //endregion
 
 //region Methods to be called from C++ level
@@ -421,6 +490,29 @@
     }
 
     /**
+     * Method to show/hide navigation bar.
+     */
+    public void setHideSystemBars(boolean theToHideStatusBar,
+                                  boolean theToHideNavBar) {
+        if(android.os.Build.VERSION.SDK_INT < 19) {
+            return;
+        }
+
+        final boolean toHideStatusBar = theToHideStatusBar;
+        final boolean toHideNavBar    = theToHideNavBar;
+        this.runOnUiThread (new Runnable() { public void run() {
+            if(myToHideStatusBar == toHideStatusBar
+            && myToHideNavBar    == toHideNavBar) {
+                return;
+            }
+
+            myToHideStatusBar = toHideStatusBar;
+            myToHideNavBar    = toHideNavBar;
+            updateHideSystemBars(toHideStatusBar, toHideNavBar);
+        }});
+    }
+
+    /**
      * Auxiliary method to show temporary info message.
      */
     public void postToast(String theInfo) {
@@ -500,6 +592,12 @@
                                           float theAzimuthDeg, float thePitchDeg, float theRollDeg,
                                           float theScreenRotDeg);
 
+    /**
+     * Define device Left/Right eyes swap flag.
+     */
+    private native void cppSetSwapEyes(long theCppPtr,
+                                       boolean theToSwap);
+
 //endregion
 
     @SuppressWarnings("deprecation")
@@ -511,8 +609,10 @@
     protected SensorManager  mySensorMgr;
     protected Sensor         mySensorOri;
     protected float          myQuat[] = { 0.0f, 0.0f, 0.0f, 1.0f };
-    protected boolean        myIsPoorOri     = false;
-    protected boolean        myToTrackOrient = false;
+    protected boolean        myIsPoorOri       = false;
+    protected boolean        myToTrackOrient   = false;
+    protected boolean        myToHideStatusBar = true;
+    protected boolean        myToHideNavBar    = true;
     protected long           myCppGlue = 0; //!< pointer to c++ class StAndroidGlue instance
 
     protected StS3dvSurface  myS3dvSurf = null;

sview-16_06.tar.gz/sview/sview.rc -> sview-17_04.tar.gz/sview/sview.rc Changed

sview-17_04.tar.gz/textures/actionColorAdjustOff128.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff144.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff16.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff192.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff24.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff256.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff32.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff48.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff64.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff72.png Added

sview-17_04.tar.gz/textures/actionColorAdjustOff96.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff128.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff144.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff16.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff192.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff24.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff256.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff32.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff48.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff64.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff72.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOff96.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn128.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn144.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn16.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn192.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn24.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn256.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn32.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn48.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn64.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn72.png Added

sview-17_04.tar.gz/textures/actionVideoFullscreen3dOn96.png Added

sview-17_04.tar.gz/textures/hmd_exit_fullscreen.png Added

sview-17_04.tar.gz/texturesSrc/actionColorAdjustOff.svg Added

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="actionColorAdjustOff.svg"
+   inkscape:export-filename="actionColorAdjustOff.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="19.104177"
+     inkscape:cy="13.779313"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="976"
+     inkscape:window-x="2552"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       d="m 0,1020.3622 h 32 v 32 H 0 z"
+       id="path5998"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 16 4 C 13.55359 4 11.280286 4.7348139 9.3828125 5.9921875 L 10.982422 7.5917969 C 11.337197 7.0357748 11.955872 6.6660156 12.666016 6.6660156 C 13.772682 6.6660156 14.666016 7.5593156 14.666016 8.6660156 C 14.666016 9.3757836 14.295821 9.9947363 13.740234 10.349609 L 24.111328 20.720703 C 26.403989 19.666067 28 17.353593 28 14.666016 C 28 8.7726156 22.626666 4 16 4 z M 19.333984 6.6660156 C 20.440651 6.6660156 21.333984 7.5593156 21.333984 8.6660156 C 21.333984 9.7726156 20.440651 10.666016 19.333984 10.666016 C 18.227318 10.666016 17.333984 9.7726156 17.333984 8.6660156 C 17.333984 7.5593156 18.227318 6.6660156 19.333984 6.6660156 z M 7.5078125 7.5234375 C 5.34073 9.69448 4 12.690619 4 16 C 4 22.6267 9.3733334 28 16 28 C 17.106667 28 18 27.1067 18 26 C 18 25.48 17.800469 25.012344 17.480469 24.652344 C 17.173802 24.305744 16.972656 23.840684 16.972656 23.333984 C 16.972656 22.227384 17.86599 21.333984 18.972656 21.333984 L 21.318359 21.333984 L 13.03125 13.046875 L 7.5078125 7.5234375 z M 8.6660156 12 C 9.7726824 12 10.666016 12.8933 10.666016 14 C 10.666016 15.1067 9.7726824 16 8.6660156 16 C 7.559349 16 6.6660156 15.1067 6.6660156 14 C 6.6660156 12.8933 7.559349 12 8.6660156 12 z M 23.333984 12 C 24.44065 12 25.333984 12.8933 25.333984 14 C 25.333984 15.1067 24.44065 16 23.333984 16 C 22.227316 16 21.333984 15.1067 21.333984 14 C 21.333984 12.8933 22.227316 12 23.333984 12 z "
+       transform="translate(0,1020.3622)"
+       id="path4" />
+    <path
+       id="path3122"
+       d="m 4.6875,1025.0341 -1.71875,1.6875 0.5,0.5 6.1875,6.1875 8.78125,8.7813 5.5,5.5 1.71875,-1.6875 -20.96875,-20.9688 z"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

sview-17_04.tar.gz/texturesSrc/actionVideoFullscreen3dOff.svg Added

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="actionVideoFullscreen3dOff.svg"
+   inkscape:export-filename="actionVideoFullscreen3dOff.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="-21.995577"
+     inkscape:cy="42.597019"
+     inkscape:document-units="px"
+     inkscape:current-layer="text4244"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="976"
+     inkscape:window-x="2552"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       d="m 0,1020.3622 h 32 v 32 H 0 z"
+       id="path6"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 10.056641 6.6660156 L 12.724609 9.3339844 L 13.333984 9.3339844 L 13.333984 6.6660156 L 10.056641 6.6660156 z M 18.666016 6.6660156 L 18.666016 9.3339844 L 22.666016 9.3339844 L 22.666016 13.333984 L 25.333984 13.333984 L 25.333984 6.6660156 L 18.666016 6.6660156 z M 6.6660156 6.6816406 L 6.6660156 13.333984 L 9.3339844 13.333984 L 9.3339844 9.3496094 L 6.84375 6.859375 L 6.6660156 6.6816406 z M 6.6660156 18.666016 L 6.6660156 25.333984 L 13.333984 25.333984 L 13.333984 22.666016 L 9.3339844 22.666016 L 9.3339844 18.666016 L 6.6660156 18.666016 z M 22.666016 18.666016 L 22.666016 19.275391 L 25.333984 21.943359 L 25.333984 18.666016 L 22.666016 18.666016 z M 18.666016 22.666016 L 18.666016 25.333984 L 25.318359 25.333984 L 22.650391 22.666016 L 18.666016 22.666016 z "
+       transform="translate(0,1020.3622)"
+       id="path6-1" />
+    <g
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.5px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4244">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara Bold';text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start"
+         d="M 12.126953 12.363281 C 11.324454 12.363281 10.803045 12.395278 10.458984 12.517578 A 0.28932582 0.28932582 0 0 0 10.269531 12.763672 L 10.169922 13.779297 A 0.28932582 0.28932582 0 0 0 10.515625 14.089844 C 10.810352 14.028844 11.156425 13.994141 11.550781 13.994141 C 11.977694 13.994141 12.26878 14.069169 12.423828 14.167969 C 12.578876 14.266969 12.634766 14.366284 12.634766 14.583984 C 12.634766 14.791384 12.538386 14.948253 12.208984 15.126953 C 11.884315 15.301453 11.439493 15.400391 10.869141 15.400391 A 0.28932582 0.28932582 0 0 0 10.582031 15.652344 L 10.466797 16.535156 A 0.28932582 0.28932582 0 0 0 10.753906 16.861328 C 11.544756 16.861328 12.117621 16.973897 12.455078 17.154297 C 12.792535 17.334697 12.914063 17.535359 12.914062 17.880859 C 12.914062 18.306259 12.71093 18.627741 12.185547 18.931641 A 0.28932582 0.28932582 0 0 0 12.183594 18.931641 C 11.678905 19.228841 10.959278 19.420269 10.025391 19.480469 A 0.28932582 0.28932582 0 0 0 9.7597656 19.816406 L 9.9082031 20.734375 A 0.28932582 0.28932582 0 0 0 10.210938 20.976562 C 11.688814 20.890562 12.874197 20.522709 13.744141 19.849609 C 14.501183 19.265109 14.916016 18.5227 14.916016 17.6875 C 14.916016 17.1333 14.735152 16.634388 14.380859 16.242188 C 14.173437 16.010088 13.913647 15.84625 13.630859 15.71875 C 13.791276 15.61045 13.940171 15.484084 14.070312 15.333984 C 14.28542 15.085494 14.426447 14.80498 14.490234 14.505859 L 13.03125 13.046875 L 12.361328 12.376953 C 12.282758 12.373173 12.208868 12.363281 12.126953 12.363281 z "
+         transform="translate(0,1020.3622)"
+         id="path4279" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara Bold';text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start"
+         d="M 18.185547 11.0625 C 18.078253 11.0625 17.879678 11.072078 17.568359 11.080078 C 17.258768 11.091078 17.025331 11.095703 16.873047 11.095703 L 15.912109 11.095703 A 0.25005314 0.25005314 0 0 0 15.662109 11.357422 C 15.675109 11.614386 15.672071 12.004231 15.681641 12.291016 L 17.603516 14.212891 C 17.596486 13.696812 17.590086 13.18008 17.568359 12.689453 C 17.710493 12.676453 17.87197 12.662109 17.960938 12.662109 C 18.755488 12.662109 19.292993 12.879828 19.648438 13.298828 A 0.25005314 0.25005314 0 0 0 19.650391 13.298828 C 20.021445 13.732828 20.205078 14.255656 20.205078 14.910156 C 20.205078 15.495655 20.059181 15.980161 19.785156 16.394531 L 21.044922 17.654297 C 21.076365 17.620449 21.114189 17.595885 21.144531 17.560547 C 21.846503 16.742847 22.204624 15.768381 22.205078 14.675781 C 22.205078 13.698881 21.879926 12.836866 21.244141 12.134766 C 20.589218 11.407066 19.549315 11.0625 18.185547 11.0625 z M 15.714844 15.730469 C 15.70537 16.699847 15.697147 17.674335 15.662109 18.488281 A 0.25005314 0.25005314 0 0 0 15.900391 18.748047 C 16.854996 18.792047 17.604078 18.8125 18.152344 18.8125 C 18.36011 18.8125 18.551424 18.784672 18.746094 18.761719 L 15.714844 15.730469 z "
+         transform="translate(0,1020.3622)"
+         id="path4281" />
+    </g>
+    <path
+       id="path3122"
+       d="m 4.6875,1025.0341 -1.71875,1.6875 0.5,0.5 6.1875,6.1875 8.78125,8.7813 5.5,5.5 1.71875,-1.6875 -20.96875,-20.9688 z"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

sview-17_04.tar.gz/texturesSrc/actionVideoFullscreen3dOn.svg Added

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="actionVideoFullscreen3dOn.svg"
+   inkscape:export-filename="actionVideoFullscreen3dOn.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="29.269528"
+     inkscape:cy="17.709292"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="976"
+     inkscape:window-x="2552"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       d="m 0,1020.3622 h 32 v 32 H 0 z"
+       id="path6"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       d="m 9.3333335,1039.0289 h -2.666667 v 6.6667 h 6.6666665 v -2.6667 H 9.3333335 v -4 z m -2.666667,-5.3333 h 2.666667 v -4 h 3.9999995 v -2.6667 H 6.6666665 v 6.6667 z m 15.9999985,9.3333 h -3.999998 v 2.6667 h 6.666667 v -6.6667 h -2.666669 v 4 z m -3.999998,-16 v 2.6667 h 3.999998 v 4 h 2.666669 v -6.6667 h -6.666667 z"
+       id="path6-1"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <g
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.5px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4244">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.2892969"
+         inkscape:original="M 12.126953 1033.0137 C 11.335938 1033.0137 10.812989 1033.0608 10.556641 1033.1523 L 10.457031 1034.168 C 10.775635 1034.102 11.140625 1034.0684 11.550781 1034.0684 C 12.466309 1034.0684 12.923828 1034.3613 12.923828 1034.9473 C 12.923828 1035.2695 12.732178 1035.5354 12.347656 1035.7441 C 11.966797 1035.9492 11.473389 1036.0527 10.869141 1036.0527 L 10.753906 1036.9355 C 12.387207 1036.9355 13.203125 1037.3725 13.203125 1038.2441 C 13.203125 1038.7751 12.912353 1039.2081 12.330078 1039.5449 C 11.769775 1039.8748 11.008057 1040.0708 10.044922 1040.1328 L 10.193359 1041.0508 C 11.632568 1040.9665 12.75708 1040.6106 13.566406 1039.9844 C 14.273194 1039.4387 14.626953 1038.7942 14.626953 1038.0508 C 14.626953 1037.5564 14.473633 1037.1394 14.166016 1036.7988 C 13.862061 1036.4582 13.465576 1036.2466 12.978516 1036.166 L 12.978516 1036.084 C 13.322754 1035.9741 13.613525 1035.7824 13.851562 1035.5078 C 14.111573 1035.2075 14.242188 1034.8784 14.242188 1034.5195 C 14.242188 1034.0654 14.070801 1033.7048 13.726562 1033.4375 C 13.353027 1033.1556 12.819092 1033.0137 12.126953 1033.0137 z "
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara Bold';text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start"
+         id="path4279"
+         d="m 12.126953,1032.7246 c -0.802499,0 -1.323908,0.032 -1.667969,0.1543 a 0.28932582,0.28932582 0 0 0 -0.189453,0.2461 l -0.09961,1.0156 a 0.28932582,0.28932582 0 0 0 0.345703,0.3106 c 0.294727,-0.061 0.6408,-0.094 1.035156,-0.094 0.426913,0 0.717999,0.075 0.873047,0.1738 0.155048,0.099 0.210938,0.1984 0.210938,0.4161 0,0.2074 -0.09638,0.3642 -0.425782,0.5429 -0.324669,0.1745 -0.769491,0.2735 -1.339843,0.2735 a 0.28932582,0.28932582 0 0 0 -0.28711,0.2519 l -0.115234,0.8828 a 0.28932582,0.28932582 0 0 0 0.287109,0.3262 c 0.79085,0 1.363715,0.1126 1.701172,0.293 0.337457,0.1804 0.458984,0.381 0.458984,0.7265 0,0.4254 -0.203132,0.7469 -0.728515,1.0508 a 0.28932582,0.28932582 0 0 0 -0.002,0 c -0.504689,0.2972 -1.224316,0.4887 -2.158203,0.5489 a 0.28932582,0.28932582 0 0 0 -0.2656254,0.3359 l 0.1484375,0.918 a 0.28932582,0.28932582 0 0 0 0.3027349,0.2421 c 1.477876,-0.086 2.663259,-0.4538 3.533203,-1.1269 0.757042,-0.5845 1.171875,-1.3269 1.171875,-2.1621 0,-0.5542 -0.180864,-1.0531 -0.535157,-1.4453 -0.207422,-0.2321 -0.467212,-0.396 -0.75,-0.5235 0.160417,-0.1083 0.309311,-0.2346 0.439453,-0.3847 0.297093,-0.3432 0.460938,-0.7487 0.460938,-1.1778 0,-0.5269 -0.219904,-0.9944 -0.626953,-1.3105 a 0.28932582,0.28932582 0 0 0 -0.0039,-0 c -0.442082,-0.3336 -1.041758,-0.4824 -1.773438,-0.4824 z" />
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.25002813"
+         inkscape:original="M 18.185547 1031.6738 C 18.090332 1031.6738 17.887451 1031.6807 17.576172 1031.6914 C 17.264893 1031.7021 17.030518 1031.707 16.873047 1031.707 L 15.912109 1031.707 C 15.959716 1032.6482 15.984375 1033.7842 15.984375 1035.1172 C 15.984375 1036.5052 15.959716 1037.7534 15.912109 1038.8594 C 16.864258 1038.9034 17.610352 1038.9238 18.152344 1038.9238 C 19.353516 1038.9238 20.288574 1038.5361 20.955078 1037.7598 C 21.621149 1036.9839 21.954646 1036.0763 21.955078 1035.0371 C 21.955078 1034.1143 21.655518 1033.3233 21.058594 1032.6641 C 20.465332 1032.0049 19.507569 1031.6738 18.185547 1031.6738 z M 17.960938 1032.7734 C 18.803222 1032.7734 19.429687 1033.0146 19.839844 1033.498 C 20.25 1033.9778 20.455078 1034.5684 20.455078 1035.2715 C 20.455078 1035.9746 20.263672 1036.5718 19.882812 1037.0625 C 19.505615 1037.5496 18.924072 1037.793 18.136719 1037.793 C 17.898681 1037.793 17.659912 1037.768 17.421875 1037.7207 C 17.385255 1036.8601 17.367188 1035.9925 17.367188 1035.1172 C 17.367188 1034.3189 17.34912 1033.5547 17.3125 1032.8223 C 17.587159 1032.7896 17.803467 1032.7734 17.960938 1032.7734 z "
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;line-height:125%;font-family:Candara;-inkscape-font-specification:'Candara Bold';text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start"
+         id="path4281"
+         d="m 18.185547,1031.4238 c -0.107294,0 -0.305869,0.01 -0.617188,0.018 -0.309591,0.011 -0.543028,0.016 -0.695312,0.016 l -0.960938,0 a 0.25005314,0.25005314 0 0 0 -0.25,0.2618 c 0.04732,0.9354 0.07227,2.0685 0.07227,3.3984 0,1.385 -0.02485,2.6308 -0.07227,3.7324 a 0.25005314,0.25005314 0 0 0 0.238282,0.2598 c 0.954605,0.044 1.703687,0.064 2.251953,0.064 1.254972,0 2.277196,-0.4192 2.992187,-1.2519 0.701972,-0.8177 1.060093,-1.7922 1.060547,-2.8848 0,-0.9769 -0.325152,-1.8389 -0.960937,-2.541 -0.654923,-0.7277 -1.694826,-1.0723 -3.058594,-1.0723 z m -0.224609,1.5996 c 0.794551,0 1.332055,0.2178 1.6875,0.6368 a 0.25005314,0.25005314 0 0 0 0.002,0 c 0.371054,0.434 0.554687,0.9568 0.554687,1.6113 0,0.6577 -0.17404,1.1935 -0.519531,1.6387 -0.325716,0.4206 -0.813004,0.6328 -1.548828,0.6328 -0.155237,0 -0.312039,-0.027 -0.46875,-0.049 -0.03059,-0.7864 -0.05078,-1.5779 -0.05078,-2.3769 0,-0.7179 -0.01936,-1.399 -0.04883,-2.0645 0.142134,-0.013 0.303611,-0.029 0.392579,-0.029 z" />
+    </g>
+  </g>
+</svg>

sview-17_04.tar.gz/texturesSrc/hmd_exit_fullscreen.svg Added

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="64"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="hmd_exit_fullscreen.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="hmd_exit_fullscreen.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.12"
+     inkscape:cx="97.307582"
+     inkscape:cy="38.673056"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="256px"
+     height="64px"
+     showborder="true"
+     inkscape:window-width="1193"
+     inkscape:window-height="741"
+     inkscape:window-x="2858"
+     inkscape:window-y="98"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#000000;fill-opacity:0.51322752;stroke:none"
+       id="rect2166"
+       width="256"
+       height="64"
+       x="0"
+       y="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="129.66238"
+       y="26.578556"
+       id="text2160"><tspan
+         sodipodi:role="line"
+         x="129.66238"
+         y="26.578556"
+         id="tspan2164"
+         style="font-size:20px;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">Press Enter</tspan><tspan
+         sodipodi:role="line"
+         x="129.66238"
+         y="51.578556"
+         style="font-size:20px;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1"
+         id="tspan4139">to exit VR mode</tspan></text>
+  </g>
+</svg>

Overview

Request 3991 (accepted)

Request History