Request 2175 (accepted)

sview.changes Changed

sview.spec Changed

@@ -16,9 +16,10 @@
 #
 
 
-%define src_ver 15_08
+%define src_ver 15_10
+%define src_name sView
 Name:           sview
-Version:        15.08
+Version:        15.10
 Release:        0
 Summary:        Stereoscopic media player
 License:        GPL-3.0+ and LGPL-3.0+
@@ -59,7 +60,7 @@
 %build
 sed -i '/^CXXFLAGS/s/$/\ %{optflags}/' Makefile
 # Remove %%_smp_mflags to avoid compilation errors
-make V=1 -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/sView"
+make V=1 -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/%{src_name}"
 
 %install
 %make_install USR_LIB=%{_lib}
@@ -71,15 +72,15 @@
 # It's not necessary
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/%{name}.png
 # Use the installation in pixmaps
-rm -rf %{buildroot}%{_datadir}/sView/icons/menu.xpm
-install -Dm 0644 share/sView/icons/menu.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+rm -rf %{buildroot}%{_datadir}/%{src_name}/icons/menu.xpm
+install -Dm 0644 share/%{src_name}/icons/menu.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
 # Libraries used by the app must be placed into subdirectory
-mv %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/sView
+mv %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/%{src_name}
 
 %fdupes -s %{buildroot}%{_datadir}
 
-%suse_update_desktop_file -r sViewIV Graphics Viewer
-%suse_update_desktop_file -r sViewMP AudioVideo Video Player
+%suse_update_desktop_file -r %{src_name}IV Graphics Viewer
+%suse_update_desktop_file -r %{src_name}MP AudioVideo Video Player
 
 %post
 %icon_theme_cache_post
@@ -92,12 +93,12 @@
 %files
 %defattr(-,root,root)
 %doc LICENSE license-gpl* license-lgpl*
-%{_bindir}/sView
-%{_libdir}/sView/
-%{_datadir}/applications/sViewIV.desktop
-%{_datadir}/applications/sViewMP.desktop
+%{_bindir}/%{src_name}
+%{_libdir}/%{src_name}/
+%{_datadir}/applications/%{src_name}IV.desktop
+%{_datadir}/applications/%{src_name}MP.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/pixmaps/%{name}.xpm
-%{_datadir}/sView/
+%{_datadir}/%{src_name}/
 
 %changelog

sview-15_08.tar.gz/StGLWidgets/StGLImageFlatProgram.cpp Deleted

@@ -1,77 +0,0 @@
-/**
- * Copyright © 2010-2015 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
- */
-
-#include <StGLWidgets/StGLImageFlatProgram.h>
-#include <StGL/StGLResources.h>
-#include <StFile/StRawFile.h>
-
-StGLImageFlatProgram::StGLImageFlatProgram()
-: StGLImageProgram("StGLImageFlatProgram") {
-    const char V_SHADER_FLAT[] =
-       "uniform mat4 uProjMat;\n"
-       "uniform mat4 uModelMat;\n"
-       "uniform vec4 uTexData;\n"
-       "uniform vec4 uTexUVData;\n"
-
-       "attribute vec4 vVertex;\n"
-       "attribute vec2 vTexCoord;\n"
-
-       "varying vec3 fTexCoord;\n"
-       "varying vec3 fTexUVCoord;\n"
-
-       "void main(void) {\n"
-       "    fTexCoord   = vec3(uTexData.xy   + vTexCoord * uTexData.zw,   0.0);\n"
-       "    fTexUVCoord = vec3(uTexUVData.xy + vTexCoord * uTexUVData.zw, 0.0);\n"
-       "    gl_Position = uProjMat * uModelMat * vVertex;\n"
-       "}\n";
-
-    const char V_SHADER_CUBEMAP[] =
-       "uniform mat4 uProjMat;\n"
-       "uniform mat4 uModelMat;\n"
-       "uniform vec4 uTexData;\n"
-       "uniform vec4 uTexUVData;\n"
-
-       "attribute vec4 vVertex;\n"
-       "attribute vec2 vTexCoord;\n"
-
-       "varying vec3 fTexCoord;\n"
-       "varying vec3 fTexUVCoord;\n"
-
-       "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;"
-       "}\n";
-
-    const char F_SHADER_FLAT[] =
-       "varying vec3 fTexCoord;\n"
-       "varying vec3 fTexUVCoord;\n"
-        // we split these functions for two reasons:
-        // - to change function code (like color conversion);
-        // - to optimize rendering on old hardware not supported conditions (GeForce FX for example).
-       "vec4 getColor(in vec3 texCoord);\n"
-       "void convertToRGB(inout vec4 theColor, in vec3 theTexUVCoord);\n"
-       "void applyCorrection(inout vec4 theColor);\n"
-       "void applyGamma(inout vec4 theColor);\n"
-
-       "void main(void) {\n"
-            // extract color from main texture
-       "    vec4 aColor = getColor(fTexCoord);\n"
-            // convert from alien color model (like YUV) to RGB
-       "    convertToRGB(aColor, fTexUVCoord);\n"
-            // color processing (saturation, brightness, etc)
-       "    applyCorrection(aColor);\n"
-            // gamma correction
-       "    applyGamma(aColor);\n"
-       "    gl_FragColor = aColor;\n"
-       "}";
-
-    registerVertexShaderPart  (0, VertMain_Normal,  V_SHADER_FLAT);
-    registerVertexShaderPart  (0, VertMain_Cubemap, V_SHADER_CUBEMAP);
-    registerFragmentShaderPart(FragSection_Main, 0, F_SHADER_FLAT);
-}

sview-15_08.tar.gz/StGLWidgets/StGLImageSphereProgram.cpp Deleted

@@ -1,92 +0,0 @@
-/**
- * Copyright © 2010-2015 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
- */
-
-#include <StGLWidgets/StGLImageSphereProgram.h>
-
-#include <StGL/StGLResources.h>
-#include <StGLCore/StGLCore20.h>
-#include <StFile/StRawFile.h>
-
-#if defined(GL_ES_VERSION_2_0)
-    #define THE_UTEXT_DATA "uniform mediump vec4 uTexData;\n"
-#else
-    #define THE_UTEXT_DATA "uniform vec4 uTexData;\n"
-#endif
-
-StGLImageSphereProgram::StGLImageSphereProgram()
-: StGLImageProgram("StGLImageSphereProgram") {
-    const char V_SHADER[] =
-       "uniform mat4 uProjMat;\n"
-       "uniform mat4 uModelMat;\n"
-       "uniform vec4 uTexUVData;\n"
-       THE_UTEXT_DATA
-
-       "attribute vec4 vVertex;\n"
-       "attribute vec2 vTexCoord;\n"
-
-       "varying vec3 fTexCoord;\n"
-       "varying vec3 fTexUVCoord;\n"
-
-       "void main(void) {\n"
-       "    fTexCoord   = vec3(uTexData.xy   + vTexCoord * uTexData.zw,   0.0);\n"
-       "    fTexUVCoord = vec3(uTexUVData.xy + vTexCoord * uTexUVData.zw, 0.0);\n"
-       "    gl_Position = uProjMat * uModelMat * vVertex;\n"
-       "}\n";
-
-    const char F_SHADER[] =
-       "varying vec3 fTexCoord;\n"
-       "varying vec3 fTexUVCoord;\n"
-
-       "vec4 getColor(in vec3 texCoord);\n"
-       "void convertToRGB(inout vec4 color, in vec3 texUVCoord);\n"
-       "void applyGamma(inout vec4 color);\n"
-
-       "void main(void) {\n"
-       "    vec4 color = getColor(fTexCoord);\n"
-       "    convertToRGB(color, fTexUVCoord);\n"
-       "    applyGamma(color);\n"
-       "    gl_FragColor = color;\n"
-       "}\n\n";
-
-    const char F_SHADER_COLOR[] =
-       "uniform sampler2D uTexture;\n"
-       "uniform vec2 uTexSizePx;\n"
-       "uniform vec2 uTexelSize;\n"
-       THE_UTEXT_DATA
-
-       "vec4 getColor(in vec3 texCoord) {\n"
-       "    vec2 txCoord_CC = floor(uTexSizePx * texCoord.xy) / uTexSizePx;\n"
-       "    vec2 aDiff = (texCoord.xy - txCoord_CC) * uTexSizePx;\n"
-       "    if(txCoord_CC.y >= (uTexData.w - uTexelSize.y)) {\n"
-       "        aDiff.y = 0.0;\n"
-       "    }\n"
-       "    vec2 diffSign = sign(aDiff);\n"
-       "    vec2 diffAbs  = abs(aDiff);\n"
-       "    vec2 txCoord_R = txCoord_CC + diffSign * vec2(uTexelSize.x, 0.0);\n"
-       "    if(txCoord_R.x > (uTexData.z - uTexelSize.x)) {\n"
-       "        txCoord_R.x = uTexelSize.x;\n"
-       "    } else if(txCoord_R.x < uTexelSize.x) {\n"
-       "        txCoord_R.x = uTexData.z - uTexelSize.x;\n"
-       "    }\n"
-       "    vec4 color_CC = texture2D(uTexture, txCoord_CC);\n"
-       "    vec4 colorXX1 = mix(color_CC,\n"
-       "                        texture2D(uTexture,\n"
-       "                                  txCoord_R),\n"
-       "                        diffAbs.x);\n"
-       "    vec4 colorXX2 = mix(texture2D(uTexture,\n"
-       "                                  txCoord_CC + diffSign * vec2(0.0, uTexelSize.y)),\n"
-       "                        texture2D(uTexture,\n"
-       "                                  txCoord_R + diffSign * vec2(0.0, uTexelSize.y)),\n"
-       "                        diffAbs.x);\n"
-       "    return mix(colorXX1, colorXX2, diffAbs.y);\n"
-       "}\n\n";
-
-    registerVertexShaderPart  (0,                    VertMain_Normal, V_SHADER);
-    registerFragmentShaderPart(FragSection_Main,     0, F_SHADER);
-    registerFragmentShaderPart(FragSection_GetColor, FragGetColor_Blend, F_SHADER_COLOR);
-}

sview-15_08.tar.gz/include/StGLWidgets/StGLImageFlatProgram.h Deleted

sview-15_08.tar.gz/include/StGLWidgets/StGLImageSphereProgram.h Deleted

sview-15_08.tar.gz/3rdparty/include/mongoose.c -> sview-15_10.tar.gz/3rdparty/include/mongoose.c Changed

@@ -50,7 +50,6 @@
 
 #if defined(__SYMBIAN32__)
 #define NO_SSL // SSL is not supported
-#define NO_CGI // CGI is not supported
 #define PATH_MAX FILENAME_MAX
 #endif // __SYMBIAN32__
 
@@ -86,7 +85,6 @@
 #include <direct.h>
 #include <io.h>
 #else // _WIN32_WCE
-#define NO_CGI // WinCE has no pipes
 
 typedef long off_t;
 
@@ -190,7 +188,7 @@
 
 #ifndef HAS_POLL
 struct pollfd {
-  int fd;
+  intptr_t fd;
   short events;
   short revents;
 };
@@ -252,15 +250,8 @@
 
 #include "mongoose.h"
 
-#ifdef USE_LUA
-#include <lua.h>
-#include <lauxlib.h>
-#endif
-
 #define MONGOOSE_VERSION "3.7"
 #define PASSWORDS_FILE_NAME ".htpasswd"
-#define CGI_ENVIRONMENT_SIZE 4096
-#define MAX_CGI_ENVIR_VARS 64
 #define MG_BUF_LEN 8192
 #define MAX_REQUEST_SIZE 16384
 #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
@@ -858,9 +849,10 @@
   return list;
 }
 
-static int match_prefix(const char *pattern, int pattern_len, const char *str) {
+static int match_prefix(const char *pattern, size_t pattern_len, const char *str) {
   const char *or_str;
-  int i, j, len, res;
+  int j, len, res;
+  size_t i;
 
   if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {
     res = match_prefix(pattern, or_str - pattern, str);
@@ -868,7 +860,8 @@
         match_prefix(or_str + 1, (pattern + pattern_len) - (or_str + 1), str);
   }
 
-  i = j = 0;
+  j = 0;
+  i = 0;
   res = -1;
   for (; i < pattern_len; i++, j++) {
     if (pattern[i] == '?' && str[j] != '\0') {
@@ -1261,94 +1254,6 @@
   return LoadLibraryW(wbuf);
 }
 
-#if !defined(NO_CGI)
-#define SIGKILL 0
-static int kill(pid_t pid, int sig_num) {
-  (void) TerminateProcess(pid, sig_num);
-  (void) CloseHandle(pid);
-  return 0;
-}
-
-static void trim_trailing_whitespaces(char *s) {
-  char *e = s + strlen(s) - 1;
-  while (e > s && isspace(* (unsigned char *) e)) {
-    *e-- = '\0';
-  }
-}
-
-static pid_t spawn_process(struct mg_connection *conn, const char *prog,
-                           char *envblk, char *envp[], int fd_stdin,
-                           int fd_stdout, const char *dir) {
-  HANDLE me;
-  char *p, *interp, full_interp[PATH_MAX], full_dir[PATH_MAX],
-       cmdline[PATH_MAX], buf[PATH_MAX];
-  struct file file = STRUCT_FILE_INITIALIZER;
-  STARTUPINFOA si = { sizeof(si) };
-  PROCESS_INFORMATION pi = { 0 };
-
-  envp = NULL; // Unused
-
-  // TODO(lsm): redirect CGI errors to the error log file
-  si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-  si.wShowWindow = SW_HIDE;
-
-  me = GetCurrentProcess();
-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdin), me,
-                  &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdout), me,
-                  &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-
-  // If CGI file is a script, try to read the interpreter line
-  interp = conn->ctx->config[CGI_INTERPRETER];
-  if (interp == NULL) {
-    buf[0] = buf[1] = '\0';
-
-    // Read the first line of the script into the buffer
-    snprintf(cmdline, sizeof(cmdline), "%s%c%s", dir, '/', prog);
-    if (mg_fopen(conn, cmdline, "r", &file)) {
-      p = (char *) file.membuf;
-      mg_fgets(buf, sizeof(buf), &file, &p);
-      mg_fclose(&file);
-      buf[sizeof(buf) - 1] = '\0';
-    }
-
-    if (buf[0] == '#' && buf[1] == '!') {
-      trim_trailing_whitespaces(buf + 2);
-    } else {
-      buf[2] = '\0';
-    }
-    interp = buf + 2;
-  }
-
-  if (interp[0] != '\0') {
-    GetFullPathNameA(interp, sizeof(full_interp), full_interp, NULL);
-    interp = full_interp;
-  }
-  GetFullPathNameA(dir, sizeof(full_dir), full_dir, NULL);
-
-  mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s%s\\%s",
-              interp, interp[0] == '\0' ? "" : " ", full_dir, prog);
-
-  DEBUG_TRACE(("Running [%s]", cmdline));
-  if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE,
-        CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) {
-    cry(conn, "%s: CreateProcess(%s): %d",
-        __func__, cmdline, ERRNO);
-    pi.hProcess = (pid_t) -1;
-  }
-
-  // Always close these to prevent handle leakage.
-  (void) close(fd_stdin);
-  (void) close(fd_stdout);
-
-  (void) CloseHandle(si.hStdOutput);
-  (void) CloseHandle(si.hStdInput);
-  (void) CloseHandle(pi.hThread);
-
-  return (pid_t) pi.hProcess;
-}
-#endif // !NO_CGI
-
 static int set_non_blocking_mode(SOCKET sock) {
   unsigned long on = 1;
   return ioctlsocket(sock, FIONBIO, &on);
@@ -1386,58 +1291,6 @@
   return pthread_create(&thread_id, &attr, func, param);
 }
 
-#ifndef NO_CGI
-static pid_t spawn_process(struct mg_connection *conn, const char *prog,
-                           char *envblk, char *envp[], int fd_stdin,
-                           int fd_stdout, const char *dir) {
-  pid_t pid;
-  const char *interp;
-
-  (void) envblk;
-
-  if ((pid = fork()) == -1) {
-    // Parent
-    send_http_error(conn, 500, http_500_error, "fork(): %s", strerror(ERRNO));
-  } else if (pid == 0) {
-    // Child
-    if (chdir(dir) != 0) {
-      cry(conn, "%s: chdir(%s): %s", __func__, dir, strerror(ERRNO));
-    } else if (dup2(fd_stdin, 0) == -1) {
-      cry(conn, "%s: dup2(%d, 0): %s", __func__, fd_stdin, strerror(ERRNO));
-    } else if (dup2(fd_stdout, 1) == -1) {
-      cry(conn, "%s: dup2(%d, 1): %s", __func__, fd_stdout, strerror(ERRNO));
-    } else {
-      (void) dup2(fd_stdout, 2);
-      (void) close(fd_stdin);
-      (void) close(fd_stdout);
-
-      // After exec, all signal handlers are restored to their default values,
-      // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's
-      // implementation, SIGCHLD's handler will leave unchanged after exec
-      // if it was set to be ignored. Restore it to default action.
-      signal(SIGCHLD, SIG_DFL);
-
-      interp = conn->ctx->config[CGI_INTERPRETER];
-      if (interp == NULL) {
-        (void) execle(prog, prog, NULL, envp);
-        cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO));
-      } else {
-        (void) execle(interp, interp, prog, NULL, envp);
-        cry(conn, "%s: execle(%s %s): %s", __func__, interp, prog,
-            strerror(ERRNO));
-      }
-    }
-    exit(EXIT_FAILURE);
-  }
-
-  // Parent. Close stdio descriptors
-  (void) close(fd_stdin);
-  (void) close(fd_stdout);
-
-  return pid;
-}
-#endif // !NO_CGI
-
 static int set_non_blocking_mode(SOCKET sock) {
   int flags;
 
@@ -1504,51 +1357,6 @@
   return conn->ctx->stop_flag ? -1 : nread;
 }
 
-int mg_read(struct mg_connection *conn, void *buf, size_t len) {
-  int n, buffered_len, nread;
-  const char *body;
-
-  nread = 0;
-  if (conn->consumed_content < conn->content_len) {
-    // Adjust number of bytes to read.
-    int64_t to_read = conn->content_len - conn->consumed_content;
-    if (to_read < (int64_t) len) {
-      len = (size_t) to_read;
-    }
-
-    // Return buffered data
-    body = conn->buf + conn->request_len + conn->consumed_content;
-    buffered_len = &conn->buf[conn->data_len] - body;
-    if (buffered_len > 0) {
-      if (len < (size_t) buffered_len) {
-        buffered_len = (int) len;
-      }
-      memcpy(buf, body, (size_t) buffered_len);
-      len -= buffered_len;
-      conn->consumed_content += buffered_len;
-      nread += buffered_len;
-      buf = (char *) buf + buffered_len;
-    }
-
-    // We have returned all buffered data. Read new data from the remote socket.
-    while (len > 0) {
-      n = pull(NULL, conn, (char *) buf, (int) len);
-      if (n < 0) {
-        nread = n;  // Propagate the error
-        break;
-      } else if (n == 0) {
-        break;  // No more data to read
-      } else {
-        buf = (char *) buf + n;
-        conn->consumed_content += n;
-        nread += n;
-        len -= n;
-      }
-    }
-  }
-  return nread;
-}
-
 int mg_write(struct mg_connection *conn, const void *buf, size_t len) {
   time_t now;
   int64_t n, total, allowed;
@@ -1697,7 +1505,7 @@
         assert(s >= p);
 
         // Decode variable into destination buffer
-        len = url_decode(p, (size_t)(s - p), dst, dst_len, 1);
+        len = url_decode(p, (int )(s - p), dst, (int )dst_len, 1);
 
         // Redirect error code from -1 to -2 (destination buffer too small).
         if (len == -1) {
@@ -1738,7 +1546,7 @@
           p--;
         }
         if ((size_t) (p - s) < dst_size) {
-          len = p - s;
+          len = (int )(p - s);
           mg_strlcpy(dst, s, (size_t) len + 1);
         } else {
           len = -2;
@@ -2343,7 +2151,7 @@
     *p = eof;
     return eof;
   } else if (filep->fp != NULL) {
-    return fgets(buf, size, filep->fp);
+    return fgets(buf, (int )size, filep->fp);
   } else {
     return NULL;
   }
@@ -2721,7 +2529,7 @@
       }
 
       // Read from file, exit the loop on error
-      if ((num_read = fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {
+      if ((num_read = (int )fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {
         break;
       }
 
@@ -2980,7 +2788,7 @@
     }
 
     body = conn->buf + conn->request_len + conn->consumed_content;
-    buffered_len = &conn->buf[conn->data_len] - body;
+    buffered_len = (int )(&conn->buf[conn->data_len] - body);
     assert(buffered_len >= 0);
     assert(conn->consumed_content == 0);
 
@@ -3018,325 +2826,19 @@
   return success;
 }
 
-#if !defined(NO_CGI)
-// This structure helps to create an environment for the spawned CGI program.
-// Environment is an array of "VARIABLE=VALUE\0" ASCIIZ strings,
-// last element must be NULL.
-// However, on Windows there is a requirement that all these VARIABLE=VALUE\0
-// strings must reside in a contiguous buffer. The end of the buffer is
-// marked by two '\0' characters.
-// We satisfy both worlds: we create an envp array (which is vars), all
-// entries are actually pointers inside buf.
-struct cgi_env_block {
-  struct mg_connection *conn;
-  char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
-  int len; // Space taken
-  char *vars[MAX_CGI_ENVIR_VARS]; // char **envp
-  int nvars; // Number of variables
-};
-
-static char *addenv(struct cgi_env_block *block,
-                    PRINTF_FORMAT_STRING(const char *fmt), ...)
-  PRINTF_ARGS(2, 3);
-
-// Append VARIABLE=VALUE\0 string to the buffer, and add a respective
-// pointer into the vars array.
-static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
-  int n, space;
-  char *added;
-  va_list ap;
-
-  // Calculate how much space is left in the buffer
-  space = sizeof(block->buf) - block->len - 2;
-  assert(space >= 0);
-
-  // Make a pointer to the free space int the buffer
-  added = block->buf + block->len;
-
-  // Copy VARIABLE=VALUE\0 string into the free space
-  va_start(ap, fmt);
-  n = mg_vsnprintf(block->conn, added, (size_t) space, fmt, ap);
-  va_end(ap);
-
-  // Make sure we do not overflow buffer and the envp array
-  if (n > 0 && n + 1 < space &&
-      block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
-    // Append a pointer to the added string into the envp array
-    block->vars[block->nvars++] = added;
-    // Bump up used length counter. Include \0 terminator
-    block->len += n + 1;
-  } else {
-    cry(block->conn, "%s: CGI env buffer truncated for [%s]", __func__, fmt);
-  }
-
-  return added;
-}
-
-static void prepare_cgi_environment(struct mg_connection *conn,
-                                    const char *prog,
-                                    struct cgi_env_block *blk) {
-  const char *s, *slash;
-  struct vec var_vec;
-  char *p, src_addr[20];
-  int  i;
-
-  blk->len = blk->nvars = 0;
-  blk->conn = conn;
-  sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
-
-  addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
-  addenv(blk, "SERVER_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-  addenv(blk, "DOCUMENT_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-
-  // Prepare the environment block
-  addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
-  addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
-  addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
-
-  // TODO(lsm): fix this for IPv6 case
-  addenv(blk, "SERVER_PORT=%d", ntohs(conn->client.lsa.sin.sin_port));
-
-  addenv(blk, "REQUEST_METHOD=%s", conn->request_info.request_method);
-  addenv(blk, "REMOTE_ADDR=%s", src_addr);
-  addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);
-  addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);
-
-  // SCRIPT_NAME
-  assert(conn->request_info.uri[0] == '/');
-  slash = strrchr(conn->request_info.uri, '/');
-  if ((s = strrchr(prog, '/')) == NULL)
-    s = prog;
-  addenv(blk, "SCRIPT_NAME=%.*s%s", (int) (slash - conn->request_info.uri),
-         conn->request_info.uri, s);
-
-  addenv(blk, "SCRIPT_FILENAME=%s", prog);
-  addenv(blk, "PATH_TRANSLATED=%s", prog);
-  addenv(blk, "HTTPS=%s", conn->ssl == NULL ? "off" : "on");
-
-  if ((s = mg_get_header(conn, "Content-Type")) != NULL)
-    addenv(blk, "CONTENT_TYPE=%s", s);
-
-  if (conn->request_info.query_string != NULL)
-    addenv(blk, "QUERY_STRING=%s", conn->request_info.query_string);
-
-  if ((s = mg_get_header(conn, "Content-Length")) != NULL)
-    addenv(blk, "CONTENT_LENGTH=%s", s);
-
-  if ((s = getenv("PATH")) != NULL)
-    addenv(blk, "PATH=%s", s);
-
-  if (conn->path_info != NULL) {
-    addenv(blk, "PATH_INFO=%s", conn->path_info);
-  }
-
-#if defined(_WIN32)
-  if ((s = getenv("COMSPEC")) != NULL) {
-    addenv(blk, "COMSPEC=%s", s);
-  }
-  if ((s = getenv("SYSTEMROOT")) != NULL) {
-    addenv(blk, "SYSTEMROOT=%s", s);
-  }
-  if ((s = getenv("SystemDrive")) != NULL) {
-    addenv(blk, "SystemDrive=%s", s);
-  }
-#else
-  if ((s = getenv("LD_LIBRARY_PATH")) != NULL)
-    addenv(blk, "LD_LIBRARY_PATH=%s", s);
-#endif // _WIN32
-
-  if ((s = getenv("PERLLIB")) != NULL)
-    addenv(blk, "PERLLIB=%s", s);
-
-  if (conn->request_info.remote_user != NULL) {
-    addenv(blk, "REMOTE_USER=%s", conn->request_info.remote_user);
-    addenv(blk, "%s", "AUTH_TYPE=Digest");
-  }
-
-  // Add all headers as HTTP_* variables
-  for (i = 0; i < conn->request_info.num_headers; i++) {
-    p = addenv(blk, "HTTP_%s=%s",
-        conn->request_info.http_headers[i].name,
-        conn->request_info.http_headers[i].value);
-
-    // Convert variable name into uppercase, and change - to _
-    for (; *p != '=' && *p != '\0'; p++) {
-      if (*p == '-')
-        *p = '_';
-      *p = (char) toupper(* (unsigned char *) p);
-    }
-  }
-
-  // Add user-specified variables
-  s = conn->ctx->config[CGI_ENVIRONMENT];
-  while ((s = next_option(s, &var_vec, NULL)) != NULL) {
-    addenv(blk, "%.*s", (int) var_vec.len, var_vec.ptr);
-  }
-
-  blk->vars[blk->nvars++] = NULL;
-  blk->buf[blk->len++] = '\0';
-
-  assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
-  assert(blk->len > 0);
-  assert(blk->len < (int) sizeof(blk->buf));
-}
-
-static void handle_cgi_request(struct mg_connection *conn, const char *prog) {
-  int headers_len, data_len, i, fd_stdin[2], fd_stdout[2];
-  const char *status, *status_text;
-  char buf[16384], *pbuf, dir[PATH_MAX], *p;
-  struct mg_request_info ri;
-  struct cgi_env_block blk;
-  FILE *in, *out;
-  struct file fout = STRUCT_FILE_INITIALIZER;
-  pid_t pid;
-
-  prepare_cgi_environment(conn, prog, &blk);
-
-  // CGI must be executed in its own directory. 'dir' must point to the
-  // directory containing executable program, 'p' must point to the
-  // executable program name relative to 'dir'.
-  (void) mg_snprintf(conn, dir, sizeof(dir), "%s", prog);
-  if ((p = strrchr(dir, '/')) != NULL) {
-    *p++ = '\0';
-  } else {
-    dir[0] = '.', dir[1] = '\0';
-    p = (char *) prog;
-  }
-
-  pid = (pid_t) -1;
-  fd_stdin[0] = fd_stdin[1] = fd_stdout[0] = fd_stdout[1] = -1;
-  in = out = NULL;
-
-  if (pipe(fd_stdin) != 0 || pipe(fd_stdout) != 0) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot create CGI pipe: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  pid = spawn_process(conn, p, blk.buf, blk.vars, fd_stdin[0], fd_stdout[1],
-                      dir);
-  // spawn_process() must close those!
-  // If we don't mark them as closed, close() attempt before
-  // return from this function throws an exception on Windows.
-  // Windows does not like when closed descriptor is closed again.
-  fd_stdin[0] = fd_stdout[1] = -1;
-
-  if (pid == (pid_t) -1) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot spawn CGI process [%s]: %s", prog, strerror(ERRNO));
-    goto done;
-  }
-
-  if ((in = fdopen(fd_stdin[1], "wb")) == NULL ||
-      (out = fdopen(fd_stdout[0], "rb")) == NULL) {
-    send_http_error(conn, 500, http_500_error,
-        "fopen: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  setbuf(in, NULL);
-  setbuf(out, NULL);
-  fout.fp = out;
-
-  // Send POST data to the CGI process if needed
-  if (!strcmp(conn->request_info.request_method, "POST") &&
-      !forward_body_data(conn, in, INVALID_SOCKET, NULL)) {
-    goto done;
-  }
-
-  // Close so child gets an EOF.
-  fclose(in);
-  in = NULL;
-  fd_stdin[1] = -1;
-
-  // Now read CGI reply into a buffer. We need to set correct
-  // status code, thus we need to see all HTTP headers first.
-  // Do not send anything back to client, until we buffer in all
-  // HTTP headers.
-  data_len = 0;
-  headers_len = read_request(out, conn, buf, sizeof(buf), &data_len);
-  if (headers_len <= 0) {
-    send_http_error(conn, 500, http_500_error,
-                    "CGI program sent malformed or too big (>%u bytes) "
-                    "HTTP headers: [%.*s]",
-                    (unsigned) sizeof(buf), data_len, buf);
-    goto done;
-  }
-  pbuf = buf;
-  buf[headers_len - 1] = '\0';
-  parse_http_headers(&pbuf, &ri);
-
-  // Make up and send the status line
-  status_text = "OK";
-  if ((status = get_header(&ri, "Status")) != NULL) {
-    conn->status_code = atoi(status);
-    status_text = status;
-    while (isdigit(* (unsigned char *) status_text) || *status_text == ' ') {
-      status_text++;
-    }
-  } else if (get_header(&ri, "Location") != NULL) {
-    conn->status_code = 302;
-  } else {
-    conn->status_code = 200;
-  }
-  if (get_header(&ri, "Connection") != NULL &&
-      !mg_strcasecmp(get_header(&ri, "Connection"), "keep-alive")) {
-    conn->must_close = 1;
-  }
-  (void) mg_printf(conn, "HTTP/1.1 %d %s\r\n", conn->status_code,
-                   status_text);
-
-  // Send headers
-  for (i = 0; i < ri.num_headers; i++) {
-    mg_printf(conn, "%s: %s\r\n",
-              ri.http_headers[i].name, ri.http_headers[i].value);
-  }
-  mg_write(conn, "\r\n", 2);
-
-  // Send chunk of data that may have been read after the headers
-  conn->num_bytes_sent += mg_write(conn, buf + headers_len,
-                                   (size_t)(data_len - headers_len));
-
-  // Read the rest of CGI output and send to the client
-  send_file_data(conn, &fout, 0, INT64_MAX);
-
-done:
-  if (pid != (pid_t) -1) {
-    kill(pid, SIGKILL);
-  }
-  if (fd_stdin[0] != -1) {
-    close(fd_stdin[0]);
-  }
-  if (fd_stdout[1] != -1) {
-    close(fd_stdout[1]);
-  }
-
-  if (in != NULL) {
-    fclose(in);
-  } else if (fd_stdin[1] != -1) {
-    close(fd_stdin[1]);
-  }
-
-  if (out != NULL) {
-    fclose(out);
-  } else if (fd_stdout[0] != -1) {
-    close(fd_stdout[0]);
-  }
-}
-#endif // !NO_CGI
-
 // For a given PUT path, create all intermediate subdirectories
 // for given path. Return 0 if the path itself is a directory,
 // or -1 on error, 1 if OK.
 static int put_dir(struct mg_connection *conn, const char *path) {
   char buf[PATH_MAX];
   const char *s, *p;
+  size_t len;
   struct file file = STRUCT_FILE_INITIALIZER;
-  int len, res = 1;
+  int res = 1;
 
   for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) {
     len = p - path;
-    if (len >= (int) sizeof(buf)) {
+    if (len >= sizeof(buf)) {
       res = -1;
       break;
     }
@@ -3904,158 +3406,6 @@
   return ntohl(* (uint32_t *) &conn->client.rsa.sin.sin_addr);
 }
 
-#ifdef USE_LUA
-
-#ifdef _WIN32
-static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,
-                  int offset) {
-  HANDLE fh = (HANDLE) _get_osfhandle(fd);
-  HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);
-  void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);
-  CloseHandle(fh);
-  CloseHandle(mh);
-  return p;
-}
-#define munmap(x, y)  UnmapViewOfFile(x)
-#define MAP_FAILED NULL
-#define MAP_PRIVATE 0
-#define PROT_READ 0
-#else
-#include <sys/mman.h>
-#endif
-
-static void lsp(struct mg_connection *conn, const char *p, int64_t len,
-                lua_State *L) {
-  int i, j, pos = 0;
-
-  for (i = 0; i < len; i++) {
-    if (p[i] == '<' && p[i + 1] == '?') {
-      for (j = i + 1; j < len ; j++) {
-        if (p[j] == '?' && p[j + 1] == '>') {
-          mg_write(conn, p + pos, i - pos);
-          if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), "") == LUA_OK) {
-            lua_pcall(L, 0, LUA_MULTRET, 0);
-          }
-          pos = j + 2;
-          i = pos - 1;
-          break;
-        }
-      }
-    }
-  }
-
-  if (i > pos) {
-    mg_write(conn, p + pos, i - pos);
-  }
-}
-
-static int lsp_mg_print(lua_State *L) {
-  int i, num_args;
-  const char *str;
-  size_t size;
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-
-  num_args = lua_gettop(L);
-  for (i = 1; i <= num_args; i++) {
-    if (lua_isstring(L, i)) {
-      str = lua_tolstring(L, i, &size);
-      mg_write(conn, str, size);
-    }
-  }
-
-  return 0;
-}
-
-static int lsp_mg_read(lua_State *L) {
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  char buf[1024];
-  int len = mg_read(conn, buf, sizeof(buf));
-
-  lua_settop(L, 0);
-  lua_pushlstring(L, buf, len);
-
-  return 1;
-}
-
-static void reg_string(struct lua_State *L, const char *name, const char *val) {
-  lua_pushstring(L, name);
-  lua_pushstring(L, val);
-  lua_rawset(L, -3);
-}
-
-static void reg_int(struct lua_State *L, const char *name, int val) {
-  lua_pushstring(L, name);
-  lua_pushinteger(L, val);
-  lua_rawset(L, -3);
-}
-
-static void prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
-  const struct mg_request_info *ri = mg_get_request_info(conn);
-  extern void luaL_openlibs(lua_State *);
-  int i;
-
-  luaL_openlibs(L);
-#ifdef USE_LUA_SQLITE3
-  { extern int luaopen_lsqlite3(lua_State *); luaopen_lsqlite3(L); }
-#endif
-
-  // Register "print" function which calls mg_write()
-  lua_pushlightuserdata(L, conn);
-  lua_pushcclosure(L, lsp_mg_print, 1);
-  lua_setglobal(L, "print");
-
-  // Register mg_read()
-  lua_pushlightuserdata(L, conn);
-  lua_pushcclosure(L, lsp_mg_read, 1);
-  lua_setglobal(L, "read");
-
-  // Export request_info
-  lua_newtable(L);
-  reg_string(L, "request_method", ri->request_method);
-  reg_string(L, "uri", ri->uri);
-  reg_string(L, "http_version", ri->http_version);
-  reg_string(L, "query_string", ri->query_string);
-  reg_int(L, "remote_ip", ri->remote_ip);
-  reg_int(L, "remote_port", ri->remote_port);
-  reg_int(L, "num_headers", ri->num_headers);
-  lua_pushstring(L, "http_headers");
-  lua_newtable(L);
-  for (i = 0; i < ri->num_headers; i++) {
-    reg_string(L, ri->http_headers[i].name, ri->http_headers[i].value);
-  }
-  lua_rawset(L, -3);
-  lua_setglobal(L, "request_info");
-}
-
-static void handle_lsp_request(struct mg_connection *conn, const char *path,
-                               struct file *filep) {
-  void *p = NULL;
-  lua_State *L = NULL;
-
-  if (!mg_stat(conn, path, filep) || !mg_fopen(conn, path, "r", filep)) {
-    send_http_error(conn, 404, "Not Found", "%s", "File not found");
-  } else if (filep->membuf == NULL &&
-             (p = mmap(NULL, (size_t) filep->size, PROT_READ, MAP_PRIVATE,
-                       fileno(filep->fp), 0)) == MAP_FAILED) {
-    send_http_error(conn, 500, http_500_error, "mmap(%s, %zu, %d): %s", path,
-                    (size_t) filep->size, fileno(filep->fp), strerror(errno));
-  } else if ((L = luaL_newstate()) == NULL) {
-    send_http_error(conn, 500, http_500_error, "%s", "luaL_newstate failed");
-  } else {
-    // We're not sending HTTP headers here, Lua page must do it.
-    prepare_lua_environment(conn, L);
-    if (conn->ctx->callbacks.init_lua != NULL) {
-      conn->ctx->callbacks.init_lua(conn, L);
-    }
-    lsp(conn, filep->membuf == NULL ? p : filep->membuf, filep->size, L);
-  }
-
-  if (L) lua_close(L);
-  if (p) munmap(p, filep->size);
-  mg_fclose(filep);
-}
-#endif // USE_LUA
-
 static int is_put_or_delete_request(const struct mg_connection *conn) {
   const char *s = conn->request_info.request_method;
   return s != NULL && (!strcmp(s, "PUT") || !strcmp(s, "DELETE"));
@@ -4151,23 +3501,6 @@
       send_http_error(conn, 403, "Directory Listing Denied",
           "Directory listing denied");
     }
-#ifdef USE_LUA
-  } else if (match_prefix("**.lp$", 6, path) > 0) {
-    handle_lsp_request(conn, path, &file);
-#endif
-#if !defined(NO_CGI)
-  } else if (match_prefix(conn->ctx->config[CGI_EXTENSIONS],
-                          strlen(conn->ctx->config[CGI_EXTENSIONS]),
-                          path) > 0) {
-    if (strcmp(ri->request_method, "POST") &&
-        strcmp(ri->request_method, "HEAD") &&
-        strcmp(ri->request_method, "GET")) {
-      send_http_error(conn, 501, "Not Implemented",
-                      "Method %s is not implemented", ri->request_method);
-    } else {
-      handle_cgi_request(conn, path);
-    }
-#endif // !NO_CGI
   } else if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],
                           strlen(conn->ctx->config[SSI_EXTENSIONS]),
                           path) > 0) {

sview-15_08.tar.gz/3rdparty/include/mongoose.h -> sview-15_10.tar.gz/3rdparty/include/mongoose.h Changed

sview-15_08.tar.gz/Makefile -> sview-15_10.tar.gz/Makefile Changed

@@ -86,6 +86,12 @@
 clean:     clean_StShared clean_StGLWidgets clean_StCore clean_sView clean_StOutAnaglyph clean_StOutDual clean_StOutInterlace clean_StOutPageFlip clean_StOutIZ3D clean_StOutDistorted clean_StImageViewer clean_StMoviePlayer clean_StDiagnostics clean_StCADViewer clean_sViewAndroid
 distclean: clean
 
+ifdef ANDROID_NDK
+outputs_all: $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted)
+else
+outputs_all: $(aStOutAnaglyph) $(aStOutDual) $(aStOutInterlace) $(aStOutPageFlip) $(aStOutIZ3D) $(aStOutDistorted)
+endif
+
 install:
 	mkdir -p $(DESTDIR)/usr/bin
 	mkdir -p $(DESTDIR)/usr/$(USR_LIB)/sView
@@ -115,6 +121,7 @@
 	mkdir -p sview/assets/lang/French
 	mkdir -p sview/assets/lang/English
 	mkdir -p sview/assets/lang/Russian
+	mkdir -p sview/assets/lang/Czech
 	mkdir -p sview/assets/shaders
 	mkdir -p sview/assets/textures
 	ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStShared)       sview/libs/armeabi-v7a/$(aStShared)
@@ -130,6 +137,7 @@
 	cp -f -r $(BUILD_ROOT)/lang/français/* sview/assets/lang/French/
 	cp -f -r $(BUILD_ROOT)/lang/English/*  sview/assets/lang/English/
 	cp -f -r $(BUILD_ROOT)/lang/русский/*  sview/assets/lang/Russian/
+	cp -f -r $(BUILD_ROOT)/lang/Czech/*    sview/assets/lang/Czech/
 	cp -f -r $(BUILD_ROOT)/shaders/*       sview/assets/shaders/
 	cp -f -r $(BUILD_ROOT)/textures/*      sview/assets/textures/
 	cp -f    license-gpl-3.0.txt           sview/assets/info/license.txt
@@ -139,6 +147,7 @@
 	mkdir -p $(BUILD_ROOT)/lang/русский
 	mkdir -p $(BUILD_ROOT)/lang/français
 	mkdir -p $(BUILD_ROOT)/lang/Deutsch
+	mkdir -p $(BUILD_ROOT)/lang/Czech
 	mkdir -p $(BUILD_ROOT)/textures
 	mkdir -p $(BUILD_ROOT)/web
 	mkdir -p sview/libs/armeabi-v7a
@@ -158,10 +167,10 @@
 aStGLWidgets_SRCS := $(wildcard StGLWidgets/*.cpp)
 aStGLWidgets_OBJS := ${aStGLWidgets_SRCS:.cpp=.o}
 aStGLWidgets_LIB  := $(LIB) -lStShared $(LIB_GLX)
-$(aStGLWidgets) : pre_StGLWidgets $(aStGLWidgets_OBJS)
+$(aStGLWidgets) : pre_StGLWidgets $(aStShared) $(aStGLWidgets_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStGLWidgets_OBJS) $(aStGLWidgets_LIB) -o $(BUILD_ROOT)/$(aStGLWidgets)
 pre_StGLWidgets:
-	
+
 clean_StGLWidgets:
 	rm -f $(BUILD_ROOT)/$(aStGLWidgets)
 	rm -rf StGLWidgets/*.o
@@ -170,7 +179,7 @@
 aStCore_SRCS := $(wildcard StCore/*.cpp)
 aStCore_OBJS := ${aStCore_SRCS:.cpp=.o}
 aStCore_LIB  := $(LIB) -lStShared $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD) $(LIB_XLIB) $(LIB_ANDROID)
-$(aStCore) : $(aStCore_OBJS)
+$(aStCore) : $(aStShared) $(aStCore_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStCore_OBJS) $(aStCore_LIB) -o $(BUILD_ROOT)/$(aStCore)
 clean_StCore:
 	rm -f $(BUILD_ROOT)/$(aStCore)
@@ -180,7 +189,7 @@
 aStOutAnaglyph_SRCS := $(wildcard StOutAnaglyph/*.cpp)
 aStOutAnaglyph_OBJS := ${aStOutAnaglyph_SRCS:.cpp=.o}
 aStOutAnaglyph_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutAnaglyph) : pre_StOutAnaglyph $(aStOutAnaglyph_OBJS)
+$(aStOutAnaglyph) : pre_StOutAnaglyph $(aStCore) $(aStOutAnaglyph_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutAnaglyph_OBJS) $(aStOutAnaglyph_LIB) -o $(BUILD_ROOT)/$(aStOutAnaglyph)
 pre_StOutAnaglyph:
 	mkdir -p $(BUILD_ROOT)/shaders/StOutAnaglyph/
@@ -189,6 +198,7 @@
 	cp -f -r StOutAnaglyph/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutAnaglyph/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutAnaglyph/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutAnaglyph/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutAnaglyph:
 	rm -f $(BUILD_ROOT)/$(aStOutAnaglyph)
 	rm -rf StOutAnaglyph/*.o
@@ -199,13 +209,14 @@
 aStOutDual_SRCS := $(wildcard StOutDual/*.cpp)
 aStOutDual_OBJS := ${aStOutDual_SRCS:.cpp=.o}
 aStOutDual_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutDual) : pre_StOutDual $(aStOutDual_OBJS)
+$(aStOutDual) : pre_StOutDual $(aStCore) $(aStOutDual_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutDual_OBJS) $(aStOutDual_LIB) -o $(BUILD_ROOT)/$(aStOutDual)
 pre_StOutDual:
 	cp -f -r StOutDual/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StOutDual/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutDual/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutDual/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutDual/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutDual:
 	rm -f $(BUILD_ROOT)/$(aStOutDual)
 	rm -rf StOutDual/*.o
@@ -215,7 +226,7 @@
 aStOutIZ3D_SRCS := $(wildcard StOutIZ3D/*.cpp)
 aStOutIZ3D_OBJS := ${aStOutIZ3D_SRCS:.cpp=.o}
 aStOutIZ3D_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutIZ3D) : pre_StOutIZ3D $(aStOutIZ3D_OBJS)
+$(aStOutIZ3D) : pre_StOutIZ3D $(aStCore) $(aStOutIZ3D_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutIZ3D_OBJS) $(aStOutIZ3D_LIB) -o $(BUILD_ROOT)/$(aStOutIZ3D)
 pre_StOutIZ3D:
 	mkdir -p $(BUILD_ROOT)/shaders/StOutIZ3D/
@@ -224,6 +235,7 @@
 	cp -f -r StOutIZ3D/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutIZ3D/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutIZ3D/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutIZ3D/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutIZ3D:
 	rm -f $(BUILD_ROOT)/$(aStOutIZ3D)
 	rm -rf StOutIZ3D/*.o
@@ -234,7 +246,7 @@
 aStOutInterlace_SRCS := $(wildcard StOutInterlace/*.cpp)
 aStOutInterlace_OBJS := ${aStOutInterlace_SRCS:.cpp=.o}
 aStOutInterlace_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutInterlace) : pre_StOutInterlace $(aStOutInterlace_OBJS)
+$(aStOutInterlace) : pre_StOutInterlace $(aStCore) $(aStOutInterlace_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutInterlace_OBJS) $(aStOutInterlace_LIB) -o $(BUILD_ROOT)/$(aStOutInterlace)
 pre_StOutInterlace:
 	mkdir -p $(BUILD_ROOT)/shaders/StOutInterlace/
@@ -243,6 +255,7 @@
 	cp -f -r StOutInterlace/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutInterlace/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutInterlace/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutInterlace/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutInterlace:
 	rm -f $(BUILD_ROOT)/$(aStOutInterlace)
 	rm -rf StOutInterlace/*.o
@@ -253,13 +266,14 @@
 aStOutPageFlip_SRCS := $(wildcard StOutPageFlip/*.cpp)
 aStOutPageFlip_OBJS := ${aStOutPageFlip_SRCS:.cpp=.o}
 aStOutPageFlip_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutPageFlip) : pre_StOutPageFlip $(aStOutPageFlip_OBJS)
+$(aStOutPageFlip) : pre_StOutPageFlip $(aStCore) $(aStOutPageFlip_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutPageFlip_OBJS) $(aStOutPageFlip_LIB) -o $(BUILD_ROOT)/$(aStOutPageFlip)
 pre_StOutPageFlip:
 	cp -f -r StOutPageFlip/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StOutPageFlip/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutPageFlip/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutPageFlip/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutPageFlip/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutPageFlip:
 	rm -f $(BUILD_ROOT)/$(aStOutPageFlip)
 	rm -rf StOutPageFlip/*.o
@@ -269,13 +283,14 @@
 aStOutDistorted_SRCS := $(wildcard StOutDistorted/*.cpp)
 aStOutDistorted_OBJS := ${aStOutDistorted_SRCS:.cpp=.o}
 aStOutDistorted_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)
-$(aStOutDistorted) : pre_StOutDistorted $(aStOutDistorted_OBJS)
+$(aStOutDistorted) : pre_StOutDistorted $(aStCore) $(aStOutDistorted_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutDistorted_OBJS) $(aStOutDistorted_LIB) -o $(BUILD_ROOT)/$(aStOutDistorted)
 pre_StOutDistorted:
 	cp -f -r StOutDistorted/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StOutDistorted/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StOutDistorted/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StOutDistorted/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StOutDistorted/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StOutDistorted:
 	rm -f $(BUILD_ROOT)/$(aStOutDistorted)
 	rm -rf StOutDistorted/*.o
@@ -285,13 +300,14 @@
 aStImageViewer_SRCS := $(wildcard 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 $(aStImageViewer_OBJS)
+$(aStImageViewer) : pre_StImageViewer $(aStGLWidgets) outputs_all $(aStImageViewer_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStImageViewer_OBJS) $(aStImageViewer_LIB) -o $(BUILD_ROOT)/$(aStImageViewer)
 pre_StImageViewer:
 	cp -f -r StImageViewer/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StImageViewer/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StImageViewer/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StImageViewer/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StImageViewer/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StImageViewer:
 	rm -f $(BUILD_ROOT)/$(aStImageViewer)
 	rm -rf StImageViewer/*.o
@@ -305,13 +321,14 @@
 aStMoviePlayer_SRCS3 := $(wildcard StMoviePlayer/*.c)
 aStMoviePlayer_OBJS3 := ${aStMoviePlayer_SRCS3:.c=.o}
 aStMoviePlayer_LIB   := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) -lavutil -lavformat -lavcodec -lswscale -lopenal $(LIB_PTHREAD)
-$(aStMoviePlayer) : pre_StMoviePlayer $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3)
+$(aStMoviePlayer) : pre_StMoviePlayer $(aStGLWidgets) outputs_all $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3) $(aStMoviePlayer_LIB) -o $(BUILD_ROOT)/$(aStMoviePlayer)
 pre_StMoviePlayer:
 	cp -f -r StMoviePlayer/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StMoviePlayer/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StMoviePlayer/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StMoviePlayer/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StMoviePlayer/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 	cp -f -r StMoviePlayer/web/*          $(BUILD_ROOT)/web/
 clean_StMoviePlayer:
 	rm -f $(BUILD_ROOT)/$(aStMoviePlayer)
@@ -324,13 +341,14 @@
 aStDiagnostics_SRCS := $(wildcard 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 $(aStDiagnostics_OBJS)
+$(aStDiagnostics) : pre_StDiagnostics $(aStGLWidgets) outputs_all $(aStDiagnostics_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStDiagnostics_OBJS) $(aStDiagnostics_LIB) -o $(BUILD_ROOT)/$(aStDiagnostics)
 pre_StDiagnostics:
 	cp -f -r StDiagnostics/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StDiagnostics/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StDiagnostics/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StDiagnostics/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StDiagnostics/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StDiagnostics:
 	rm -f $(BUILD_ROOT)/$(aStDiagnostics)
 	rm -rf StDiagnostics/*.o
@@ -343,13 +361,14 @@
 ifdef WITH_OCCT
 aStCADViewer_LIB  += $(LIB_OCCT)
 endif
-$(aStCADViewer) : pre_StCADViewer $(aStCADViewer_OBJS)
+$(aStCADViewer) : pre_StCADViewer $(aStGLWidgets) outputs_all $(aStCADViewer_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStCADViewer_OBJS) $(aStCADViewer_LIB) -o $(BUILD_ROOT)/$(aStCADViewer)
 pre_StCADViewer:
 	cp -f -r StCADViewer/lang/english/* $(BUILD_ROOT)/lang/English/
 	cp -f -r StCADViewer/lang/russian/* $(BUILD_ROOT)/lang/русский/
 	cp -f -r StCADViewer/lang/french/*  $(BUILD_ROOT)/lang/français/
 	cp -f -r StCADViewer/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/
+	cp -f -r StCADViewer/lang/czech/*   $(BUILD_ROOT)/lang/Czech/
 clean_StCADViewer:
 	rm -f $(BUILD_ROOT)/$(aStCADViewer)
 	rm -rf StCADViewer/*.o
@@ -359,7 +378,7 @@
 sViewAndroid_SRCS := $(wildcard sview/jni/*.cpp)
 sViewAndroid_OBJS := ${sViewAndroid_SRCS:.cpp=.o}
 sViewAndroid_LIB  := $(LIB) -lStShared -lStCore -lStImageViewer -lStMoviePlayer -llog -landroid -lEGL -lGLESv2 -lc
-$(sViewAndroid) : $(sViewAndroid_OBJS)
+$(sViewAndroid) : $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid_OBJS)
 	$(LD) -shared $(LDFLAGS) $(LIBDIR) $(sViewAndroid_OBJS) $(sViewAndroid_LIB) -o $(BUILD_ROOT)/$(sViewAndroid)
 clean_sViewAndroid:
 	rm -f $(BUILD_ROOT)/$(sViewAndroid)
@@ -372,7 +391,7 @@
 ifdef WITH_OCCT
 sView_LIB += $(LIB_OCCT)
 endif
-$(sView) : $(sView_OBJS)
+$(sView) : $(aStImageViewer) $(aStMoviePlayer) $(aStDiagnostics) $(sView_OBJS)
 	$(LD) $(LDFLAGS) $(LIBDIR) $(sView_OBJS) $(sView_LIB) -o $(BUILD_ROOT)/$(sView)
 clean_sView:
 	rm -f $(BUILD_ROOT)/$(sView)

sview-15_08.tar.gz/StCADViewer/StCADViewer.cpp -> sview-15_10.tar.gz/StCADViewer/StCADViewer.cpp Changed

sview-15_08.tar.gz/StCADViewer/StCADViewer.h -> sview-15_10.tar.gz/StCADViewer/StCADViewer.h Changed

sview-15_08.tar.gz/StCADViewer/StCADViewerGUI.cpp -> sview-15_10.tar.gz/StCADViewer/StCADViewerGUI.cpp Changed

sview-15_10.tar.gz/StCADViewer/lang/czech Added

sview-15_10.tar.gz/StCADViewer/lang/czech/StCADViewer.lng Added

sview-15_10.tar.gz/StCADViewer/lang/czech/language.lng Added

sview-15_08.tar.gz/StCore/StAndroidGlue.cpp -> sview-15_10.tar.gz/StCore/StAndroidGlue.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StCore library is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -26,6 +26,9 @@
 #include <StThreads/StThread.h>
 #include <StStrings/StLogger.h>
 
+#include <jni.h>
+#define jexp extern "C" JNIEXPORT
+
 StCString StAndroidGlue::getCommandIdName(StAndroidGlue::CommandId theCmd) {
     switch(theCmd) {
         case StAndroidGlue::CommandId_InputChanged:  return stCString("InputChanged");
@@ -43,6 +46,7 @@
         case StAndroidGlue::CommandId_Pause:         return stCString("Pause");
         case StAndroidGlue::CommandId_Stop:          return stCString("Stop");
         case StAndroidGlue::CommandId_Destroy:       return stCString("Destroy");
+        case StAndroidGlue::CommandId_BackPressed:   return stCString("BackPressed");
     }
     return stCString("UNKNOWN");
 }
@@ -65,6 +69,9 @@
   myThJniEnv(NULL),
   myMsgRead(0),
   myMsgWrite(0),
+  myHasOrientSensor(false),
+  myIsPoorOrient(false),
+  myToTrackOrient(false),
   myIsRunning(false),
   myIsStateSaved(false),
   myToDestroy(false) {
@@ -140,6 +147,7 @@
     jclass      aJClassIntent       = aJniEnv->GetObjectClass(aJIntent);
     jmethodID   aJMet_getDataString = aJniEnv->GetMethodID(aJClassIntent, "getDataString", "()Ljava/lang/String;");
     jmethodID   aJMet_getType       = aJniEnv->GetMethodID(aJClassIntent, "getType",       "()Ljava/lang/String;");
+    jmethodID   aJMet_getFlags      = aJniEnv->GetMethodID(aJClassIntent, "getFlags",      "()I");
 
     // retrieve data path
     jstring     aJString      = (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getDataString);
@@ -148,13 +156,14 @@
     aJniEnv->ReleaseStringUTFChars(aJString, aJStringStr);
 
     // retrieve data type
+    int aFlags    = aJniEnv->CallIntMethod(aJIntent, aJMet_getFlags);
     aJString      = (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getType);
     aJStringStr   = aJniEnv->GetStringUTFChars(aJString, 0);
     const StString aDataType = aJStringStr;
     aJniEnv->ReleaseStringUTFChars(aJString, aJStringStr);
 
     // reset intent in Activity
-    aJniEnv->CallObjectMethod(myActivity->clazz, aJMet_setIntent, NULL);
+    aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_setIntent, NULL);
 
     const StString ST_FILE_PROTOCOL("file://");
     if(aDataPath.isStartsWith(ST_FILE_PROTOCOL)) {
@@ -163,22 +172,34 @@
         aDataPath.fromUrl(aPath);
     }
 
-    StMutexAuto aLock(myDndLock);
-    myDndPath = aDataPath;
+    StMutexAuto aLock(myFetchLock);
+    if(myCreatePath.isEmpty()) {
+        myCreatePath = aDataPath;
+    }
+    // FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
+    // ignore outdated intent from history list - use C++ recent list instead
+    if((aFlags & 0x00100000) == 0) {
+        myDndPath = aDataPath;
+    }
 }
 
-bool StAndroidGlue::popOpenNewFile(StString& theNewFile) {
-    StMutexAuto aLock(myDndLock);
-    if(myDndPath.isEmpty()) {
-        return false;
+void StAndroidGlue::fetchState(StString&             theNewFile,
+                               StQuaternion<double>& theQuaternion) {
+    StMutexAuto aLock(myFetchLock);
+    theQuaternion = myQuaternion;
+    if(!myDndPath.isEmpty()) {
+        theNewFile = myDndPath;
+        myDndPath.clear();
     }
-
-    theNewFile = myDndPath;
-    myDndPath.clear();
-    return true;
 }
 
 void StAndroidGlue::start() {
+    // workaround NativeActivity design issues - notify Java StActivity class about C++ pointer to StAndroidGlue instance
+    JNIEnv* aJniEnv = myActivity->env;
+    jclass    aJClassActivity   = aJniEnv->GetObjectClass(myActivity->clazz);
+    jmethodID aJMet_setInstance = aJniEnv->GetMethodID(aJClassActivity, "setCppInstance", "(J)V");
+    aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_setInstance, (jlong )this);
+
     myThread = new StThread(threadEntryWrapper, this, "StAndroidGlue");
 
     // Wait for thread to start
@@ -190,6 +211,15 @@
 }
 
 StAndroidGlue::~StAndroidGlue() {
+    // workaround NativeActivity design issues - notify Java StActivity class about C++ pointer to StAndroidGlue instance
+    if(myActivity != NULL
+    && myActivity->env != NULL) {
+        JNIEnv* aJniEnv = myActivity->env;
+        jclass    aJClassActivity   = aJniEnv->GetObjectClass(myActivity->clazz);
+        jmethodID aJMet_setInstance = aJniEnv->GetMethodID(aJClassActivity, "setCppInstance", "(J)V");
+        aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_setInstance, (jlong )0);
+    }
+
     pthread_mutex_lock(&myMutex);
     writeCommand(CommandId_Destroy);
     pthread_mutex_unlock(&myMutex);
@@ -608,4 +638,61 @@
     return aSavedState;
 }
 
+void StAndroidGlue::setTrackOrientation(const bool theToTrack) {
+    if(myToTrackOrient == theToTrack
+    || myActivity == NULL
+    || myThJniEnv == NULL) {
+        return;
+    }
+
+    jclass    aJClassActivity = myThJniEnv->GetObjectClass(myActivity->clazz);
+    jmethodID aJMet           = myThJniEnv->GetMethodID(aJClassActivity, "setTrackOrientation", "(Z)V");
+    myThJniEnv->CallVoidMethod(myActivity->clazz, aJMet, (jboolean )(theToTrack ? JNI_TRUE : JNI_FALSE));
+    myToTrackOrient = theToTrack;
+}
+
+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));
+    const StQuaternion<double> anOriRoll  = StQuaternion<double>(StVec3<double>::DZ(), stToRadians(-270.0 + (double )theScreenRotDeg));
+    const StQuaternion<double> anOriAnd((double )theQ.y(), (double )theQ.z(), (double )theQ.x(), (double )theQ.w());
+    StQuaternion<double> anOri = StQuaternion<double>::multiply(anOriAnd, anOriPitch);
+    anOri = StQuaternion<double>::multiply(anOriRoll, anOri);
+
+    StMutexAuto aLock(myFetchLock);
+    myQuaternion = anOri;
+}
+
+void StAndroidGlue::setOrientation(float theAzimuthDeg, float thePitchDeg, float theRollDeg, float theScreenRotDeg) {
+    const StQuaternion<double> anOriYaw   = StQuaternion<double>(StVec3<double>::DY(), stToRadians((double )theAzimuthDeg));
+    const StQuaternion<double> anOriPitch = StQuaternion<double>(StVec3<double>::DX(), stToRadians(90.0 + (double )thePitchDeg));
+    const StQuaternion<double> anOriRoll  = StQuaternion<double>(StVec3<double>::DZ(), stToRadians((double )-theRollDeg + (double )theScreenRotDeg));
+    StQuaternion<double> anOri = StQuaternion<double>::multiply(anOriPitch, anOriYaw);
+    anOri = StQuaternion<double>::multiply(anOriRoll, anOri);
+
+    StMutexAuto aLock(myFetchLock);
+    myQuaternion = anOri;
+}
+
+jexp void JNICALL Java_com_sview_StActivity_cppOnBackPressed(JNIEnv* theEnv, jobject theObj, jlong theCppPtr) {
+    ((StAndroidGlue* )theCppPtr)->writeCommand(StAndroidGlue::CommandId_BackPressed);
+}
+
+jexp void JNICALL Java_com_sview_StActivity_cppDefineOrientationSensor(JNIEnv* theEnv, jobject theObj, jlong theCppPtr,
+                                                                       jboolean theHasOri, jboolean theIsPoorOri) {
+    ((StAndroidGlue* )theCppPtr)->defineOrientationSensor(theHasOri == JNI_TRUE, theIsPoorOri == JNI_TRUE);
+}
+
+jexp void JNICALL Java_com_sview_StActivity_cppSetQuaternion(JNIEnv* theEnv, jobject theObj, jlong theCppPtr,
+                                                             jfloat theX, jfloat theY, jfloat theZ, jfloat theW,
+                                                             jfloat theScreenRotDeg) {
+    ((StAndroidGlue* )theCppPtr)->setQuaternion(StQuaternion<float>(theX, theY, theZ, theW), theScreenRotDeg);
+}
+
+jexp void JNICALL Java_com_sview_StActivity_cppSetOrientation(JNIEnv* theEnv, jobject theObj, jlong theCppPtr,
+                                                              jfloat theAzimuthDeg, jfloat thePitchDeg, jfloat theRollDeg,
+                                                              jfloat theScreenRotDeg) {
+    ((StAndroidGlue* )theCppPtr)->setOrientation(theAzimuthDeg, thePitchDeg, theRollDeg, theScreenRotDeg);
+}
+
 #endif // __ANDROID__

sview-15_08.tar.gz/StCore/StApplication.cpp -> sview-15_10.tar.gz/StCore/StApplication.cpp Changed

@@ -229,6 +229,7 @@
         // connect slots
         myWindow->signals.onRedraw    = stSlot(this, &StApplication::doDrawProxy);
         myWindow->signals.onClose     = stSlot(this, &StApplication::doClose);
+        myWindow->signals.onPause     = stSlot(this, &StApplication::doPause);
         myWindow->signals.onResize    = stSlot(this, &StApplication::doResize);
         myWindow->signals.onAction    = stSlot(this, &StApplication::doAction);
         myWindow->signals.onKeyDown   = stSlot(this, &StApplication::doKeyDown);
@@ -318,6 +319,12 @@
     exit(0);
 }
 
+void StApplication::doPause(const StPauseEvent& ) {
+    if(!myWindow.isNull()) {
+        myWindow->beforeClose();
+    }
+}
+
 const StHandle<StAction>& StApplication::getAction(const int theActionId) {
     return myActions[theActionId];
     //return myActions.at(theActionId);
@@ -350,9 +357,17 @@
         anIter != myActions.end(); ++anIter) {
         const StHandle<StAction>& anAction = anIter->second;
         if(anAction->getHotKey1() != 0) {
+            StHandle<StAction> anOldAction = getActionForKey(anAction->getHotKey1());
+            if(!anOldAction.isNull()) {
+                anOldAction->setHotKey1(0);
+            }
             myKeyActions[anAction->getHotKey1()] = anAction;
         }
         if(anAction->getHotKey2() != 0) {
+            StHandle<StAction> anOldAction = getActionForKey(anAction->getHotKey2());
+            if(!anOldAction.isNull()) {
+                anOldAction->setHotKey2(0);
+            }
             myKeyActions[anAction->getHotKey2()] = anAction;
         }
     }

sview-15_08.tar.gz/StCore/StCocoaView.h -> sview-15_10.tar.gz/StCore/StCocoaView.h Changed

sview-15_08.tar.gz/StCore/StCocoaView.mm -> sview-15_10.tar.gz/StCore/StCocoaView.mm Changed

sview-15_08.tar.gz/StCore/StWindow.cpp -> sview-15_10.tar.gz/StCore/StWindow.cpp Changed

@@ -28,6 +28,7 @@
     params.VSyncMode->changeValues().add("Mixed");
 
     myWin->signals.onClose     = &signals.onClose;
+    myWin->signals.onPause     = &signals.onPause;
     myWin->signals.onResize    = &signals.onResize;
     myWin->signals.onAnotherMonitor = &signals.onAnotherMonitor;
     myWin->signals.onKeyUp     = &signals.onKeyUp;
@@ -93,6 +94,10 @@
     return myWin->isActive();
 }
 
+bool StWindow::isPaused() const {
+    return myWin->myIsPaused;
+}
+
 bool StWindow::isLostDevice() const {
     return myWin->myToResetDevice;
 }
@@ -173,6 +178,10 @@
     return myWin->getPlacement();
 }
 
+StRectI_t StWindow::getWindowedPlacement() const {
+    return myWin->myRectNorm;
+}
+
 bool StWindow::isMovable() const {
     return myWin->myParentWin == NULL;
 }
@@ -353,3 +362,33 @@
     return NULL;
 #endif
 }
+
+const StString& StWindow::getStatistics() const {
+    return myWin->myStatistics;
+}
+
+bool StWindow::hasOrientationSensor() const {
+    return myWin->myHasOrientSensor;
+}
+
+bool StWindow::isPoorOrientationSensor() const {
+    return myWin->myIsPoorOrient;
+}
+
+bool StWindow::toTrackOrientation() const {
+    return myWin->myToTrackOrient;
+}
+
+void StWindow::setTrackOrientation(const bool theToTrack) {
+    if(myWin->myHasOrientSensor) {
+        myWin->myToTrackOrient = theToTrack;
+    }
+}
+
+StQuaternion<double> StWindow::getDeviceOrientation() const {
+    if(myWin->myToTrackOrient
+    && myWin->myHasOrientSensor) {
+        return myWin->myQuaternion;
+    }
+    return StQuaternion<double>();
+}

sview-15_08.tar.gz/StCore/StWindowImpl.cpp -> sview-15_10.tar.gz/StCore/StWindowImpl.cpp Changed

@@ -56,6 +56,9 @@
   myParentWin(theParentWindow),
   myWindowTitle(WINDOW_TITLE_DEFAULT),
   myInitState(STWIN_INITNOTSTART),
+  myHasOrientSensor(false),
+  myIsPoorOrient(false),
+  myToTrackOrient(false),
   myMousePt(0.5, 0.5),
   myRectNorm(128, 512, 128, 512),
   myRectFull(128, 512, 128, 512),
@@ -78,7 +81,9 @@
   myToResetDevice(false),
   myIsUpdated(false),
   myIsActive(false),
+  myIsPaused(false),
   myBlockSleep(BlockSleep_OFF),
+  myIsSystemLocked(false),
   myIsDispChanged(false),
   myLastEventsTime(0.0),
   myEventsThreaded(false),
@@ -453,7 +458,8 @@
     #ifndef ES_AWAYMODE_REQUIRED // for old MinGW
         #define ES_AWAYMODE_REQUIRED ((DWORD)0x00000040)
     #endif
-    if(attribs.ToBlockSleepDisplay) {
+    if(attribs.ToBlockSleepDisplay
+    && !myIsSystemLocked) {
         // prevent display sleep - call this periodically
         EXECUTION_STATE aState = ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED;
         if(myIsVistaPlus) {
@@ -616,7 +622,10 @@
 /*#if defined(__ANDROID__)
     myIsActive = (myMaster.eglSurface != EGL_NO_SURFACE);
 #else*/
-    if(attribs.IsFullScreen) {
+    if(myIsSystemLocked) {
+        myIsActive = false;
+        return;
+    } else if(attribs.IsFullScreen) {
         myIsActive = true;
         return;
     }
@@ -1004,6 +1013,9 @@
             case stEvent_Close:
                 signals.onClose->emit(anEvent.Close);
                 break;
+            case stEvent_Pause:
+                signals.onPause->emit(anEvent.Pause);
+                break;
             case stEvent_Size:
                 signals.onResize->emit(anEvent.Size);
                 break;

sview-15_08.tar.gz/StCore/StWindowImpl.h -> sview-15_10.tar.gz/StCore/StWindowImpl.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StCore library is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -59,6 +59,7 @@
                           const StNativeWin_t                theParentWindow);
     ST_LOCAL ~StWindowImpl();
     ST_LOCAL void close();
+    ST_LOCAL const StString& getTitle() const { return myWindowTitle; }
     ST_LOCAL void setTitle(const StString& theTitle);
     ST_LOCAL bool hasDepthBuffer() const { return attribs.GlDepthSize != 0; }
     ST_LOCAL void getAttributes(StWinAttr* theAttributes) const;
@@ -276,6 +277,11 @@
 
     StString           myWindowTitle;     //!< window caption
     int                myInitState;       //!< initialization error code
+    StString           myStatistics;      //!< extra statistics
+    StQuaternion<double> myQuaternion;    //!< device orientation
+    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
 
     StPointD_t         myMousePt;         //!< mouse coordinates to track activity
     StRectI_t          myRectNorm;        //!< master window coordinates in normal     state
@@ -315,7 +321,9 @@
     bool               myToResetDevice;   //!< indicate device lost state
     bool               myIsUpdated;       //!< helper flag on window movements updates
     bool               myIsActive;        //!< window visible state
+    bool               myIsPaused;        //!< window is in background
     BlockSleep         myBlockSleep;      //!< indicates that display sleep was blocked or not
+    bool               myIsSystemLocked;   //!< flag indicating that user session is in locked state
     volatile bool      myIsDispChanged;   //!< monitors reconfiguration event
 
     /**
@@ -344,6 +352,7 @@
 
     struct {
         StSignal<void (const StCloseEvent&  )>* onClose;
+        StSignal<void (const StPauseEvent&  )>* onPause;
         StSignal<void (const StSizeEvent&   )>* onResize;
         StSignal<void (const StSizeEvent&   )>* onAnotherMonitor;
         StSignal<void (const StKeyEvent&    )>* onKeyUp;

sview-15_08.tar.gz/StCore/StWindowImplAnd.cpp -> sview-15_10.tar.gz/StCore/StWindowImplAnd.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StCore library is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -40,14 +40,13 @@
         return false;
     }
 
+    // retrieve fixed information
+    myHasOrientSensor = myParentWin->hasOrientationSensor();
+    myIsPoorOrient    = myParentWin->isPoorOrientationSensor();
+
     myParentWin->signals.onInputEvent += stSlot(this, &StWindowImpl::onAndroidInput);
     myParentWin->signals.onAppCmd     += stSlot(this, &StWindowImpl::onAndroidCommand);
 
-    // Prepare to monitor accelerometer
-    //mySensorManager       = ASensorManager_getInstance();
-    //myAccelerometerSensor = ASensorManager_getDefaultSensor(mySensorManager, ASENSOR_TYPE_ACCELEROMETER);
-    //mySensorEventQueue    = ASensorManager_createEventQueue(mySensorManager, myParentWin->getLooper(), LooperId_USER, NULL, NULL);
-
     /*if(myParentWin->getSavedState() != NULL) {
         // we are starting with a previous saved state; restore from it
         myState = *(StSavedState* )myParentWin->getSavedState();
@@ -67,6 +66,7 @@
         if(aSource != NULL) {
             aSource->process(myParentWin, aSource);
         }
+
         if(myToResetDevice || myParentWin->ToDestroy()) {
             //myToResetDevice = true;
             myStEvent.Type       = stEvent_Close;
@@ -185,6 +185,7 @@
 }
 
 bool StWindowImpl::onAndroidInitWindow() {
+    myIsPaused = false;
     if(myParentWin->getWindow() == NULL) {
         return false;
     }
@@ -283,6 +284,25 @@
             onAndroidInitWindow();
             return;
         }
+        case StAndroidGlue::CommandId_BackPressed: {
+            myStEvent.Key.Time = getEventTime();
+            myStEvent.Key.VKey = ST_VK_ESCAPE;
+            myStEvent.Key.Char = 0;
+            postKeyDown(myStEvent);
+            postKeyUp  (myStEvent);
+            return;
+        }
+        case StAndroidGlue::CommandId_Resume: {
+            myIsPaused = false;
+            return;
+        }
+        case StAndroidGlue::CommandId_Pause: {
+            myIsPaused = true;
+            myStEvent.Type       = stEvent_Pause;
+            myStEvent.Pause.Time = getEventTime();
+            signals.onPause->emit(myStEvent.Pause);
+            return;
+        }
         case StAndroidGlue::CommandId_Stop: {
             if(myParentWin->getMemoryClass() < 50) {
                 myStEvent.Type       = stEvent_Close;
@@ -303,16 +323,11 @@
             return;
         }
         case StAndroidGlue::CommandId_FocusGained: {
-            /*if(myAccelerometerSensor != NULL) {
-                ASensorEventQueue_enableSensor(mySensorEventQueue, myAccelerometerSensor);
-                ASensorEventQueue_setEventRate(mySensorEventQueue, myAccelerometerSensor, (1000L / 60) * 1000);
-            }*/
+            //
             return;
         }
         case StAndroidGlue::CommandId_FocusLost: {
-            /*if(myAccelerometerSensor != NULL) {
-                ASensorEventQueue_disableSensor(mySensorEventQueue, myAccelerometerSensor);
-            }*/
+            //
             return;
         }
         case StAndroidGlue::CommandId_ConfigChanged: {
@@ -347,7 +362,9 @@
 
     // check onNewIntent event
     StString aDndFile;
-    if(myParentWin->popOpenNewFile(aDndFile)) {
+    myParentWin->setTrackOrientation(myToTrackOrient);
+    myParentWin->fetchState(aDndFile, myQuaternion);
+    if(!aDndFile.isEmpty()) {
         myStEvent.Type = stEvent_FileDrop;
         myStEvent.DNDrop.Time = getEventTime();
         myStEvent.DNDrop.File = aDndFile.toCString();
@@ -369,15 +386,6 @@
             break;
         }
 
-        /*if(aPollRes == LooperId_USER) {
-            if(anEngine.accelerometerSensor != NULL) {
-                ASensorEvent anEvent;
-                while(ASensorEventQueue_getEvents(anEngine.sensorEventQueue, &anEvent, 1) > 0) {
-                    anEvent.acceleration.x, anEvent.acceleration.y, anEvent.acceleration.z);
-                }
-            }
-        }*/
-
         // check if we are exiting
         if(myParentWin->ToDestroy()) {
             break;

sview-15_08.tar.gz/StCore/StWindowImplMac.mm -> sview-15_10.tar.gz/StCore/StWindowImplMac.mm Changed

sview-15_08.tar.gz/StCore/StWindowImplWin.cpp -> sview-15_10.tar.gz/StCore/StWindowImplWin.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StCore library is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@
 
 #include <StStrings/StLogger.h>
 #include <StThreads/StThread.h>
+#include <StLibrary.h>
 #include <StGL/StGLContext.h>
 
 #include <cmath>
@@ -208,6 +209,21 @@
                      SWP_SHOWWINDOW);
     }
 
+    // register handler to track session lock state (WM_WTSSESSION_CHANGE)
+    myIsSystemLocked = false;
+    typedef BOOL (WINAPI *WTSRegisterSessionNotification_t  )(HWND hWnd, DWORD dwFlags);
+    typedef BOOL (WINAPI *WTSUnRegisterSessionNotification_t)(HWND hWnd);
+    WTSRegisterSessionNotification_t   aSessNotifSetProc   = NULL;
+    WTSUnRegisterSessionNotification_t aSessNotifUnsetProc = NULL;
+    StLibrary aWtsLib;
+    if(aWtsLib.loadSimple("Wtsapi32.dll")
+    && aWtsLib.find("WTSRegisterSessionNotification",   aSessNotifSetProc)
+    && aWtsLib.find("WTSUnRegisterSessionNotification", aSessNotifUnsetProc)) {
+        #define NOTIFY_FOR_ALL_SESSIONS 1
+        #define NOTIFY_FOR_THIS_SESSION 0
+        aSessNotifSetProc(myMaster.hWindowGl, NOTIFY_FOR_THIS_SESSION);
+    }
+
     // always wait for message thread exit before quit
     myMaster.EventMsgThread.reset();
 
@@ -245,6 +261,9 @@
                     UnregisterHotKey(myMaster.hWindowGl, myMaster.myMKeyPrev);
                     UnregisterHotKey(myMaster.hWindowGl, myMaster.myMKeyNext);
                 }
+                if(aSessNotifUnsetProc != NULL) {
+                    aSessNotifUnsetProc(myMaster.hWindowGl);
+                }
 
                 mySlave.close();  // close window handles
                 myMaster.close();
@@ -444,7 +463,14 @@
             }
             break;
         }
-
+        case WM_WTSSESSION_CHANGE: {
+            if(wParam == WTS_SESSION_LOCK) {
+                myIsSystemLocked = true;
+            } else if(wParam == WTS_SESSION_UNLOCK) {
+                myIsSystemLocked = false;
+            }
+            break;
+        }
         case WM_CLOSE: {
             myStEvent.Type       = stEvent_Close;
             myStEvent.Close.Time = getEventTime(myEvent.time);

sview-15_08.tar.gz/StDiagnostics/StDiagnosticsGUI.cpp -> sview-15_10.tar.gz/StDiagnostics/StDiagnosticsGUI.cpp Changed

sview-15_10.tar.gz/StDiagnostics/lang/czech Added

sview-15_10.tar.gz/StDiagnostics/lang/czech/StDiagnostics.lng Added

sview-15_10.tar.gz/StDiagnostics/lang/czech/language.lng Added

sview-15_08.tar.gz/StGLWidgets/StGLCombobox.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLCombobox.cpp Changed

@@ -51,7 +51,8 @@
         aTop  = int(aRoot->getCursorZo().y() * aRoot->getRectPx().height());
     }
 
-    myMenu = new StGLMenu(aMenuParent, aLeft, aTop, StGLMenu::MENU_VERTICAL, true);
+    myMenu = new StGLMenu(aMenuParent, aLeft, aTop, StGLMenu::MENU_VERTICAL, false);
+    myMenu->setOpacity(1.0f, false);
     if(myBack != NULL) {
         myMenu->setCorner(StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_CENTER));
     }
@@ -63,7 +64,7 @@
         myBack->stglInit();
     } else {
         StGLRootWidget* aRoot = myMenu->getRoot();
-        myMenu->stglInit();
+        myMenu->stglUpdateSubmenuLayout();
         StRectI_t aRect  = myMenu->getRectPxAbsolute();
         const int aRootX = aRoot->getRectPx().width();
         const int aRootY = aRoot->getRectPx().height();
@@ -77,6 +78,21 @@
         } else if(aRect.bottom() > aRootY) {
             myMenu->changeRectPx().moveBottomTo(aRootY);
         }
+
+        for(StGLWidget* aChild = myMenu->getChildren()->getStart(); aChild != NULL; aChild = aChild->getNext()) {
+            StGLMenuItem* anItem = (StGLMenuItem* )aChild;
+            if(anItem->getSubMenu() == NULL) {
+                continue;
+            }
+
+            const StRectI_t aSubRect = anItem->getSubMenu()->getRectPxAbsolute();
+            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));
+            }
+        }
     }
 }

sview-15_08.tar.gz/StGLWidgets/StGLFpsLabel.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLFpsLabel.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013 Kirill Gavrilov <kirill@sview.ru
+ * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -41,23 +41,31 @@
     signals.onBtnClick(getUserData());
 }
 
-void StGLFpsLabel::update(const bool   theIsStereo,
-                          const double theTargetFps) {
+void StGLFpsLabel::update(const bool      theIsStereo,
+                          const double    theTargetFps,
+                          const StString& theExtraInfo) {
     char aBuffer[128];
     const double aTime = myTimer.getElapsedTimeInSec();
-    if(aTime >= 1.0) {
-        myTimer.restart();
-        const double aFpsCurrent = double(myCounter) / aTime;
-        if(myPlayFps <= 0.0) {
-            stsprintf(aBuffer, 128, "%c %4.1f (%4.1f)",
-                      theIsStereo ? 'S' : 'M', aFpsCurrent, theTargetFps);
-        } else {
-            stsprintf(aBuffer, 128, "%c %4.1f (%4.1f)\n%d / %d [%4.1f]",
-                      theIsStereo ? 'S' : 'M', aFpsCurrent, theTargetFps,
-                      myPlayQueued, myPlayQueueLen, myPlayFps);
-        }
-        setText(aBuffer);
-        myCounter = 0;
+    if(aTime < 1.0) {
+        ++myCounter;
+        return;
     }
-    ++myCounter;
+
+    myTimer.restart();
+    const double aFpsCurrent = double(myCounter) / aTime;
+    if(myPlayFps <= 0.0) {
+        stsprintf(aBuffer, 128, "%c %4.1f (%4.1f)",
+                  theIsStereo ? 'S' : 'M', aFpsCurrent, theTargetFps);
+    } else {
+        stsprintf(aBuffer, 128, "%c %4.1f (%4.1f)\n%d / %d [%4.1f]",
+                  theIsStereo ? 'S' : 'M', aFpsCurrent, theTargetFps,
+                  myPlayQueued, myPlayQueueLen, myPlayFps);
+    }
+    StString aText(aBuffer);
+    if(!theExtraInfo.isEmpty()) {
+        aText += "\n";
+        aText += theExtraInfo;
+    }
+    setText(aText);
+    myCounter = 1;
 }

sview-15_08.tar.gz/StGLWidgets/StGLImageProgram.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLImageProgram.cpp Changed

@@ -29,9 +29,9 @@
                              StString(F_DEF_CUBEMAP) + theText);
 }
 
-StGLImageProgram::StGLImageProgram(const StString& theTitle)
+StGLImageProgram::StGLImageProgram()
 : myColorScale(1.0f, 1.0f, 1.0f) {
-    myTitle = theTitle;
+    myTitle = "StGLImageProgram";
 
     const char F_SHADER_GET_COLOR_BLEND[] =
        "uniform sampler2D uTexture;\n"
@@ -154,20 +154,84 @@
         + F_SHADER_YUV2RGB_MPEG);
 
     params.gamma = new StFloat32Param(   1.0f,         // initial value
-                                        0.05f, 100.0f, // min, max values
+                                        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, 100.0f, // min, max values
+                                              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, 100.0f, // min, max values
+                                            -10.0f, 99.0f, // min, max values
                                               1.0f,         // default value
                                              0.05f,         // incremental step
                                            0.0001f);        // equality tolerance
+
+    // main shader parts
+    const char V_SHADER_FLAT[] =
+       "uniform mat4 uProjMat;\n"
+       "uniform mat4 uModelMat;\n"
+       "uniform vec4 uTexData;\n"
+       "uniform vec4 uTexUVData;\n"
+
+       "attribute vec4 vVertex;\n"
+       "attribute vec2 vTexCoord;\n"
+
+       "varying vec3 fTexCoord;\n"
+       "varying vec3 fTexUVCoord;\n"
+
+       "void main(void) {\n"
+       "    fTexCoord   = vec3(uTexData.xy   + vTexCoord * uTexData.zw,   0.0);\n"
+       "    fTexUVCoord = vec3(uTexUVData.xy + vTexCoord * uTexUVData.zw, 0.0);\n"
+       "    gl_Position = uProjMat * uModelMat * vVertex;\n"
+       "}\n";
+
+    const char V_SHADER_CUBEMAP[] =
+       "uniform mat4 uProjMat;\n"
+       "uniform mat4 uModelMat;\n"
+       "uniform vec4 uTexData;\n"
+       "uniform vec4 uTexUVData;\n"
+
+       "attribute vec4 vVertex;\n"
+       "attribute vec2 vTexCoord;\n"
+
+       "varying vec3 fTexCoord;\n"
+       "varying vec3 fTexUVCoord;\n"
+
+       "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;"
+       "}\n";
+
+    const char F_SHADER_FLAT[] =
+       "varying vec3 fTexCoord;\n"
+       "varying vec3 fTexUVCoord;\n"
+        // we split these functions for two reasons:
+        // - to change function code (like color conversion);
+        // - to optimize rendering on old hardware not supported conditions (GeForce FX for example).
+       "vec4 getColor(in vec3 texCoord);\n"
+       "void convertToRGB(inout vec4 theColor, in vec3 theTexUVCoord);\n"
+       "void applyCorrection(inout vec4 theColor);\n"
+       "void applyGamma(inout vec4 theColor);\n"
+
+       "void main(void) {\n"
+            // extract color from main texture
+       "    vec4 aColor = getColor(fTexCoord);\n"
+            // convert from alien color model (like YUV) to RGB
+       "    convertToRGB(aColor, fTexUVCoord);\n"
+            // color processing (saturation, brightness, etc)
+       "    applyCorrection(aColor);\n"
+            // gamma correction
+       "    applyGamma(aColor);\n"
+       "    gl_FragColor = aColor;\n"
+       "}";
+
+    registerVertexShaderPart  (0, VertMain_Normal,  V_SHADER_FLAT);
+    registerVertexShaderPart  (0, VertMain_Cubemap, V_SHADER_CUBEMAP);
+    registerFragmentShaderPart(FragSection_Main, 0, F_SHADER_FLAT);
 }
 
 StGLImageProgram::~StGLImageProgram() {

sview-15_08.tar.gz/StGLWidgets/StGLImageRegion.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLImageRegion.cpp Changed

@@ -19,41 +19,6 @@
 
 namespace {
 
-    class ST_LOCAL StTrackedFloatParam : public StFloat32Param {
-
-            private:
-
-        StHandle<StFloat32Param> myTracked1;
-        StHandle<StFloat32Param> myTracked2;
-
-            public:
-
-        StTrackedFloatParam(const StHandle<StFloat32Param>& theTracked1,
-                            const StHandle<StFloat32Param>& theTracked2)
-        : StFloat32Param(theTracked1->getValue(),
-                         theTracked1->getMinValue(),
-                         theTracked1->getMaxValue(),
-                         theTracked1->getDefValue(),
-                         theTracked1->getStep(),
-                         theTracked1->getTolerance()),
-          myTracked1(theTracked1),
-          myTracked2(theTracked2) {}
-
-        virtual float getValue() const {
-            return myTracked1->getValue();
-        }
-
-        virtual bool setValue(const float theValue) {
-            if(myTracked1->setValue(theValue)
-            || myTracked2->setValue(theValue)) {
-                signals.onChanged(theValue);
-                return true;
-            }
-            return false;
-        }
-
-    };
-
     class ST_LOCAL StSwapLRParam : public StBoolParam {
 
             public:
@@ -126,8 +91,6 @@
 : StGLWidget(theParent, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT)),
   myQuad(),
   myUVSphere(StGLVec3(0.0f, 0.0f, 0.0f), 1.0f, 64),
-  myProgramFlat(),
-  myProgramSphere(),
   myTextureQueue(theTextureQueue),
   myClickPntZo(0.0, 0.0),
   myKeyFlags(ST_VF_NONE),
@@ -148,13 +111,11 @@
     params.displayMode->changeValues().add("Cross-eyed");    // MODE_CROSSYED
 
     params.displayRatio  = new StInt32Param(RATIO_AUTO);
+    params.ToHealAnamorphicRatio = new StBoolParam(false);
     params.textureFilter = new StInt32Param(StGLImageProgram::FILTER_LINEAR);
-    params.gamma      = new StTrackedFloatParam(myProgramFlat.params.gamma,
-                                                myProgramSphere.params.gamma);
-    params.brightness = new StTrackedFloatParam(myProgramFlat.params.brightness,
-                                                myProgramSphere.params.brightness);
-    params.saturation = new StTrackedFloatParam(myProgramFlat.params.saturation,
-                                                myProgramSphere.params.saturation);
+    params.gamma      = myProgram.params.gamma;
+    params.brightness = myProgram.params.brightness;
+    params.saturation = myProgram.params.saturation;
     params.swapLR   = new StSwapLRParam();
     params.ViewMode = new StViewModeParam();
 
@@ -237,7 +198,6 @@
     myActions.add(anAction);
 
     anAction = new StActionIntSlot(stCString("DoParamsModeNext"), stSlot(this, &StGLImageRegion::doParamsModeNext), 0);
-    anAction->setDefaultHotKey1(ST_VK_P);
     myActions.add(anAction);
 
     anAction = new StActionHoldSlot(stCString("DoParamsPanLeft"), stSlot(this, &StGLImageRegion::doParamsPanLeft));
@@ -297,8 +257,7 @@
     myTextureQueue->getQTexture().release(aCtx);
     myQuad.release(aCtx);
     myUVSphere.release(aCtx);
-    myProgramFlat.release(aCtx);
-    myProgramSphere.release(aCtx);
+    myProgram.release(aCtx);
 }
 
 StHandle<StStereoParams> StGLImageRegion::getSource() {
@@ -325,9 +284,7 @@
     }
 
     StGLContext& aCtx = getContext();
-    if(!myProgramFlat.init(aCtx, StImage::ImgColor_RGB, StImage::ImgScale_Full, StGLImageProgram::FragGetColor_Normal)) {
-        return false;
-    } else if(!myProgramSphere.init(aCtx, StImage::ImgColor_RGB, StImage::ImgScale_Full, StGLImageProgram::FragGetColor_Normal)) {
+    if(!myProgram.init(aCtx, StImage::ImgColor_RGB, StImage::ImgScale_Full, StGLImageProgram::FragGetColor_Normal)) {
         return false;
     } else if(!myQuad.initScreen(aCtx)) {
         ST_DEBUG_LOG("Fail to init StGLQuad");
@@ -351,18 +308,19 @@
 
 StGLVec2 StGLImageRegion::getMouseMoveSphere(const StPointD_t& theCursorZoFrom,
                                              const StPointD_t& theCursorZoTo) {
-    /// TODO (Kirill Gavrilov#5) these computations are invalid
-    StGLVec2 stVec = getMouseMoveFlat(theCursorZoFrom, theCursorZoTo);
+    StGLVec2 aVec = getMouseMoveFlat(theCursorZoFrom, theCursorZoTo);
     GLfloat aSphereScale = SPHERE_RADIUS * PANORAMA_DEF_ZOOM * getSource()->ScaleFactor;
-    StRectD_t zParams;
-    getCamera()->getZParams(getCamera()->getZNear(), zParams);
-    stVec.x() *= -90.0f * GLfloat(zParams.right() - zParams.left()) / aSphereScale;
-    stVec.y() *=  90.0f * GLfloat(zParams.bottom() - zParams.top()) / aSphereScale;
-    return stVec;
+    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;
+    return aVec;
 }
 
 StGLVec2 StGLImageRegion::getMouseMoveSphere() {
-    return isClicked(ST_MOUSE_LEFT) ? getMouseMoveSphere(myClickPntZo, getRoot()->getCursorZo()) : StGLVec2();
+    return isClicked(ST_MOUSE_LEFT)
+         ? getMouseMoveSphere(myClickPntZo, getRoot()->getCursorZo())
+         : StGLVec2();
 }
 
 void StGLImageRegion::stglDraw(unsigned int theView) {
@@ -397,21 +355,20 @@
 }
 
 void StGLImageRegion::stglDrawView(unsigned int theView) {
-
-    StGLQuadTexture::LeftOrRight leftOrRight = StGLQuadTexture::LEFT_TEXTURE;
+    StGLQuadTexture::LeftOrRight aLeftOrRight = StGLQuadTexture::LEFT_TEXTURE;
     StHandle<StStereoParams> aParams = getSource();
     if(!myIsInitialized || aParams.isNull()) {
         return;
     }
 
     StGLContext& aCtx = getContext();
-    bool toShowRight = ( aParams->ToSwapLR && (theView == ST_DRAW_LEFT )) ||
-                       (!aParams->ToSwapLR && (theView == ST_DRAW_RIGHT));
+    bool toShowRight = ( aParams->ToSwapLR && (theView == ST_DRAW_LEFT ))
+                    || (!aParams->ToSwapLR && (theView == ST_DRAW_RIGHT));
     if(aParams->isMono()) {
-        leftOrRight = StGLQuadTexture::LEFT_TEXTURE;
+        aLeftOrRight = StGLQuadTexture::LEFT_TEXTURE;
     } else if(myTextureQueue->getQTexture().getFront(StGLQuadTexture::RIGHT_TEXTURE).isValid()) {
         if(toShowRight) {
-            leftOrRight = StGLQuadTexture::RIGHT_TEXTURE;
+            aLeftOrRight = StGLQuadTexture::RIGHT_TEXTURE;
         }
     }
 
@@ -452,46 +409,42 @@
 
     aCtx.core20fwd->glDisable(GL_BLEND);
 
-    StGLFrameTextures& stFrameTexture = myTextureQueue->getQTexture().getFront(leftOrRight);
-    stFrameTexture.bind(aCtx);
-
-    // our model matrix (identity)
-    StGLMatrix stModelMat;
-
-    StGLVec2 textureSizeVec(GLfloat(stFrameTexture.getPlane(0).getSizeX()),
-                            GLfloat(stFrameTexture.getPlane(0).getSizeY()));
-    StGLVec2 textureUVSizeVec(GLfloat(stFrameTexture.getPlane(1).getSizeX()),
-                              GLfloat(stFrameTexture.getPlane(1).getSizeY()));
+    StGLFrameTextures& aTextures = myTextureQueue->getQTexture().getFront(aLeftOrRight);
+    aTextures.bind(aCtx);
 
+    StGLVec2 aTextureSize  (GLfloat(aTextures.getPlane(0).getSizeX()),
+                            GLfloat(aTextures.getPlane(0).getSizeY()));
+    StGLVec2 aTextureUVSize(GLfloat(aTextures.getPlane(1).getSizeX()),
+                            GLfloat(aTextures.getPlane(1).getSizeY()));
+    StGLMatrix aModelMat;
     // data rectangle in the texture
-    StGLVec4 dataClampVec;
-    StGLVec4 dataUVClampVec;
-    if(params.textureFilter->getValue() == StGLImageProgram::FILTER_NEAREST
-    || aParams->ViewingMode == StStereoParams::PANORAMA_SPHERE) {
+    StGLVec4 aClampVec, aClampUV;
+    if(params.textureFilter->getValue() == StGLImageProgram::FILTER_NEAREST) {
         myTextureQueue->getQTexture().setMinMagFilter(aCtx, GL_NEAREST);
         //
-        dataClampVec.x() = 0.0f;
-        dataClampVec.y() = 0.0f;
-        dataClampVec.z() = stFrameTexture.getPlane(0).getDataSize().x();
-        dataClampVec.w() = stFrameTexture.getPlane(0).getDataSize().y();
+        aClampVec.x() = 0.0f;
+        aClampVec.y() = 0.0f;
+        aClampVec.z() = aTextures.getPlane(0).getDataSize().x();
+        aClampVec.w() = aTextures.getPlane(0).getDataSize().y();
         // UV
-        dataUVClampVec.x() = 0.0f;
-        dataUVClampVec.y() = 0.0f;
-        dataUVClampVec.z() = stFrameTexture.getPlane(1).getDataSize().x();
-        dataUVClampVec.w() = stFrameTexture.getPlane(1).getDataSize().y();
+        aClampUV.x() = 0.0f;
+        aClampUV.y() = 0.0f;
+        aClampUV.z() = aTextures.getPlane(1).getDataSize().x();
+        aClampUV.w() = aTextures.getPlane(1).getDataSize().y();
     } else {
         myTextureQueue->getQTexture().setMinMagFilter(aCtx, GL_LINEAR);
         //
-        dataClampVec.x() = 0.5f / textureSizeVec.x();
-        dataClampVec.y() = 0.5f / textureSizeVec.y();
-        dataClampVec.z() = stFrameTexture.getPlane(0).getDataSize().x() - 2.0f * dataClampVec.x();
-        dataClampVec.w() = stFrameTexture.getPlane(0).getDataSize().y() - 2.0f * dataClampVec.y();
+        aClampVec.x() = 0.5f / aTextureSize.x();
+        aClampVec.y() = 0.5f / aTextureSize.y();
+        aClampVec.z() = aTextures.getPlane(0).getDataSize().x() - 2.0f * aClampVec.x();
+        aClampVec.w() = aTextures.getPlane(0).getDataSize().y() - 2.0f * aClampVec.y();
         // UV
-        if(textureUVSizeVec.x() > 0.0f && textureUVSizeVec.y() > 0.0f) {
-            dataUVClampVec.x() = 0.5f / textureUVSizeVec.x();
-            dataUVClampVec.y() = 0.5f / textureUVSizeVec.y(),
-            dataUVClampVec.z() = stFrameTexture.getPlane(1).getDataSize().x() - 2.0f * dataUVClampVec.x();
-            dataUVClampVec.w() = stFrameTexture.getPlane(1).getDataSize().y() - 2.0f * dataUVClampVec.y();
+        if(aTextureUVSize.x() > 0.0f
+        && aTextureUVSize.y() > 0.0f) {
+            aClampUV.x() = 0.5f / aTextureUVSize.x();
+            aClampUV.y() = 0.5f / aTextureUVSize.y(),
+            aClampUV.z() = aTextures.getPlane(1).getDataSize().x() - 2.0f * aClampUV.x();
+            aClampUV.w() = aTextures.getPlane(1).getDataSize().y() - 2.0f * aClampUV.y();
         }
     }
 
@@ -533,35 +486,36 @@
     const StGLVec2 aPanBack   = aParams->PanCenter;
 
     StStereoParams::ViewMode aViewMode = aParams->ViewingMode;
-    if(stFrameTexture.getPlane(0).getTarget() == GL_TEXTURE_CUBE_MAP) {
+    if(aTextures.getPlane(0).getTarget() == GL_TEXTURE_CUBE_MAP) {
         aViewMode = StStereoParams::PANORAMA_CUBEMAP;
     } else if(aViewMode == StStereoParams::PANORAMA_CUBEMAP) {
         aViewMode = StStereoParams::FLAT_IMAGE;
     }
+
+    myProgram.setColorScale(aColorScale); // apply de-anaglyph color filter
+    StGLImageProgram::FragGetColor aColorGetter = params.textureFilter->getValue() == StGLImageProgram::FILTER_BLEND
+                                                ? StGLImageProgram::FragGetColor_Blend
+                                                : StGLImageProgram::FragGetColor_Normal;
     switch(aViewMode) {
         default:
         case StStereoParams::FLAT_IMAGE: {
-            myProgramFlat.setColorScale(aColorScale); // apply de-anaglyph color filter
-            StGLImageProgram::FragGetColor aColorGetter = params.textureFilter->getValue() == StGLImageProgram::FILTER_BLEND
-                                                        ? StGLImageProgram::FragGetColor_Blend
-                                                        : StGLImageProgram::FragGetColor_Normal;
-            if(!myProgramFlat.init(aCtx, stFrameTexture.getColorModel(), stFrameTexture.getColorScale(), aColorGetter)) {
+            if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), aColorGetter)) {
                 break;
             }
 
-            myProgramFlat.getActiveProgram()->use(aCtx);
+            myProgram.getActiveProgram()->use(aCtx);
 
             // setup data rectangle in the texture
-            myProgramFlat.setTextureSizePx      (aCtx, textureSizeVec);
-            myProgramFlat.setTextureMainDataSize(aCtx, dataClampVec);
-            myProgramFlat.setTextureUVDataSize  (aCtx, dataUVClampVec);
+            myProgram.setTextureSizePx      (aCtx, aTextureSize);
+            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) {
-                stModelMat.translate(StGLVec3( aLestDisp, 0.0f, 0.0f));
+                aModelMat.translate(StGLVec3( aLestDisp, 0.0f, 0.0f));
             } else {
-                stModelMat.translate(StGLVec3(-aLestDisp, 0.0f, 0.0f));
+                aModelMat.translate(StGLVec3(-aLestDisp, 0.0f, 0.0f));
             }
 
             // handle dragging timer
@@ -572,8 +526,8 @@
                     const StPointD_t aCurr = getRoot()->getCursorZo();
                     const int aDx = int((aCurr.x() - myClickPntZo.x()) * double(getRectPx().width()));
                     const int aDy = int((aCurr.y() - myClickPntZo.y()) * double(getRectPx().height()));
-                    if(std::abs(aDx) > 1
-                    || std::abs(aDy) > 1) {
+                    if(std::abs(aDx) > myRoot->getClickThreshold()
+                    || std::abs(aDy) > myRoot->getClickThreshold()) {
                         myIsClickAborted = true;
                         myClickTimer.stop();
                     }
@@ -606,60 +560,83 @@
             }
 
             // apply scale
-            stModelMat.scale(aParams->ScaleFactor, aParams->ScaleFactor, 1.0f);
+            aModelMat.scale(aParams->ScaleFactor, aParams->ScaleFactor, 1.0f);
 
             // apply position
-            stModelMat.translate(StGLVec3(aParams->PanCenter));
+            aModelMat.translate(StGLVec3(aParams->PanCenter));
 
             // apply rotations
             if(theView == ST_DRAW_LEFT) {
-                stModelMat.rotate(aParams->getZRotate() - aParams->getSepRotation(), StGLVec3::DZ());
+                aModelMat.rotate(aParams->getZRotate() - aParams->getSepRotation(), StGLVec3::DZ());
             } else if(theView == ST_DRAW_RIGHT) {
-                stModelMat.rotate(aParams->getZRotate() + aParams->getSepRotation(), StGLVec3::DZ());
+                aModelMat.rotate(aParams->getZRotate() + aParams->getSepRotation(), StGLVec3::DZ());
             } else {
-                stModelMat.rotate(aParams->getZRotate(), StGLVec3::DZ());
+                aModelMat.rotate(aParams->getZRotate(), StGLVec3::DZ());
             }
-            stModelMat.rotate(anXRotate, StGLVec3::DX());
-            stModelMat.rotate(anYRotate, StGLVec3::DY());
-
-            /// TODO (Kirill Gavrilov#8) implement fit all for rotated image
+            aModelMat.rotate(anXRotate, StGLVec3::DX());
+            aModelMat.rotate(anYRotate, StGLVec3::DY());
 
             // check window ratio to fill whole image in normal zoom
-            GLfloat dispRatio = 1.0f;
+            GLfloat aDispRatio = 1.0f;
             switch(params.displayRatio->getValue()) {
-                case RATIO_1_1:   dispRatio = 1.0f;  break;
-                case RATIO_4_3:   dispRatio = 1.3333333333f; break;
-                case RATIO_16_9:  dispRatio = 1.7777777778f; break;
-                case RATIO_16_10: dispRatio = 1.6f;  break;
-                case RATIO_221_1: dispRatio = 2.21f; break;
-                case RATIO_5_4:   dispRatio = 1.25f; break;
+                case RATIO_1_1:   aDispRatio = 1.0f;  break;
+                case RATIO_4_3:   aDispRatio = 1.3333333333f; break;
+                case RATIO_16_9:  aDispRatio = 1.7777777778f; break;
+                case RATIO_16_10: aDispRatio = 1.6f;  break;
+                case RATIO_221_1: aDispRatio = 2.21f; break;
+                case RATIO_5_4:   aDispRatio = 1.25f; break;
                 case RATIO_AUTO:
-                default: dispRatio = stFrameTexture.getPlane().getDisplayRatio(); break;
+                default: {
+                    aDispRatio = aTextures.getPlane().getDisplayRatio();
+                    if(params.ToHealAnamorphicRatio->getValue()
+                    && aParams->Src2SizeX == 0 && aParams->Src2SizeY == 0
+                    && ((aParams->Src1SizeX == 1920 && aParams->Src1SizeY >= 800 && aParams->Src1SizeY <= 1088)
+                     || (aParams->Src1SizeX == 1280 && aParams->Src1SizeY >= 530 && aParams->Src1SizeY <= 720))) {
+                        switch(aParams->StereoFormat) {
+                             case StFormat_SideBySide_LR:
+                             case StFormat_SideBySide_RL: {
+                                if(aDispRatio >= 0.85 && aDispRatio <= 1.18) {
+                                    aDispRatio *= 2.0;
+                                }
+                                break;
+                             }
+                             case StFormat_TopBottom_LR:
+                             case StFormat_TopBottom_RL: {
+                                if(aDispRatio >= 3.5 && aDispRatio <= 4.8) {
+                                    aDispRatio *= 0.5;
+                                }
+                                break;
+                             }
+                             default: break;
+                        }
+                    }
+                    break;
+                }
             }
 
-            GLfloat rectRatio = GLfloat(aFrameRectPx.ratio());
-            StGLVec2 ratioScale = aParams->getRatioScale(rectRatio, dispRatio);
-            stModelMat.scale(ratioScale.x(), ratioScale.y(), 1.0f);
+            GLfloat  aRectRatio  = GLfloat(aFrameRectPx.ratio());
+            StGLVec2 aRatioScale = aParams->getRatioScale(aRectRatio, aDispRatio);
+            aModelMat.scale(aRatioScale.x(), aRatioScale.y(), 1.0f);
 
             // apply separation
-            GLfloat aSepDeltaX = (2.0f * aParams->getSeparationDx()) / (stFrameTexture.getPlane().getDataSize().x() * stFrameTexture.getPlane().getSizeX());
-            GLfloat aSepDeltaY = (2.0f * aParams->getSeparationDy()) / (stFrameTexture.getPlane().getDataSize().y() * stFrameTexture.getPlane().getSizeY());
+            GLfloat aSepDeltaX = (2.0f * aParams->getSeparationDx()) / (aTextures.getPlane().getDataSize().x() * aTextures.getPlane().getSizeX());
+            GLfloat aSepDeltaY = (2.0f * aParams->getSeparationDy()) / (aTextures.getPlane().getDataSize().y() * aTextures.getPlane().getSizeY());
             if(theView == ST_DRAW_LEFT) {
-                stModelMat.translate(StGLVec3(-aSepDeltaX * 0.5f, -aSepDeltaY * 0.5f, 0.0f));
+                aModelMat.translate(StGLVec3(-aSepDeltaX * 0.5f, -aSepDeltaY * 0.5f, 0.0f));
             } else if(theView == ST_DRAW_RIGHT) {
-                stModelMat.translate(StGLVec3( aSepDeltaX * 0.5f,  aSepDeltaY * 0.5f, 0.0f));
+                aModelMat.translate(StGLVec3( aSepDeltaX * 0.5f,  aSepDeltaY * 0.5f, 0.0f));
             }
 
-            StGLMatrix stOrthoMat;
-            stOrthoMat.initOrtho(StGLVolume(-rectRatio * aFrustrumL, rectRatio * aFrustrumR,
-                                            -1.0f      * aFrustrumB, 1.0f      * aFrustrumT,
+            StGLMatrix anOrthoMat;
+            anOrthoMat.initOrtho(StGLVolume(-aRectRatio * aFrustrumL, aRectRatio * aFrustrumR,
+                                            -1.0f       * aFrustrumB, 1.0f       * aFrustrumT,
                                             -1.0f, 1.0f));
-            myProgramFlat.getActiveProgram()->setProjMat (aCtx, stOrthoMat);
-            myProgramFlat.getActiveProgram()->setModelMat(aCtx, stModelMat);
+            myProgram.getActiveProgram()->setProjMat (aCtx, anOrthoMat);
+            myProgram.getActiveProgram()->setModelMat(aCtx, aModelMat);
 
-            myQuad.draw(aCtx, *myProgramFlat.getActiveProgram());
+            myQuad.draw(aCtx, *myProgram.getActiveProgram());
 
-            myProgramFlat.getActiveProgram()->unuse(aCtx);
+            myProgram.getActiveProgram()->unuse(aCtx);
 
             // restore changed parameters
             aParams->ScaleFactor = aScaleBack;
@@ -667,51 +644,59 @@
             break;
         }
         case StStereoParams::PANORAMA_CUBEMAP: {
-            myProgramFlat.setColorScale(aColorScale); // apply de-anaglyph color filter
-            StGLImageProgram::FragGetColor aColorGetter = StGLImageProgram::FragGetColor_Cubemap;
-            if(!myProgramFlat.init(aCtx, stFrameTexture.getColorModel(), stFrameTexture.getColorScale(), aColorGetter)) {
+            if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), StGLImageProgram::FragGetColor_Cubemap)) {
                 break;
             }
 
-            myProgramFlat.getActiveProgram()->use(aCtx);
+            myProgram.getActiveProgram()->use(aCtx);
 
             // setup data rectangle in the texture
-            myProgramFlat.setTextureSizePx      (aCtx, textureSizeVec);
-            myProgramFlat.setTextureMainDataSize(aCtx, dataClampVec);
-            myProgramFlat.setTextureUVDataSize  (aCtx, dataUVClampVec);
+            myProgram.setTextureSizePx      (aCtx, aTextureSize);
+            myProgram.setTextureMainDataSize(aCtx, aClampVec);
+            myProgram.setTextureUVDataSize  (aCtx, aClampUV);
 
             const GLfloat aScale = aParams->ScaleFactor * PANORAMA_DEF_ZOOM;
-            stModelMat.scale(aScale, aScale, 1.0f);
+            aModelMat.scale(aScale, aScale, 1.0f);
 
-            StGLVec2 mouseMove = getMouseMoveSphere();
-            stModelMat.rotate(         aParams->PanTheta + mouseMove.y(),  StGLVec3::DX());
-            stModelMat.rotate(90.0f - (aParams->PanPhi   + mouseMove.x()), StGLVec3::DY());
+            // 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());
 
-            GLfloat aSepDeltaX = GLfloat(-aParams->getSeparationDx()) * 0.05f;
-            GLfloat aSepDeltaY = GLfloat(-aParams->getSeparationDy()) * 0.05f;
+            // apply separation
+            const float aSepDeltaX = GLfloat(aParams->getSeparationDx()) * 0.05f;
+            const float aSepDeltaY = GLfloat(aParams->getSeparationDy()) * 0.05f;
             if(theView == ST_DRAW_LEFT) {
-                stModelMat.rotate( aSepDeltaX, StGLVec3::DY());
-                stModelMat.rotate(-aSepDeltaY, StGLVec3::DZ());
-                stModelMat.rotate(-aParams->getZRotate() + aParams->getSepRotation(), StGLVec3::DX());
+                aYaw   +=  stToRadians(aSepDeltaX);
+                aPitch += -stToRadians(aSepDeltaY);
+                aRoll  += -stToRadians(aParams->getSepRotation());
             } else if(theView == ST_DRAW_RIGHT) {
-                stModelMat.rotate(-aSepDeltaX, StGLVec3::DY());
-                stModelMat.rotate( aSepDeltaY, StGLVec3::DZ());
-                stModelMat.rotate(-aParams->getZRotate() - aParams->getSepRotation(), StGLVec3::DX());
-            } else {
-                stModelMat.rotate(-aParams->getZRotate(), StGLVec3::DX());
+                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);
+
+            aModelMat = StGLMatrix::multiply(aModelMat, StGLMatrix(anOri));
+
             StGLMatrix aMatModelInv, aMatProjInv;
-            stModelMat.inverted(aMatModelInv);
+            aModelMat.inverted(aMatModelInv);
             getCamera()->getProjMatrixMono().inverted(aMatProjInv);
-            myProgramFlat.getActiveProgram()->setProjMat (aCtx, StGLMatrix::multiply(aMatModelInv, aMatProjInv));
-            myProgramFlat.getActiveProgram()->setModelMat(aCtx, stModelMat);
+            myProgram.getActiveProgram()->setProjMat (aCtx, StGLMatrix::multiply(aMatModelInv, aMatProjInv));
+            myProgram.getActiveProgram()->setModelMat(aCtx, aModelMat);
 
             ///glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 
-            myQuad.draw(aCtx, *myProgramFlat.getActiveProgram());
+            myQuad.draw(aCtx, *myProgram.getActiveProgram());
 
-            myProgramFlat.getActiveProgram()->unuse(aCtx);
+            myProgram.getActiveProgram()->unuse(aCtx);
 
             // restore changed parameters
             aParams->ScaleFactor = aScaleBack;
@@ -719,58 +704,61 @@
             break;
         }
         case StStereoParams::PANORAMA_SPHERE: {
-            myProgramSphere.setColorScale(aColorScale); // apply de-anaglyph color filter
-            StGLImageProgram::FragGetColor aColorGetter = params.textureFilter->getValue() != StGLImageProgram::FILTER_NEAREST
-                                                        ? StGLImageProgram::FragGetColor_Blend
-                                                        : StGLImageProgram::FragGetColor_Normal;
-            if(!myProgramSphere.init(aCtx, stFrameTexture.getColorModel(), stFrameTexture.getColorScale(), aColorGetter)) {
+            if(!myProgram.init(aCtx, aTextures.getColorModel(), aTextures.getColorScale(), aColorGetter)) {
                 break;
             }
 
             // perform scaling
             const GLfloat aScale = SPHERE_RADIUS * PANORAMA_DEF_ZOOM * aParams->ScaleFactor;
-            stModelMat.scale(aScale, aScale, SPHERE_RADIUS);
+            aModelMat.scale(aScale, aScale, SPHERE_RADIUS);
 
-            // apply movements
-            StGLVec2 mouseMove = getMouseMoveSphere();
-            stModelMat.rotate(         aParams->PanTheta + mouseMove.y(),  StGLVec3::DX());
-            stModelMat.rotate(90.0f - (aParams->PanPhi   + mouseMove.x()), StGLVec3::DY());
+            // 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());
 
-            GLfloat aSepDeltaX = GLfloat(-aParams->getSeparationDx()) * 0.05f;
-            //GLfloat aSepDeltaY = GLfloat(-aParams->getSeparationDy()) * 0.05f;
-
-            // apply rotations
+            // apply separation
+            const float aSepDeltaX = GLfloat(aParams->getSeparationDx()) * 0.05f;
+            const float aSepDeltaY = GLfloat(aParams->getSeparationDy()) * 0.05f;
             if(theView == ST_DRAW_LEFT) {
-                stModelMat.rotate( aSepDeltaX, StGLVec3::DY());
-                //stModelMat.rotate(-aSepDeltaY, StGLVec3::DZ());
-                //stModelMat.rotate(aParams->getZRotate() - aParams->getSepRotation(), StGLVec3::DX());
+                aYaw   +=  stToRadians(aSepDeltaX);
+                aPitch += -stToRadians(aSepDeltaY);
+                aRoll  += -stToRadians(aParams->getSepRotation());
             } else if(theView == ST_DRAW_RIGHT) {
-                stModelMat.rotate(-aSepDeltaX, StGLVec3::DY());
-                //stModelMat.rotate( aSepDeltaY, StGLVec3::DZ());
-                //stModelMat.rotate(aParams->getZRotate() + aParams->getSepRotation(), StGLVec3::DX());
-            } else {
-                //stModelMat.rotate(aParams->getZRotate(), StGLVec3::DX());
+                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);
+
+            aModelMat = StGLMatrix::multiply(aModelMat, StGLMatrix(anOri));
+
             // perform drawing
-            myProgramSphere.getActiveProgram()->use(aCtx);
+            myProgram.getActiveProgram()->use(aCtx);
 
             // setup data rectangle in the texture
-            myProgramSphere.setTextureSizePx      (aCtx, textureSizeVec);
-            myProgramSphere.setTextureMainDataSize(aCtx, dataClampVec);
-            myProgramSphere.setTextureUVDataSize  (aCtx, dataUVClampVec);
+            myProgram.setTextureSizePx      (aCtx, aTextureSize);
+            myProgram.setTextureMainDataSize(aCtx, aClampVec);
+            myProgram.setTextureUVDataSize  (aCtx, aClampUV);
 
-            myProgramSphere.getActiveProgram()->setProjMat (aCtx, getCamera()->getProjMatrixMono());
-            myProgramSphere.getActiveProgram()->setModelMat(aCtx, stModelMat);
+            myProgram.getActiveProgram()->setProjMat (aCtx, getCamera()->getProjMatrixMono());
+            myProgram.getActiveProgram()->setModelMat(aCtx, aModelMat);
 
-            myUVSphere.draw(aCtx, *myProgramSphere.getActiveProgram());
+            myUVSphere.draw(aCtx, *myProgram.getActiveProgram());
 
-            myProgramSphere.getActiveProgram()->unuse(aCtx);
+            myProgram.getActiveProgram()->unuse(aCtx);
             break;
         }
     }
 
-    stFrameTexture.unbind(aCtx);
+    aTextures.unbind(aCtx);
 
     aCtx.stglResetScissorRect();
 }

sview-15_08.tar.gz/StGLWidgets/StGLMenu.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLMenu.cpp Changed

@@ -44,6 +44,7 @@
   myColorVec(getRoot()->getColorForElement(StGLRootWidget::Color_Menu)),
   myOrient(theOrient),
   myItemHeight(theParent->getRoot()->scale(theParent->getRoot()->isMobile() ? 40 : 32)),
+  myWidthMin(0),
   myWidth(0),
   myIsRootMenu(theIsRootMenu),
   myIsContextual(false),
@@ -141,15 +142,16 @@
         changeRectPx().right()  = getRectPx().left() + aChildLast->getRectPx().right();
         changeRectPx().bottom() = getRectPx().top()  + aChildLast->getRectPx().bottom();
     }
+    int aWidth = stMax(myWidthMin, myWidth);
     if(myOrient == MENU_VERTICAL
     || myOrient == MENU_VERTICAL_COMPACT) {
-        changeRectPx().right() = getRectPx().left() + myWidth;
+        changeRectPx().right() = getRectPx().left() + aWidth;
         int anItemCount = 0;
         for(StGLWidget* aChild = getChildren()->getStart(); aChild != NULL; aChild = aChild->getNext(), ++anItemCount) {
             StGLMenuItem* anItem = (StGLMenuItem* )aChild;
             anItem->changeRectPx().moveTopTo(anItemCount * myItemHeight);
-            anItem->changeRectPx().right() = anItem->getRectPx().left() + myWidth;
-            anItem->setTextWidth(myWidth);
+            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());

sview-15_08.tar.gz/StGLWidgets/StGLMenuItem.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLMenuItem.cpp Changed

sview-15_08.tar.gz/StGLWidgets/StGLMessageBox.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLMessageBox.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLOpenFile.cpp Added

@@ -0,0 +1,212 @@
+/**
+ * Copyright © 2015 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
+ */
+
+#include <StGLWidgets/StGLOpenFile.h>
+
+#include <StGLWidgets/StGLMenu.h>
+#include <StGLWidgets/StGLMenuItem.h>
+#include <StGLWidgets/StGLScrollArea.h>
+#include <StGLWidgets/StGLTextureButton.h>
+
+StGLOpenFile::StGLOpenFile(StGLWidget*     theParent,
+                           const StString& theTitle,
+                           const StString& theCloseText)
+: StGLMessageBox(theParent, theTitle, "",
+                 theParent->getRoot()->scale(512), theParent->getRoot()->scale(400)),
+  myCurrentPath(NULL),
+  myHotList(NULL),
+  myList(NULL),
+  myHighlightColor(0.5f, 0.5f, 0.5f, 1.0f),
+  myItemColor     (1.0f, 1.0f, 1.0f, 1.0f),
+  myFileColor     (0.7f, 0.7f, 0.7f, 1.0f),
+  myHotColor      (1.0f, 1.0f, 1.0f, 1.0f),
+  myHotSizeX (theParent->getRoot()->scale(10)),
+  myMarginX  (theParent->getRoot()->scale(8)),
+  myIconSizeX(theParent->getRoot()->scale(16)) {
+    myToAdjustY = false;
+
+    int aMarginTop = myMarginTop + myRoot->scale(30);
+    myCurrentPath = new StGLTextArea(this, myMarginLeft, myMarginTop, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),
+                                     myContent->getRectPx().width(), myContent->getRectPx().height());
+    myCurrentPath->setupAlignment(StGLTextFormatter::ST_ALIGN_X_LEFT,
+                                  StGLTextFormatter::ST_ALIGN_Y_TOP);
+    myCurrentPath->setTextColor(myRoot->getColorForElement(StGLRootWidget::Color_MessageText));
+
+    myHotList = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL_COMPACT);
+    myHotList->setOpacity(1.0f, true);
+    myHotList->setItemWidth(myHotSizeX);
+    myHotList->setColor(StGLVec4(0.0f, 0.0f, 0.0f, 0.0f));
+    myHotList->changeRectPx().top()   = aMarginTop;
+    myHotList->changeRectPx().left()  = myMarginLeft;
+    myHotList->changeRectPx().right() = myMarginLeft + myHotSizeX;
+    myContent->changeRectPx().top()   = aMarginTop;
+    myContent->changeRectPx().left()  = myMarginLeft + myHotSizeX;
+
+    myList = new StGLMenu(myContent, 0, 0, StGLMenu::MENU_VERTICAL_COMPACT);
+    myList->setOpacity(1.0f, true);
+    myList->setColor(StGLVec4(0.0f, 0.0f, 0.0f, 0.0f));
+    myList->setItemWidthMin(myContent->getRectPx().width());
+
+    if(!myRoot->isMobile()) {
+        addButton(theCloseText);
+    }
+}
+
+StGLOpenFile::~StGLOpenFile() {
+    StGLContext& aCtx = getContext();
+    if(!myTextureFolder.isNull()) {
+        for(size_t aTexIter = 0; aTexIter < myTextureFolder->size(); ++aTexIter) {
+            myTextureFolder->changeValue(aTexIter).release(aCtx);
+        }
+        myTextureFolder.nullify();
+    }
+    if(!myTextureFile.isNull()) {
+        for(size_t aTexIter = 0; aTexIter < myTextureFile->size(); ++aTexIter) {
+            myTextureFile->changeValue(aTexIter).release(aCtx);
+        }
+        myTextureFile.nullify();
+    }
+}
+
+void StGLOpenFile::setMimeList(const StMIMEList& theFilter) {
+    myFilter     = theFilter;
+    myExtensions = theFilter.getExtensionsList();
+}
+
+void StGLOpenFile::doHotItemClick(const size_t theItemId) {
+    myItemToLoad = myHotPaths[theItemId];
+}
+
+void StGLOpenFile::doFileItemClick(const size_t theItemId) {
+    const StFileNode* aNode = myFolder->getValue(theItemId);
+    myItemToLoad = aNode->getPath();
+}
+
+void StGLOpenFile::doFolderUpClick(const size_t ) {
+    StString aPath   = myFolder->getPath();
+    StString aPathUp = StFileNode::getFolderUp(aPath);
+    if(!aPathUp.isEmpty()) {
+        myItemToLoad = aPathUp;
+    }
+}
+
+bool StGLOpenFile::tryUnClick(const StPointD_t& theCursorZo,
+                              const int&        theMouseBtn,
+                              bool&             isItemUnclicked) {
+    bool aRes = StGLMessageBox::tryUnClick(theCursorZo, theMouseBtn, isItemUnclicked);
+    if(!myItemToLoad.isEmpty()) {
+        StString aPath = myItemToLoad;
+        myItemToLoad.clear();
+        if(StFolder::isFolder(aPath)) {
+            openFolder(aPath);
+        } else {
+            StHandle<StString> aPathHandle = new StString(aPath);
+            signals.onFileSelected.emit(aPathHandle);
+            myRoot->destroyWithDelay(this);
+        }
+    }
+    return aRes;
+}
+
+void StGLOpenFile::addHotItem(const StString& theTarget,
+                              const StString& theName) {
+    StString aName = theName;
+    if(aName.isEmpty()) {
+        StString aFoler;
+        StFileNode::getFolderAndFile(theTarget, aFoler, aName);
+    }
+    if(aName.isEmpty()) {
+        aName = theTarget;
+    }
+    if(aName.isEmpty()
+    || theTarget.isEmpty()) {
+        return;
+    }
+    myHotPaths.add(theTarget);
+
+    StGLMenuItem* anItem = new StGLPassiveMenuItem(myHotList);
+    setItemIcon(anItem, myHotColor, true);
+    anItem->setText(aName);
+    anItem->setTextColor(myHotColor);
+    anItem->setHilightColor(myHighlightColor);
+    anItem->setUserData(myHotPaths.size() - 1);
+    anItem->signals.onItemClick = stSlot(this, &StGLOpenFile::doHotItemClick);
+
+    int aSizeX = anItem->getMargins().left + anItem->computeTextWidth() + anItem->getMargins().right;
+    myHotSizeX = stMax(myHotSizeX, aSizeX);
+
+    myContent->changeRectPx().left() = myMarginLeft + myHotSizeX;
+    myList->setItemWidthMin(myContent->getRectPx().width());
+}
+
+void StGLOpenFile::setItemIcon(StGLMenuItem*   theItem,
+                               const StGLVec4& theColor,
+                               const bool      theisFolder) {
+    if(theItem == NULL) {
+        return;
+    }
+
+    theItem->changeMargins().left = myMarginX + myIconSizeX + myMarginX;
+    if(myTextureFolder.isNull()) {
+        const StString& anIcon0 = myRoot->getIcon(StGLRootWidget::IconImage_Folder);
+        const StString& anIcon1 = myRoot->getIcon(StGLRootWidget::IconImage_File);
+        if(!anIcon0.isEmpty()
+        && !anIcon1.isEmpty()) {
+            myTextureFolder = new StGLTextureArray(1);
+            myTextureFile   = new StGLTextureArray(1);
+            myTextureFolder->changeValue(0).setName(anIcon0);
+            myTextureFile  ->changeValue(0).setName(anIcon1);
+        } else {
+            return;
+        }
+    }
+
+    StGLIcon* anIcon = new StGLIcon(theItem, myMarginX, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT), 0);
+    anIcon->setColor(theColor);
+    if(theisFolder) {
+        anIcon->setExternalTextures(myTextureFolder);
+    } else {
+        anIcon->setExternalTextures(myTextureFile);
+    }
+    theItem->setIcon(anIcon);
+}
+
+void StGLOpenFile::openFolder(const StString& theFolder) {
+    myItemToLoad.clear();
+    myList->destroyChildren();
+
+    myFolder = new StFolder(theFolder);
+    myFolder->init(myExtensions, 1, true);
+    myCurrentPath->setText(StString("<b>Location:*</b>") + myFolder->getPath() + ST_FILE_SPLITTER);
+
+    StString aPath   = myFolder->getPath() + "";
+    StString aPathUp = StFileNode::getFolderUp(aPath);
+    if(!aPathUp.isEmpty()) {
+        StGLMenuItem* anUpItem = new StGLPassiveMenuItem(myList);
+        anUpItem->setText("..");
+        anUpItem->setTextColor(myItemColor);
+        anUpItem->setHilightColor(myHighlightColor);
+        anUpItem->changeMargins().left = myMarginX + myIconSizeX + myMarginX;
+        anUpItem->signals.onItemClick = stSlot(this, &StGLOpenFile::doFolderUpClick);
+    }
+
+    const size_t aNbItems = myFolder->size();
+    for(size_t anItemIter = 0; anItemIter < aNbItems; ++anItemIter) {
+        const StFileNode* aNode = myFolder->getValue(anItemIter);
+        StString aName = aNode->getSubPath();
+        StGLMenuItem* anItem = new StGLPassiveMenuItem(myList);
+        setItemIcon(anItem, aNode->isFolder() ? myItemColor : myFileColor, aNode->isFolder());
+        anItem->setText(aName);
+        anItem->setTextColor(myItemColor);
+        anItem->setHilightColor(myHighlightColor);
+        anItem->setUserData(anItemIter);
+        anItem->signals.onItemClick = stSlot(this, &StGLOpenFile::doFileItemClick);
+    }
+    myList->stglInit();
+    stglInit();
+}

sview-15_08.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp Changed

sview-15_08.tar.gz/StGLWidgets/StGLRootWidget.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLRootWidget.cpp Changed

@@ -57,7 +57,8 @@
   cursorZo(0.0, 0.0),
   myFocusWidget(NULL),
   myIsMenuPressed(false),
-  myMenuIconSize(IconSize_16) {
+  myMenuIconSize(IconSize_16),
+  myClickThreshold(3) {
     // unify access
     StGLWidget::myRoot = this;
     myViewport[0] = 0;
@@ -126,11 +127,13 @@
 }
 
 void StGLRootWidget::setupTextures() {
-    const IconSize aCheckboxSize = scaleIcon(16);
-    myIcons[IconImage_CheckboxOff]    = iconTexture(StString("textures" ST_FILE_SPLITTER) + "checkboxOff",    aCheckboxSize);
-    myIcons[IconImage_CheckboxOn]     = iconTexture(StString("textures" ST_FILE_SPLITTER) + "checkboxOn",     aCheckboxSize);
-    myIcons[IconImage_RadioButtonOff] = iconTexture(StString("textures" ST_FILE_SPLITTER) + "radioButtonOff", aCheckboxSize);
-    myIcons[IconImage_RadioButtonOn]  = iconTexture(StString("textures" ST_FILE_SPLITTER) + "radioButtonOn",  aCheckboxSize);
+    const IconSize anIconSize = scaleIcon(16);
+    myIcons[IconImage_CheckboxOff]    = iconTexture(StString("textures" ST_FILE_SPLITTER) + "checkboxOff",    anIconSize);
+    myIcons[IconImage_CheckboxOn]     = iconTexture(StString("textures" ST_FILE_SPLITTER) + "checkboxOn",     anIconSize);
+    myIcons[IconImage_RadioButtonOff] = iconTexture(StString("textures" ST_FILE_SPLITTER) + "radioButtonOff", anIconSize);
+    myIcons[IconImage_RadioButtonOn]  = iconTexture(StString("textures" ST_FILE_SPLITTER) + "radioButtonOn",  anIconSize);
+    myIcons[IconImage_Folder]         = iconTexture(StString("textures" ST_FILE_SPLITTER) + "actionOpen",     anIconSize);
+    myIcons[IconImage_File]           = iconTexture(StString("textures" ST_FILE_SPLITTER) + "actionFile",     anIconSize);
 }
 
 StMarginsI StGLRootWidget::iconMargins(StGLRootWidget::IconSize theStdSize,
@@ -209,7 +212,8 @@
     myScaleGUI   = aScale;
     myResolution = (unsigned int )(72.0f * aScale + 0.1f);
     myGlFontMgr->setResolution(myResolution);
-    myMenuIconSize = scaleIcon(16);
+    myMenuIconSize   = scaleIcon(16);
+    myClickThreshold = scale(3);
     setupTextures();
 }

sview-15_08.tar.gz/StGLWidgets/StGLScrollArea.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLScrollArea.cpp Changed

@@ -19,7 +19,10 @@
                                const int        theWidth, const int theHeight)
 : StGLWidget(theParent, theLeft, theTop, theCorner, theWidth, theHeight),
   myBarColor(getRoot()->getColorForElement(StGLRootWidget::Color_ScrollBar)),
+  myIsLeftClick(false),
+  myHasDragged(false),
   myDragYDelta(0.0),
+  myDragYCumul(0),
   myFlingAccel((double )myRoot->scale(200)),
   myFlingYSpeed(0.0),
   myFlingYDone(0) {
@@ -89,13 +92,20 @@
         || (theVal1 <= T1(0) && theVal2 < T2(0));
 }
 
+inline void setClickedWithChildren(StGLWidgetList& theList, const int theMouseBtn, bool isClicked) {
+    for(StGLWidget* aChild = theList.getStart(); aChild != NULL; aChild = aChild->getNext()) {
+        aChild->setClicked(theMouseBtn, isClicked);
+        setClickedWithChildren(*aChild->getChildren(), theMouseBtn, isClicked);
+    }
+}
+
 void StGLScrollArea::stglUpdate(const StPointD_t& theCursorZo) {
     if(!isVisible()) {
         StGLWidget::stglUpdate(theCursorZo);
         return;
     }
 
-    if(isClicked(ST_MOUSE_LEFT)
+    if(myIsLeftClick
     && isScrollable()) {
         StPointD_t aDelta = myRoot->getCursorZo() - myClickPntZo;
         double aDeltaY = aDelta.y() * myRoot->getRectPx().height();
@@ -196,11 +206,28 @@
     const int aTopNew = stMax(stMin(aMinLim, aTopOld + theDelta), aMaxLim);
     const int aDelta  = aTopNew - aTopOld;
     if(aDelta == 0) {
+        if(theIsFling) {
+            myFlingTimer.stop();
+        }
         return false;
     }
 
     aContent->changeRectPx().top()    += aDelta;
     aContent->changeRectPx().bottom() += aDelta;
+
+    if(myIsLeftClick) {
+        if(!theIsFling) {
+            myDragYCumul += aDelta;
+            if(std::abs(myDragYCumul) > myRoot->getClickThreshold()
+            && !myHasDragged) {
+                setClickedWithChildren(myChildren, ST_MOUSE_LEFT, false);
+                myHasDragged = true;
+            }
+        } else {
+            myDragYCumul = 0;
+        }
+    }
+
     myIsResized = true;
     return true;
 }
@@ -211,10 +238,31 @@
     if(!isVisible() || !isPointIn(theCursorZo)) {
         return false;
     }
-    if(StGLWidget::tryClick(theCursorZo, theMouseBtn, isItemClicked)) {
-        if(theMouseBtn == ST_MOUSE_LEFT) {
-            myClickPntZo = theCursorZo;
+    if( theMouseBtn == ST_MOUSE_LEFT
+    && !isItemClicked
+    &&  isScrollable()) {
+        myIsLeftClick = true;
+        myHasDragged  = false;
+        myClickPntZo  = theCursorZo;
+        myDragYCumul  = 0;
+
+        // abort flinging
+        if(myFlingTimer.isOn()) {
+            const double aTime  = myFlingTimer.getElapsedTime();
+            const double anA    = (myFlingYSpeed > 0.0 ? -1.0 : 1.0) * myFlingAccel;
+            const double aSpeed = myFlingYSpeed + anA * aTime;
+            if(std::abs(aSpeed) > myRoot->scale(300)) {
+                setClickedWithChildren(myChildren, ST_MOUSE_LEFT, false);
+                isItemClicked = true;
+                return true;
+            }
         }
+    } else {
+        myIsLeftClick = false;
+        myHasDragged  = false;
+    }
+
+    if(StGLWidget::tryClick(theCursorZo, theMouseBtn, isItemClicked)) {
         isItemClicked = true;
         return true;
     }
@@ -224,12 +272,13 @@
 bool StGLScrollArea::tryUnClick(const StPointD_t& theCursorZo,
                                 const int&        theMouseBtn,
                                 bool&             isItemUnclicked) {
-    if(isClicked(ST_MOUSE_LEFT)
+    if(myIsLeftClick
     && theMouseBtn == ST_MOUSE_LEFT) {
-        isItemUnclicked = true;
-        setClicked(ST_MOUSE_LEFT, false);
+        myIsLeftClick = false;
+        myHasDragged  = false;
         if(myDragTimer.isOn()) {
             myDragYDelta = 0.0;
+            myDragYCumul = 0;
             myDragTimer.stop();
             myFlingYDone = 0;
             if(std::abs(myFlingYSpeed) > 0.00001) {
@@ -238,7 +287,6 @@
                 myFlingTimer.stop();
             }
         }
-        return true;
     }
     if(StGLWidget::tryUnClick(theCursorZo, theMouseBtn, isItemUnclicked)) {
         switch(theMouseBtn) {

sview-15_08.tar.gz/StGLWidgets/StGLSubtitles.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLSubtitles.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -141,15 +141,25 @@
     StArrayList<StHandle <StSubItem> >::add(theItem);
 }
 
+inline StGLVCorner parseCorner(int theVal) {
+    return (StGLVCorner )theVal;
+}
+
 StGLSubtitles::StGLSubtitles(StGLWidget*                     theParent,
                              const StHandle<StSubQueue>&     theSubQueue,
+                             const StHandle<StInt32Param>&   thePlace,
+                             const StHandle<StFloat32Param>& theTopDY,
+                             const StHandle<StFloat32Param>& theBottomDY,
                              const StHandle<StFloat32Param>& theFontSize,
                              const StHandle<StFloat32Param>& theParallax,
                              const StHandle<StEnumParam>&    theParser)
 : StGLTextArea(theParent,
-               0, -theParent->getRoot()->scale(100),
-               StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_CENTER),
+               0, 0,
+               StGLCorner(parseCorner(thePlace->getValue()), ST_HCORNER_CENTER),
                theParent->getRoot()->scale(800), theParent->getRoot()->scale(160)),
+  myPlace(thePlace),
+  myTopDY(theTopDY),
+  myBottomDY(theBottomDY),
   myFontSize(theFontSize),
   myParallax(theParallax),
   myParser(theParser),
@@ -225,6 +235,44 @@
         myShowItems.add(aNewSubItem);
     }
 
+    const StGLVCorner aCorner = parseCorner(myPlace->getValue());
+    bool toResize = myCorner.v != aCorner;
+    myCorner.v = aCorner;
+    switch(myCorner.v) {
+        case ST_VCORNER_TOP: {
+            const int aDisp = myRoot->scale((int )myTopDY->getValue());
+            if(getRectPx().top() != aDisp) {
+                toResize = true;
+                changeRectPx().moveTopTo(aDisp);
+            }
+            myFormatter.setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER,
+                                       StGLTextFormatter::ST_ALIGN_Y_TOP);
+            break;
+        }
+        case ST_VCORNER_CENTER: {
+            if(getRectPx().top() != 0) {
+                toResize = true;
+                changeRectPx().moveTopTo(0);
+            }
+            myFormatter.setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER,
+                                       StGLTextFormatter::ST_ALIGN_Y_CENTER);
+            break;
+        }
+        case ST_VCORNER_BOTTOM: {
+            const int aDisp = -myRoot->scale((int )myBottomDY->getValue());
+            if(getRectPx().top() != aDisp) {
+                toResize = true;
+                changeRectPx().moveTopTo(aDisp);
+            }
+            myFormatter.setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER,
+                                       StGLTextFormatter::ST_ALIGN_Y_BOTTOM);
+            break;
+        }
+    }
+    if(toResize) {
+        stglResize();
+    }
+
     StGLContext& aCtx = getContext();
     if(isChanged) {
         setText(myShowItems.Text);

sview-15_08.tar.gz/StGLWidgets/StGLTable.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLTable.cpp Changed

sview-15_08.tar.gz/StGLWidgets/StGLTextArea.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLTextArea.cpp Changed

sview-15_08.tar.gz/StGLWidgets/StGLTextureButton.cpp -> sview-15_10.tar.gz/StGLWidgets/StGLTextureButton.cpp Changed

sview-15_08.tar.gz/StGLWidgets/StGLWidgets.cbp -> sview-15_10.tar.gz/StGLWidgets/StGLWidgets.cbp Changed

@@ -213,10 +213,8 @@
 		<Unit filename="StGLCombobox.cpp" />
 		<Unit filename="StGLDescription.cpp" />
 		<Unit filename="StGLFpsLabel.cpp" />
-		<Unit filename="StGLImageFlatProgram.cpp" />
 		<Unit filename="StGLImageProgram.cpp" />
 		<Unit filename="StGLImageRegion.cpp" />
-		<Unit filename="StGLImageSphereProgram.cpp" />
 		<Unit filename="StGLMenu.cpp" />
 		<Unit filename="StGLMenuCheckbox.cpp" />
 		<Unit filename="StGLMenuItem.cpp" />
@@ -224,6 +222,7 @@
 		<Unit filename="StGLMenuRadioButton.cpp" />
 		<Unit filename="StGLMessageBox.cpp" />
 		<Unit filename="StGLMsgStack.cpp" />
+		<Unit filename="StGLOpenFile.cpp" />
 		<Unit filename="StGLPlayList.cpp" />
 		<Unit filename="StGLRadioButton.cpp" />
 		<Unit filename="StGLRadioButtonFloat32.cpp" />
@@ -254,10 +253,8 @@
 		<Unit filename="../include/StGLWidgets/StGLCorner.h" />
 		<Unit filename="../include/StGLWidgets/StGLDescription.h" />
 		<Unit filename="../include/StGLWidgets/StGLFpsLabel.h" />
-		<Unit filename="../include/StGLWidgets/StGLImageFlatProgram.h" />
 		<Unit filename="../include/StGLWidgets/StGLImageProgram.h" />
 		<Unit filename="../include/StGLWidgets/StGLImageRegion.h" />
-		<Unit filename="../include/StGLWidgets/StGLImageSphereProgram.h" />
 		<Unit filename="../include/StGLWidgets/StGLMenu.h" />
 		<Unit filename="../include/StGLWidgets/StGLMenuCheckbox.h" />
 		<Unit filename="../include/StGLWidgets/StGLMenuItem.h" />
@@ -265,6 +262,7 @@
 		<Unit filename="../include/StGLWidgets/StGLMenuRadioButton.h" />
 		<Unit filename="../include/StGLWidgets/StGLMessageBox.h" />
 		<Unit filename="../include/StGLWidgets/StGLMsgStack.h" />
+		<Unit filename="../include/StGLWidgets/StGLOpenFile.h" />
 		<Unit filename="../include/StGLWidgets/StGLPlayList.h" />
 		<Unit filename="../include/StGLWidgets/StGLRadioButton.h" />
 		<Unit filename="../include/StGLWidgets/StGLRadioButtonFloat32.h" />

sview-15_08.tar.gz/StGLWidgets/StGLWidgets.vcxproj -> sview-15_10.tar.gz/StGLWidgets/StGLWidgets.vcxproj Changed

sview-15_08.tar.gz/StGLWidgets/StGLWidgets.vcxproj.filters -> sview-15_10.tar.gz/StGLWidgets/StGLWidgets.vcxproj.filters Changed

sview-15_08.tar.gz/StGLWidgets/StSubQueue.cpp -> sview-15_10.tar.gz/StGLWidgets/StSubQueue.cpp Changed

sview-15_08.tar.gz/StImageViewer/StImageLoader.cpp -> sview-15_10.tar.gz/StImageViewer/StImageLoader.cpp Changed

@@ -110,6 +110,7 @@
                                      const size_t           theMaxSizeX,
                                      const size_t           theMaxSizeY,
                                      StCubemap              theCubemap,
+                                     const size_t*          theCubeCoeffs,
                                      StPairRatio            thePairRatio) {
     if(theRef->isNull()) {
         return theRef;
@@ -122,9 +123,9 @@
         size_t aMulY = (thePairRatio == StPairRatio_HalfHeight) ? 2 : 1;
         for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
             const StImagePlane& aPlane = theRef->getPlane(aPlaneId);
-            aSizesY[aPlaneId] = stMin(aPlane.getSizeX() / (6 * aMulX), theMaxSizeY);
-            if(aSizesY[aPlaneId] != aPlane.getSizeY() * aMulY) {
-                const size_t aSizeAlt = stMin(aPlane.getSizeY(), theMaxSizeY) * aMulY;
+            aSizesY[aPlaneId] = stMin(aPlane.getSizeX() / (theCubeCoeffs[0] * aMulX), theMaxSizeY);
+            if(aSizesY[aPlaneId] * theCubeCoeffs[1] != aPlane.getSizeY() * aMulY) {
+                const size_t aSizeAlt = stMin(aPlane.getSizeY() / theCubeCoeffs[1], theMaxSizeY) * aMulY;
                 aSizesY[aPlaneId] = stMax(aSizesY[aPlaneId], aSizeAlt);
                 toResize = true;
             }
@@ -137,8 +138,8 @@
         anImage->setColorModel(theRef->getColorModel());
         anImage->setColorScale(theRef->getColorScale());
 
-        double aRatioX = double(aSizesY[0] * 6 * aMulX) / double(theRef->getSizeX());
-        double aRatioY = double(aSizesY[0]     * aMulY) / double(theRef->getSizeY());
+        double aRatioX = double(aSizesY[0] * theCubeCoeffs[0] * aMulX) / double(theRef->getSizeX());
+        double aRatioY = double(aSizesY[0] * theCubeCoeffs[1] * aMulY) / double(theRef->getSizeY());
         anImage->setPixelRatio(float(double(theRef->getPixelRatio()) * aRatioY / aRatioX));
         for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
             const StImagePlane& aFromPlane = theRef->getPlane(aPlaneId);
@@ -147,8 +148,8 @@
             }
 
             if(!anImage->changePlane(aPlaneId).initTrash(aFromPlane.getFormat(),
-                                                         aSizesY[aPlaneId] * 6 * aMulX,
-                                                         aSizesY[aPlaneId]     * aMulY)) {
+                                                         aSizesY[aPlaneId] * theCubeCoeffs[0] * aMulX,
+                                                         aSizesY[aPlaneId] * theCubeCoeffs[1] * aMulY)) {
                 ST_ERROR_LOG("Scale failed!");
                 return theRef;
             }
@@ -179,6 +180,21 @@
     return anImage;
 }
 
+/**
+ * Auxiliary method to format image dimensions.
+ */
+inline StString formatSize(size_t theSizeX,
+                           size_t theSizeY,
+                           size_t theSrcSizeX,
+                           size_t theSrcSizeY) {
+    StString aText = StString() + theSizeX + " x " + theSizeY;
+    if(theSizeX != theSrcSizeX
+    || theSizeY != theSrcSizeY) {
+        aText += StString() + " [" + theSrcSizeX + " x " + theSrcSizeY + "]";
+    }
+    return aText;
+}
+
 bool StImageLoader::loadImage(const StHandle<StFileNode>& theSource,
                               StHandle<StStereoParams>&   theParams) {
     const StString               aFilePath = theSource->getPath();
@@ -353,18 +369,14 @@
     // scale down image if it does not fit texture limits
     size_t aSizeXLim = size_t(myMaxTexDim);
     size_t aSizeYLim = size_t(myMaxTexDim);
-    size_t aSizeX1 = 0;
-    size_t aSizeY1 = 0;
-    size_t aSizeX2 = 0;
-    size_t aSizeY2 = 0;
-    if(!anImageFileL->isNull()) {
-        aSizeX1 = anImageFileL->getSizeX();
-        aSizeY1 = anImageFileL->getSizeY();
-    }
-    if(!anImageFileR->isNull()) {
-        aSizeX2 = anImageFileR->getSizeX();
-        aSizeY2 = anImageFileR->getSizeY();
-    }
+    size_t aSizeX1 = anImageFileL->getSizeX();
+    size_t aSizeY1 = anImageFileL->getSizeY();
+    size_t aSizeX2 = anImageFileR->getSizeX();
+    size_t aSizeY2 = anImageFileR->getSizeY();
+    theParams->Src1SizeX = aSizeX1;
+    theParams->Src1SizeY = aSizeY1;
+    theParams->Src2SizeX = aSizeX2;
+    theParams->Src2SizeY = aSizeY2;
     StPairRatio aPairRatio = StPairRatio_1;
     if(anImageFileR->isNull()) {
         aPairRatio = st::formatToPairRatio(aSrcFormatCurr);
@@ -376,24 +388,32 @@
             aSizeY1   /= 2;
         }
     }
+    size_t aCubeCoeffs[2] = {0, 0};
     if(aSrcCubemap == StCubemap_Packed) {
-        bool isOk = aSizeX1 / 6 == aSizeY1;
+        if(aSizeX1 / 6 == aSizeY1) {
+            aCubeCoeffs[0] = 6;
+            aCubeCoeffs[1] = 1;
+        } else if(aSizeX1 / 3 == aSizeY1 / 2) {
+            aCubeCoeffs[0] = 3;
+            aCubeCoeffs[1] = 2;
+        }
         if(!anImageFileR->isNull()
         && (aSizeX1 != aSizeX2 || aSizeY1 != aSizeY2)) {
-            isOk = false;
+            aCubeCoeffs[0] = 0;
         }
-        if(!isOk) {
+        if(aCubeCoeffs[0] == 0) {
             myMsgQueue->pushError(StString("Image(s) has unexpected dimensions: {0}x{1} ({2}x{3})\n"
-                                           "Cubemap should has 6 horizontally stacked squared images.")
+                                           "Cubemap should has 6 squared images in configuration 6:1 (single row) or 3:2 (two rows).")
                        .format(aSizeX1, aSizeY1, anImageFileL->getSizeX(), anImageFileL->getSizeY()));
             aSrcCubemap = StCubemap_OFF;
         } else {
-            aSizeXLim *= 6;
+            aSizeXLim *= aCubeCoeffs[0];
+            aSizeYLim *= aCubeCoeffs[1];
         }
     }
 
-    StHandle<StImage> anImageL = scaledImage(anImageFileL, aSizeXLim, aSizeYLim, aSrcCubemap, aPairRatio);
-    StHandle<StImage> anImageR = scaledImage(anImageFileR, aSizeXLim, aSizeYLim, aSrcCubemap, aPairRatio);
+    StHandle<StImage> anImageL = scaledImage(anImageFileL, aSizeXLim, aSizeYLim, aSrcCubemap, aCubeCoeffs, aPairRatio);
+    StHandle<StImage> anImageR = scaledImage(anImageFileR, aSizeXLim, aSizeYLim, aSrcCubemap, aCubeCoeffs, aPairRatio);
 #ifdef ST_DEBUG
     const double aScaleTimeMSec = aLoadTimer.getElapsedTimeInMilliSec() - aLoadTimeMSec;
     if(anImageL != anImageFileL) {
@@ -428,9 +448,11 @@
     }
     const StString aModelL = anImageFileL->formatImgColorModel();
     if(!anImageFileR->isNull()) {
-        anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS), StString()
-                                     + anImageFileL->getSizeX() + " x " + anImageFileL->getSizeY() + " " + tr(INFO_LEFT) + "\n"
-                                     + anImageFileR->getSizeX() + " x " + anImageFileR->getSizeY() + " " + tr(INFO_RIGHT)));
+        anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS),
+                                       formatSize(anImageL->getSizeX(), anImageL->getSizeY(),
+                                                  theParams->Src1SizeX, theParams->Src1SizeY) + " " + tr(INFO_LEFT) + "\n"
+                                     + formatSize(anImageR->getSizeX(), anImageR->getSizeY(),
+                                                  theParams->Src2SizeX, theParams->Src2SizeY) + " " + tr(INFO_RIGHT)));
         const StString aModelR = anImageFileR->formatImgColorModel();
         if(aModelL == aModelR) {
             anImgInfo->Info.add(StArgument(tr(INFO_COLOR_MODEL), aModelL));
@@ -440,8 +462,9 @@
                               + aModelR + " " + tr(INFO_RIGHT)));
         }
     } else {
-        anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS), StString()
-                                     + anImageFileL->getSizeX() + " x " + anImageFileL->getSizeY()));
+        anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS),
+                                       formatSize(anImageL->getSizeX(), anImageL->getSizeY(),
+                                                  theParams->Src1SizeX, theParams->Src1SizeY)));
         anImgInfo->Info.add(StArgument(tr(INFO_COLOR_MODEL),
                                        aModelL));
     }

sview-15_08.tar.gz/StImageViewer/StImagePluginInfo.h -> sview-15_10.tar.gz/StImageViewer/StImagePluginInfo.h Changed

@@ -51,7 +51,7 @@
 
 /**
  *.jpg, *.jpeg, *.jpe - Joint Photographic Experts Group image file, lossy
- *.jp2 - JPEG 2000 image, lossy
+ *.jp2, *.j2k - JPEG 2000 image, lossy
  */
 #define ST_JPG_MIME "image/jpg"
 #define ST_JPG_EXT  "jpg"
@@ -62,7 +62,10 @@
 #define ST_JPEG_EXT  "jpeg"
 #define ST_JP2_MIME "image/x-jp2"
 #define ST_JP2_EXT  "jp2"
-#define ST_JP2_DESC "JP2 - JPEG 2000 image, lossy"
+#define ST_JP2_DESC "J2K - JPEG 2000 image, lossy"
+#define ST_J2K_MIME "image/x-j2k"
+#define ST_J2K_EXT  "j2k"
+#define ST_J2K_DESC "J2K - JPEG 2000 image, lossy"
 
 /**
  *.png - Portable Network Graphics image file, lossless
@@ -215,6 +218,7 @@
 ST_JPE_MIME ":" ST_JPE_EXT ":" ST_JPEG_DESC ";" \
 ST_JPEG_MIME ":" ST_JPEG_EXT ":" ST_JPEG_DESC ";" \
 ST_JP2_MIME ":" ST_JP2_EXT ":" ST_JP2_DESC ";" \
+ST_J2K_MIME ":" ST_J2K_EXT ":" ST_J2K_DESC ";" \
 ST_PNG_MIME ":" ST_PNG_EXT ":" ST_PNG_DESC ";" \
 ST_BMP_MIME ":" ST_BMP_EXT ":" ST_BMP_DESC ";" \
 ST_GIF_MIME ":" ST_GIF_EXT ":" ST_GIF_DESC ";" \

sview-15_08.tar.gz/StImageViewer/StImageViewer.cpp -> sview-15_10.tar.gz/StImageViewer/StImageViewer.cpp Changed

@@ -51,6 +51,9 @@
     static const char ST_SETTING_FPSTARGET[]   = "fpsTarget";
     static const char ST_SETTING_SRCFORMAT[]   = "srcFormat";
     static const char ST_SETTING_LAST_FOLDER[] = "lastFolder";
+    static const char ST_SETTING_RECENT_L[]    = "recentL";
+    static const char ST_SETTING_RECENT_R[]    = "recentR";
+    static const char ST_SETTING_SAVE_RECENT[] = "toSaveRecent";
     static const char ST_SETTING_COMPRESS[]    = "toCompress";
     static const char ST_SETTING_ESCAPENOQUIT[]= "escNoQuit";
     static const char ST_SETTING_FULLSCREENUI[]= "fullScreenUI";
@@ -60,6 +63,7 @@
     static const char ST_SETTING_SCALE_FORCE2X[] = "scale2X";
     static const char ST_SETTING_FULLSCREEN[]  = "fullscreen";
     static const char ST_SETTING_SLIDESHOW[]   = "slideshow";
+    static const char ST_SETTING_TRACK_HEAD[]  = "toTrackHead";
     static const char ST_SETTING_SHOW_FPS[]    = "toShowFps";
     static const char ST_SETTING_MOBILE_UI[]   = "isMobileUI";
     static const char ST_SETTING_VSYNC[]       = "vsync";
@@ -68,12 +72,14 @@
     static const char ST_SETTING_TEXFILTER[]   = "viewTexFilter";
     static const char ST_SETTING_GAMMA[]       = "viewGamma";
     static const char ST_SETTING_RATIO[]       = "ratio";
+    static const char ST_SETTING_HEAL_ANAMORPHIC[]    = "toHealAnamorphic";
     static const char ST_SETTING_UPDATES_LAST_CHECK[] = "updatesLastCheck";
     static const char ST_SETTING_UPDATES_INTERVAL[]   = "updatesInterval";
     static const char ST_SETTING_IMAGELIB[]    = "imageLib";
 
     static const char ST_ARGUMENT_FILE_LEFT[]  = "left";
     static const char ST_ARGUMENT_FILE_RIGHT[] = "right";
+    static const char ST_ARGUMENT_FILE_LAST[]  = "last";
 
 }
 
@@ -165,6 +171,23 @@
     ST_LOCAL const StString& getPathLeft()  const { return myPathLeft; }
 
     /**
+     * Set paths to open.
+     */
+    ST_LOCAL void setPaths(const StString& thePathLeft,
+                           const StString& thePathRight) {
+        StMutexAuto aLock(myMutex);
+        if(myState != StOpenImage::Dialog_Inactive) {
+            return;
+        }
+
+        myPathLeft  = thePathLeft;
+        myPathRight = thePathRight;
+        if(!myPathLeft.isEmpty()) {
+            myState = StOpenImage::Dialog_HasFiles;
+        }
+    }
+
+    /**
      * Return path to the right file.
      * Should NOT be called within Active state.
      */
@@ -227,7 +250,7 @@
                              const StHandle<StOpenInfo>&        theOpenInfo,
                              const StString&                    theAppName)
 : StApplication(theResMgr, theParentWin, theOpenInfo),
-  myAppName(theAppName),
+  myAppName(!theAppName.isEmpty() ? theAppName : ST_DRAWER_PLUGIN_NAME),
   myEventLoaded(false),
   //
   mySlideShowTimer(false),
@@ -238,9 +261,9 @@
   myToRecreateMenu(false),
   myToSaveSrcFormat(false),
   myEscNoQuit(false),
-  myToHideUIFullScr(false) {
-    const StString& anAppName = !theAppName.isEmpty() ? theAppName : ST_DRAWER_PLUGIN_NAME;
-    mySettings = new StSettings(myResMgr, anAppName);
+  myToHideUIFullScr(false),
+  myToCheckPoorOrient(true) {
+    mySettings = new StSettings(myResMgr, myAppName);
     myLangMap  = new StTranslations(myResMgr, StImageViewer::ST_DRAWER_PLUGIN_NAME);
     myOpenDialog = new StOpenImage(this);
     StImageViewerStrings::loadDefaults(*myLangMap);
@@ -267,6 +290,7 @@
     params.checkUpdatesDays = new StInt32Param(7);
     params.srcFormat        = new StInt32Param(StFormat_AUTO);
     params.srcFormat->signals.onChanged.connect(this, &StImageViewer::doSwitchSrcFormat);
+    params.ToTrackHead   = new StBoolParamNamed(true,  tr(StImageViewerStrings::MENU_VIEW_TRACK_HEAD));
     params.ToShowFps     = new StBoolParamNamed(false, tr(StImageViewerStrings::MENU_SHOW_FPS));
     params.ToShowToolbar = new StBoolParamNamed(true, "Show toolbar");
     params.IsMobileUI = new StBoolParamNamed(StWindow::isMobile(), "Mobile UI");
@@ -274,6 +298,7 @@
     params.IsVSyncOn  = new StBoolParam(true);
     params.IsVSyncOn->signals.onChanged = stSlot(this, &StImageViewer::doSwitchVSync);
     StApplication::params.VSyncMode->setValue(StGLContext::VSync_ON);
+    params.ToSaveRecent = new StBoolParam(false);
 
     params.imageLib = StImageFile::ST_LIBAV,
     params.TargetFps = 0;
@@ -282,6 +307,7 @@
     mySettings->loadString(ST_SETTING_LAST_FOLDER,        params.lastFolder);
     mySettings->loadInt32 (ST_SETTING_UPDATES_LAST_CHECK, myLastUpdateDay);
     mySettings->loadParam (ST_SETTING_UPDATES_INTERVAL,   params.checkUpdatesDays);
+    myToCheckPoorOrient = !mySettings->loadParam(ST_SETTING_TRACK_HEAD, params.ToTrackHead);
     mySettings->loadParam (ST_SETTING_SHOW_FPS,           params.ToShowFps);
     mySettings->loadParam (ST_SETTING_MOBILE_UI,          params.IsMobileUI);
     mySettings->loadParam (ST_SETTING_VSYNC,              params.IsVSyncOn);
@@ -369,6 +395,9 @@
 
     anAction = new StActionIntSlot(stCString("DoImageAdjustReset"), stSlot(this, &StImageViewer::doImageAdjustReset), 0);
     addAction(Action_ImageAdjustReset, anAction);
+
+    anAction = new StActionIntSlot(stCString("DoPanoramaOnOff"), stSlot(this, &StImageViewer::doPanoramaOnOff), 0);
+    addAction(Action_PanoramaOnOff, anAction, ST_VK_P);
 }
 
 bool StImageViewer::resetDevice() {
@@ -393,6 +422,7 @@
 
     mySettings->saveParam(ST_SETTING_STEREO_MODE, myGUI->myImage->params.displayMode);
     mySettings->saveInt32(ST_SETTING_GAMMA, stRound(100.0f * myGUI->myImage->params.gamma->getValue()));
+    mySettings->saveParam(ST_SETTING_HEAL_ANAMORPHIC, myGUI->myImage->params.ToHealAnamorphicRatio);
     if(params.toRestoreRatio->getValue()) {
         mySettings->saveParam(ST_SETTING_RATIO, myGUI->myImage->params.displayRatio);
     } else {
@@ -401,7 +431,7 @@
     mySettings->saveParam(ST_SETTING_TEXFILTER, myGUI->myImage->params.textureFilter);
 }
 
-void StImageViewer::releaseDevice() {
+void StImageViewer::saveAllParams() {
     saveGuiParams();
     if(!myGUI.isNull()) {
         mySettings->saveParam (ST_SETTING_SCALE_ADJUST,  params.ScaleAdjust);
@@ -411,6 +441,7 @@
         mySettings->saveInt32(ST_SETTING_UPDATES_LAST_CHECK, myLastUpdateDay);
         mySettings->saveParam(ST_SETTING_UPDATES_INTERVAL, params.checkUpdatesDays);
         mySettings->saveString(ST_SETTING_IMAGELIB,  StImageFile::imgLibToString(params.imageLib));
+        mySettings->saveParam (ST_SETTING_TRACK_HEAD,params.ToTrackHead);
         mySettings->saveParam (ST_SETTING_SHOW_FPS,  params.ToShowFps);
         mySettings->saveParam (ST_SETTING_MOBILE_UI, params.IsMobileUI);
         mySettings->saveParam (ST_SETTING_VSYNC,     params.IsVSyncOn);
@@ -425,6 +456,25 @@
         }
     }
 
+    StString aLastL, aLastR;
+    StHandle<StFileNode> aFile = myLoader->getPlayList().getCurrentFile();
+    if(params.ToSaveRecent->getValue()
+    && !aFile.isNull()) {
+        if(aFile->isEmpty()) {
+            aLastL = aFile->getPath();
+        } else if(aFile->size() == 2) {
+            aLastL = aFile->getValue(0)->getPath();
+            aLastR = aFile->getValue(1)->getPath();
+        }
+    }
+    mySettings->saveString(ST_SETTING_RECENT_L, aLastL);
+    mySettings->saveString(ST_SETTING_RECENT_R, aLastR);
+    mySettings->flush();
+}
+
+void StImageViewer::releaseDevice() {
+    saveAllParams();
+
     // release GUI data and GL resources before closing the window
     myKeyActions.clear();
     myGUI.nullify();
@@ -456,6 +506,7 @@
     mySettings->loadParam (ST_SETTING_STEREO_MODE,        myGUI->myImage->params.displayMode);
     mySettings->loadParam (ST_SETTING_TEXFILTER,          myGUI->myImage->params.textureFilter);
     mySettings->loadParam (ST_SETTING_RATIO,              myGUI->myImage->params.displayRatio);
+    mySettings->loadParam (ST_SETTING_HEAL_ANAMORPHIC,    myGUI->myImage->params.ToHealAnamorphicRatio);
     params.toRestoreRatio->setValue(myGUI->myImage->params.displayRatio->getValue() != StGLImageRegion::RATIO_AUTO);
     int32_t loadedGamma = 100; // 1.0f
         mySettings->loadInt32(ST_SETTING_GAMMA, loadedGamma);
@@ -555,6 +606,7 @@
     StArgument argEscNoQuit  = theArguments[ST_SETTING_ESCAPENOQUIT];
     StArgument argFullScreenUI = theArguments[ST_SETTING_FULLSCREENUI];
     StArgument argToolbar    = theArguments[ST_SETTING_SHOW_TOOLBAR];
+    StArgument argSaveRecent = theArguments[ST_SETTING_SAVE_RECENT];
     if(argToCompress.isValid()) {
         myLoader->setCompressMemory(!argToCompress.isValueOff());
     }
@@ -584,6 +636,9 @@
         params.imageLib = StImageFile::imgLibFromString(argImgLibrary.getValue());
         myLoader->setImageLib(params.imageLib);
     }
+    if(argSaveRecent.isValid()) {
+        params.ToSaveRecent->setValue(!argSaveRecent.isValueOff());
+    }
 }
 
 bool StImageViewer::open() {
@@ -594,6 +649,13 @@
         return false;
     }
 
+    // disable head-tracking by default for poor sensors
+    if(myToCheckPoorOrient
+    && myWindow->isPoorOrientationSensor()) {
+        myToCheckPoorOrient = false;
+        params.ToTrackHead->setValue(false);
+    }
+
     if(isReset) {
         myLoader->doLoadNext();
         return true;
@@ -602,6 +664,27 @@
     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()) {
+            StString aLastL, aLastR;
+            mySettings->loadString(ST_SETTING_RECENT_L, aLastL);
+            mySettings->loadString(ST_SETTING_RECENT_R, aLastR);
+            if(!aLastL.isEmpty()) {
+                if(!aLastR.isEmpty()) {
+                    myLoader->getPlayList().clear();
+                    myLoader->getPlayList().addOneFile(aLastL, aLastR);
+                } else {
+                    myLoader->getPlayList().open(aLastL);
+                }
+
+                if(!myLoader->getPlayList().isEmpty()) {
+                    doUpdateStateLoading();
+                    myLoader->doLoadNext();
+                }
+                return true;
+            }
+        }
+
         // open drawer without files
         return true;
     }
@@ -636,6 +719,11 @@
     // update menu
 }
 
+void StImageViewer::doPause(const StPauseEvent& theEvent) {
+    StApplication::doPause(theEvent);
+    saveAllParams();
+}
+
 void StImageViewer::doResize(const StSizeEvent& ) {
     if(myGUI.isNull()) {
         return;
@@ -919,8 +1007,23 @@
 void StImageViewer::stglDraw(unsigned int theView) {
     if( myContext.isNull()
     || !myContext->isBound()) {
+        if(theView == ST_DRAW_LEFT
+        || theView == ST_DRAW_MONO) {
+            if(myWindow->isPaused()) {
+                if(!myInactivityTimer.isOn()) {
+                    myInactivityTimer.restart();
+                } else if(myInactivityTimer.getElapsedTimeInSec() > 60.0) {
+                    // perform delayed destruction on long inactivity
+                    exit(0);
+                } else {
+                    // force deep sleeps
+                    StThread::sleep(100);
+                }
+            }
+        }
         return;
     }
+    myInactivityTimer.stop();
 
     if(myContext->core20fwd != NULL) {
         // clear the screen and the depth buffer
@@ -998,6 +1101,36 @@
     }
 }
 
+void StImageViewer::doPanoramaOnOff(const size_t ) {
+    if(myLoader.isNull()) {
+        return;
+    }
+
+    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
+    if(aParams.isNull()
+    || aParams->Src1SizeX == 0
+    || aParams->Src1SizeY == 0) {
+        return;
+    }
+
+    int aMode = myGUI->myImage->params.ViewMode->getValue();
+    if(aMode != StStereoParams::FLAT_IMAGE) {
+        myGUI->myImage->params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+        return;
+    }
+
+    StPanorama aPano = st::probePanorama(aParams->StereoFormat,
+                                         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);
+}
+
+void StImageViewer::doOpen1FileFromGui(StHandle<StString> thePath) {
+    myOpenDialog->setPaths(*thePath, "");
+}
+
 void StImageViewer::doOpen1FileDialog(const size_t ) {
     myOpenDialog->openDialog(1);
 }

sview-15_08.tar.gz/StImageViewer/StImageViewer.h -> sview-15_10.tar.gz/StImageViewer/StImageViewer.h Changed

@@ -80,6 +80,7 @@
         private: //! @name window events slots
 
     ST_LOCAL virtual void doChangeDevice(const int32_t theValue);
+    ST_LOCAL virtual void doPause    (const StPauseEvent&  theEvent);
     ST_LOCAL virtual void doResize   (const StSizeEvent&   theEvent);
     ST_LOCAL virtual void doKeyDown  (const StKeyEvent&    theEvent);
     ST_LOCAL virtual void doKeyHold  (const StKeyEvent&    theEvent);
@@ -91,6 +92,7 @@
 
         public: //! @name callback Slots
 
+    ST_LOCAL void doOpen1FileFromGui(StHandle<StString> thePath);
     ST_LOCAL void doOpen1FileDialog(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); }
@@ -128,10 +130,12 @@
         StHandle<StBoolParam>    ScaleHiDPI2X;     //!< option to set HiDPI resolution to 2.0
         StHandle<StInt32Param>   checkUpdatesDays; //!< days count between updates checks
         StHandle<StInt32Param>   srcFormat;        //!< source format
+        StHandle<StBoolParam>    ToTrackHead;      //!< enable/disable head-tracking
         StHandle<StBoolParam>    ToShowToolbar;    //!< show/hide toolbar
         StHandle<StBoolParam>    ToShowFps;        //!< display FPS meter
         StHandle<StBoolParam>    IsMobileUI;       //!< display mobile interface
         StHandle<StBoolParam>    IsVSyncOn;        //!< flag to use VSync
+        StHandle<StBoolParam>    ToSaveRecent;     //!< load/save recent file
         StString                 lastFolder;       //!< laster folder used to open / save file
         StImageFile::ImageClass  imageLib;         //!< preferred image library
         int                      TargetFps;        //!< limit or not rendering FPS
@@ -153,6 +157,7 @@
     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 );
 
         public:
 
@@ -178,7 +183,8 @@
         Action_DeleteFile,
         Action_ImageAdjustReset,
         Action_StereoParamsBegin,
-        Action_StereoParamsEnd = Action_StereoParamsBegin + StGLImageRegion::ActionsNb,
+        Action_StereoParamsEnd = Action_StereoParamsBegin + StGLImageRegion::ActionsNb - 1,
+        Action_PanoramaOnOff,
     };
 
         private:
@@ -189,6 +195,7 @@
     ST_LOCAL bool init();
     ST_LOCAL bool createGui();
     ST_LOCAL void saveGuiParams();
+    ST_LOCAL void saveAllParams();
 
     /**
      * Parse arguments.
@@ -218,6 +225,7 @@
     StString                   myAppName;         //!< name of customized application
 
     StCondition                myEventLoaded;     //!< indicate that new file was open
+    StTimer                    myInactivityTimer; //!< timer initialized when application goes into paused state
 
     StTimer                    mySlideShowTimer;  //!< slideshow stuff
     double                     mySlideShowDelay;
@@ -228,6 +236,7 @@
     bool                       myToSaveSrcFormat; //!< indicates that active source format should be saved or not
     bool                       myEscNoQuit;       //!< if true then Escape will not quit application
     bool                       myToHideUIFullScr; //!< if true then GUI will be hidden in full-screen mode
+    bool                       myToCheckPoorOrient; //!< switch off orientation sensor with poor quality
 
         private:

sview-15_08.tar.gz/StImageViewer/StImageViewerGUI.cpp -> sview-15_10.tar.gz/StImageViewer/StImageViewerGUI.cpp Changed

@@ -34,6 +34,7 @@
 #include <StGLWidgets/StGLMenu.h>
 #include <StGLWidgets/StGLMenuItem.h>
 #include <StGLWidgets/StGLMsgStack.h>
+#include <StGLWidgets/StGLOpenFile.h>
 #include <StGLWidgets/StGLRangeFieldFloat32.h>
 #include <StGLWidgets/StGLScrollArea.h>
 #include <StGLWidgets/StGLSwitchTextured.h>
@@ -143,7 +144,7 @@
         iconTexture(stCString("menuOverUnderRL"),    anIconSize),
         iconTexture(stCString("menuRowLR"),          anIconSize),
         iconTexture(stCString("menuColLR"),          anIconSize),
-        iconTexture(stCString("menuSrcSeparate"),    anIconSize),
+        iconTexture(stCString("menuDual"),           anIconSize),
         iconTexture(stCString("menuFrameSeqLR"),     anIconSize),
         iconTexture(stCString("menuRedCyanLR"),      anIconSize),
         iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
@@ -161,6 +162,16 @@
                                            StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
     myBtnSwapLR->setDrawShadow(true);
     myBtnSwapLR->changeMargins() = aButtonMargins;
+
+    StHandle<StBoolParam> aTrackedPano = new StBoolParam(false);
+    myBtnPanorama = new StGLCheckboxTextured(myPanelUpper, aTrackedPano,
+                                             iconTexture(stCString("actionPanoramaOff"), anIconSize),
+                                             iconTexture(stCString("actionPanorama"),    anIconSize),
+                                             aLeft + (aBtnIter++) * anIconStep, aTop,
+                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnPanorama->signals.onBtnClick += stSlot(this, &StImageViewerGUI::doPanoramaCombo);
+    myBtnPanorama->setDrawShadow(true);
+    myBtnPanorama->changeMargins() = aButtonMargins;
 }
 
 /**
@@ -278,7 +289,8 @@
     StGLMenu* aMenuView = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
     StGLMenu* aMenuDispMode  = createDisplayModeMenu();
     StGLMenu* aMenuDispRatio = createDisplayRatioMenu();
-    StGLMenu* aMenuSurface   = createSurfaceMenu();
+    StGLMenu* aMenuPanorama  = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
+    fillPanoramaMenu(aMenuPanorama);
     StGLMenu* aMenuTexFilter = createSmoothFilterMenu();
     StGLMenu* aMenuImgAdjust = createImageAdjustMenu();
 
@@ -292,7 +304,8 @@
     aMenuView->addItem(tr(MENU_VIEW_SWAP_LR),       myImage->params.swapLR);
     aMenuView->addItem(tr(MENU_VIEW_DISPLAY_RATIO), aMenuDispRatio)
              ->setIcon(stCMenuIcon("actionDisplayRatio"), false);
-    aMenuView->addItem(tr(MENU_VIEW_SURFACE),       aMenuSurface);
+    aMenuView->addItem(tr(MENU_VIEW_PANORAMA),      aMenuPanorama)
+             ->setIcon(stCMenuIcon("actionPanorama"), false);
     aMenuView->addItem(tr(MENU_VIEW_TEXFILTER),     aMenuTexFilter)
              ->setIcon(stCMenuIcon("actionInterpolation"), false);
     aMenuView->addItem(tr(MENU_VIEW_IMAGE_ADJUST),  aMenuImgAdjust)
@@ -331,22 +344,28 @@
          ->setIcon(stCMenuIcon("menuRatio5_4_"));
     aMenu->addItem("1:1",    myImage->params.displayRatio, StGLImageRegion::RATIO_1_1)
          ->setIcon(stCMenuIcon("menuRatio1_1_"));
-    aMenu->addItem(tr(MENU_VIEW_KEEP_ON_RESTART),   myPlugin->params.toRestoreRatio);
+    aMenu->addItem(tr(MENU_VIEW_RATIO_KEEP_ON_RESTART), myPlugin->params.toRestoreRatio);
+    aMenu->addItem(tr(MENU_VIEW_RATIO_HEAL_ANAMORPHIC), myImage->params.ToHealAnamorphicRatio);
     return aMenu;
 }
 
-/**
- * Root -> View menu -> Surface
- */
-StGLMenu* StImageViewerGUI::createSurfaceMenu() {
-    StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-    aMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
-                   myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
-    aMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
-                   myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
-    aMenu->addItem("Cubemap",
-                   myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
-    return aMenu;
+void StImageViewerGUI::fillPanoramaMenu(StGLMenu* theMenu) {
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
+                     myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
+                     myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_CUBEMAP),
+                     myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
+    if(myWindow->hasOrientationSensor()) {
+        theMenu->addItem(tr(myWindow->isPoorOrientationSensor() ? MENU_VIEW_TRACK_HEAD_POOR : MENU_VIEW_TRACK_HEAD),
+                         myPlugin->params.ToTrackHead);
+    }
+}
+
+void StImageViewerGUI::doPanoramaCombo(const size_t ) {
+    StGLCombobox::ListBuilder aBuilder(this);
+    fillPanoramaMenu(aBuilder.getMenu());
+    aBuilder.display();
 }
 
 /**
@@ -685,8 +704,7 @@
     aParams.add(myPlugin->params.IsMobileUI);
     myLangMap->params.language->setName(tr(MENU_HELP_LANGS));
 
-    const StString aTitle  = "Settings";
-    StInfoDialog*  aDialog = new StInfoDialog(myPlugin, this, aTitle, scale(512), scale(300));
+    StInfoDialog* aDialog = new StInfoDialog(myPlugin, this, tr(MENU_HELP_SETTINGS), scale(512), scale(300));
 
     const int aWidthMax  = aDialog->getContent()->getRectPx().width();
     int       aRowLast   = (int )aParams.size();
@@ -804,6 +822,12 @@
 
     int aBtnIter = 0;
 
+    myBtnOpen = new StGLTextureButton(myPanelUpper, (aBtnIter++) * anIconStep, 0);
+    myBtnOpen->signals.onBtnClick.connect(this, &StImageViewerGUI::doOpenFile);
+    myBtnOpen->setTexturePath(iconTexture(stCString("actionOpen"), anIconSize));
+    myBtnOpen->setDrawShadow(true);
+    myBtnOpen->changeMargins() = aButtonMargins;
+
     StGLTextureButton* aSrcBtn = new StGLTextureButton(myPanelUpper, (aBtnIter++) * anIconStep, 0,
                                                        StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB);
     aSrcBtn->changeMargins() = aButtonMargins;
@@ -816,7 +840,7 @@
         iconTexture(stCString("menuOverUnderRL"),    anIconSize),
         iconTexture(stCString("menuRowLR"),          anIconSize),
         iconTexture(stCString("menuColLR"),          anIconSize),
-        iconTexture(stCString("menuSrcSeparate"),    anIconSize),
+        iconTexture(stCString("menuDual"),           anIconSize),
         iconTexture(stCString("menuFrameSeqLR"),     anIconSize),
         iconTexture(stCString("menuRedCyanLR"),      anIconSize),
         iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
@@ -835,6 +859,16 @@
     myBtnSwapLR->setDrawShadow(true);
     myBtnSwapLR->changeMargins() = aButtonMargins;
 
+    StHandle<StBoolParam> aTrackedPano = new StBoolParam(false);
+    myBtnPanorama = new StGLCheckboxTextured(myPanelUpper, aTrackedPano,
+                                             iconTexture(stCString("actionPanoramaOff"), anIconSize),
+                                             iconTexture(stCString("actionPanorama"),    anIconSize),
+                                             (aBtnIter++) * anIconStep, 0,
+                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnPanorama->signals.onBtnClick += stSlot(this, &StImageViewerGUI::doPanoramaCombo);
+    myBtnPanorama->setDrawShadow(true);
+    myBtnPanorama->changeMargins() = aButtonMargins;
+
     aBtnIter = 0;
     StGLTextureButton* aBtnEx = new StGLTextureButton(myPanelUpper, (aBtnIter--) * (-anIconStep), 0,
                                                       StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
@@ -876,14 +910,6 @@
     myBtnInfo->changeMargins() = aButtonMargins;
 
     aBtnIter = 0;
-    StGLTextureButton* aBtnZoomOut = new StGLTextureButton(myPanelBottom, (aBtnIter++) * (-anIconStep), 0,
-                                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
-    aBtnZoomOut->changeMargins() = aButtonMargins;
-    aBtnZoomOut->setTexturePath(iconTexture(stCString("actionZoomOut"), anIconSize));
-    aBtnZoomOut->setDrawShadow(true);
-    aBtnZoomOut->setUserData(StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_ScaleOut);
-    aBtnZoomOut->signals.onBtnHold += stSlot(this, &StImageViewerGUI::doAction);
-
     StGLTextureButton* aBtnZoomIn = new StGLTextureButton(myPanelBottom, (aBtnIter++) * (-anIconStep), 0,
                                                           StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
     aBtnZoomIn->changeMargins() = aButtonMargins;
@@ -891,6 +917,35 @@
     aBtnZoomIn->setDrawShadow(true);
     aBtnZoomIn->setUserData(StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_ScaleIn);
     aBtnZoomIn->signals.onBtnHold += stSlot(this, &StImageViewerGUI::doAction);
+
+    StGLTextureButton* aBtnZoomOut = new StGLTextureButton(myPanelBottom, (aBtnIter++) * (-anIconStep), 0,
+        StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+    aBtnZoomOut->changeMargins() = aButtonMargins;
+    aBtnZoomOut->setTexturePath(iconTexture(stCString("actionZoomOut"), anIconSize));
+    aBtnZoomOut->setDrawShadow(true);
+    aBtnZoomOut->setUserData(StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_ScaleOut);
+    aBtnZoomOut->signals.onBtnHold += stSlot(this, &StImageViewerGUI::doAction);
+}
+
+void StImageViewerGUI::doOpenFile(const size_t ) {
+    /*if(!isMobile()) {
+        myPlugin->doOpen1FileDialog();
+        return;
+    }*/
+
+    StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
+    aDialog->setMimeList(myPlugin->myLoader->getMimeList());
+    aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Downloads));
+    aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Pictures));
+    aDialog->signals.onFileSelected = stSlot(myPlugin, &StImageViewer::doOpen1FileFromGui);
+
+    if(myPlugin->params.lastFolder.isEmpty()) {
+        StHandle<StFileNode> aCurrFile = myPlugin->myLoader->getPlayList().getCurrentFile();
+        if(!aCurrFile.isNull()) {
+            myPlugin->params.lastFolder = aCurrFile->isEmpty() ? aCurrFile->getFolderPath() : aCurrFile->getValue(0)->getFolderPath();
+        }
+    }
+    aDialog->openFolder(myPlugin->params.lastFolder);
 }
 
 void StImageViewerGUI::doShowMobileExMenu(const size_t ) {
@@ -917,7 +972,7 @@
     anItem->setIcon(stCMenuIcon("actionHelp"));
     anItem->signals.onItemClick += stSlot(this, &StImageViewerGUI::doAboutProgram);
     //anItem = aMenu->addItem(myPlugin->StApplication::params.ActiveDevice->getActiveValue());
-    anItem = aMenu->addItem("Settings");
+    anItem = aMenu->addItem(tr(MENU_HELP_SETTINGS));
     anItem->setIcon(stCMenuIcon("actionSettings"));
     anItem->signals.onItemClick += stSlot(this, &StImageViewerGUI::doMobileSettings);
     anItem = aMenu->addItem("Slideshow", myPlugin->getAction(StImageViewer::Action_SlideShow));
@@ -948,6 +1003,7 @@
   myBtnNext(NULL),
   myBtnInfo(NULL),
   myBtnSwapLR(NULL),
+  myBtnPanorama(NULL),
   myBtnSrcFrmt(NULL),
   myBtnPlayList(NULL),
   myBtnFull(NULL),
@@ -1000,7 +1056,7 @@
     inline bool isPointIn(const StGLWidget* theWidget,
                           const StPointD_t& theCursorZo) {
         return theWidget != NULL
-            && theWidget->isVisible()
+            && theWidget->isVisibleWithParents()
             && theWidget->isPointIn(theCursorZo);
     }
 
@@ -1033,7 +1089,9 @@
     const bool hasBottomPanel =  toShowToolbar
                              &&  myPanelBottom != NULL;
 
+    StHandle<StStereoParams> aParams = myImage->getSource();
     myIsVisibleGUI = isMouseActive
+        || aParams.isNull()
         || myVisibilityTimer.getElapsedTime() < 2.0
         || (hasUpperPanel  && myPanelUpper ->isPointIn(theCursor))
         || (hasBottomPanel && myPanelBottom->isPointIn(theCursor))
@@ -1064,10 +1122,10 @@
 
     StFormat aSrcFormat = (StFormat )myPlugin->params.srcFormat->getValue();
     if(aSrcFormat == StFormat_AUTO
-    && !myImage->params.stereoFile.isNull()) {
-        aSrcFormat = myImage->params.stereoFile->StereoFormat;
+    && !aParams.isNull()) {
+        aSrcFormat = aParams->StereoFormat;
     }
-    if(!myImage->params.stereoFile.isNull()
+    if(!aParams.isNull()
      && myImage->params.swapLR->getValue()) {
         aSrcFormat = st::formatReversed(aSrcFormat);
     }
@@ -1078,6 +1136,26 @@
         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;
+    if(!toShowPano
+    && !aParams.isNull()
+    &&  st::probePanorama(aParams->StereoFormat,
+                          aParams->Src1SizeX, aParams->Src1SizeY,
+                          aParams->Src2SizeX, aParams->Src2SizeY) != StPanorama_OFF) {
+        toShowPano = true;
+    }
+    if(myBtnPanorama != NULL) {
+        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StStereoParams::FLAT_IMAGE);
+        myBtnPanorama->setOpacity(toShowPano ? myPanelUpper->getOpacity() : 0.0f, false);
+    }
+    myWindow->setTrackOrientation(aViewMode != StStereoParams::FLAT_IMAGE
+                               && myPlugin->params.ToTrackHead->getValue());
+    StQuaternion<double> aQ = myWindow->getDeviceOrientation();
+    myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
+
     if(myDescr != NULL) {
         myDescr->setOpacity(1.0f, true);
         if(::isPointIn(myBtnOpen, theCursor)) {
@@ -1097,6 +1175,14 @@
             myDescr->setText(tr(FULLSCREEN));
         } else if(::isPointIn(myBtnSrcFrmt, theCursor)) {
             myDescr->setText(tr(BTN_SRC_FORMAT) + "\n" + trSrcFormat(aSrcFormat));
+        } 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;
+            }
+            myDescr->setText(tr(MENU_VIEW_PANORAMA) + "\n" + tr(aTrPano));
         } else {
             myDescr->setOpacity(0.0f, true);
         }
@@ -1159,7 +1245,8 @@
     if((theView == ST_DRAW_LEFT || theView == ST_DRAW_MONO)
     && myFpsWidget != NULL) {
         myFpsWidget->update(myPlugin->getMainWindow()->isStereoOutput(),
-                            myPlugin->getMainWindow()->getTargetFps());
+                            myPlugin->getMainWindow()->getTargetFps(),
+                            myPlugin->getMainWindow()->getStatistics());
     }
     StGLRootWidget::stglDraw(theView);
 }

sview-15_08.tar.gz/StImageViewer/StImageViewerGUI.h -> sview-15_10.tar.gz/StImageViewer/StImageViewerGUI.h Changed

@@ -27,6 +27,7 @@
 #include <StThreads/StCondition.h>
 
 // forward declarations
+class StGLCheckboxTextured;
 class StGLDescription;
 class StGLTextureButton;
 class StImageViewer;
@@ -145,7 +146,6 @@
     ST_LOCAL StGLMenu* createViewMenu();         // Root -> View menu
     ST_LOCAL StGLMenu* createDisplayModeMenu();  // Root -> View menu -> Output
     ST_LOCAL StGLMenu* createDisplayRatioMenu(); // Root -> View menu -> Display Ratio
-    ST_LOCAL StGLMenu* createSurfaceMenu();      // Root -> View   -> Surface
     ST_LOCAL StGLMenu* createSmoothFilterMenu(); // Root -> View menu -> Smooth Filter
     ST_LOCAL StGLMenu* createImageAdjustMenu();  // Root -> View menu -> Image Adjust
     ST_LOCAL StGLMenu* createOutputMenu();       // Root -> Output menu
@@ -155,6 +155,7 @@
     ST_LOCAL StGLMenu* createLanguageMenu();     // Root -> Help -> Language menu
 
     ST_LOCAL void fillSrcFormatMenu(StGLMenu* theMenu);
+    ST_LOCAL void fillPanoramaMenu (StGLMenu* theMenu);
 
         private: //! @name mobile interface creation routines
 
@@ -183,9 +184,11 @@
     ST_LOCAL void doResetHotKeys(const size_t );
     ST_LOCAL void doListHotKeys(const size_t );
 
+    ST_LOCAL void doOpenFile(const size_t );
     ST_LOCAL void doShowMobileExMenu(const size_t );
     ST_LOCAL void doMobileSettings(const size_t );
     ST_LOCAL void doDisplayStereoFormatCombo(const size_t );
+    ST_LOCAL void doPanoramaCombo(const size_t );
 
         private: //! @name private fields
 
@@ -208,6 +211,7 @@
     StGLTextureButton*  myBtnNext;
     StGLTextureButton*  myBtnInfo;
     StGLTextureButton*  myBtnSwapLR;
+    StGLCheckboxTextured* myBtnPanorama;
     StGLTextureButton*  myBtnSrcFrmt;
     StGLTextureButton*  myBtnPlayList;
     StGLTextureButton*  myBtnFull;

sview-15_08.tar.gz/StImageViewer/StImageViewerStrings.cpp -> sview-15_10.tar.gz/StImageViewer/StImageViewerStrings.cpp Changed

@@ -67,7 +67,7 @@
     theStrings(MENU_MEDIA_OPEN_IMAGE_2,
                "Left+Right files");
     theStrings(MENU_SRC_FORMAT_AUTO,
-               "Autodetection");
+               "Source");
     theStrings(MENU_SRC_FORMAT_MONO,
                "Mono");
     theStrings(MENU_SRC_FORMAT_CROSS_EYED,
@@ -110,14 +110,20 @@
                "Saturation");
     theStrings(MENU_VIEW_ADJUST_GAMMA,
                "Gamma");
-    theStrings(MENU_VIEW_SURFACE,
-               "Surface");
+    theStrings(MENU_VIEW_PANORAMA,
+               "Panorama");
     theStrings(MENU_VIEW_SURFACE_PLANE,
                "Plane");
     theStrings(MENU_VIEW_SURFACE_SPHERE,
                "Sphere");
     theStrings(MENU_VIEW_SURFACE_CYLINDER,
                "Cylinder");
+    theStrings(MENU_VIEW_SURFACE_CUBEMAP,
+               "Cubemap");
+    theStrings(MENU_VIEW_TRACK_HEAD,
+               "Track orientation");
+    theStrings(MENU_VIEW_TRACK_HEAD_POOR,
+               "Track orientation (poor)");
     theStrings(MENU_VIEW_DISPLAY_MODE_STEREO,
                "Stereo");
     theStrings(MENU_VIEW_DISPLAY_MODE_LEFT,
@@ -130,8 +136,10 @@
                "Cross-eyed pair");
     theStrings(MENU_VIEW_DISPLAY_RATIO_SRC,
                "Source");
-    theStrings(MENU_VIEW_KEEP_ON_RESTART,
+    theStrings(MENU_VIEW_RATIO_KEEP_ON_RESTART,
                "Keep on restart");
+    theStrings(MENU_VIEW_RATIO_HEAL_ANAMORPHIC,
+               "Heal anamorphic 1080p/720p");
     theStrings(MENU_VIEW_TEXFILTER_NEAREST,
                "Nearest");
     theStrings(MENU_VIEW_TEXFILTER_LINEAR,
@@ -190,6 +198,8 @@
                "Never"),
     theStrings(MENU_HELP_HOTKEYS,
                "Hotkeys");
+    theStrings(MENU_HELP_SETTINGS,
+               "Settings");
     theStrings(IMAGE_OPEN,
                "Open another image");
     theStrings(IMAGE_PREVIOUS,
@@ -380,7 +390,7 @@
               "Rotate clockwise");
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_ModeNext,
               "DoParamsModeNext",
-              "Select next mode");
+              "Select next view mode");
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_PanLeft,
               "DoParamsPanLeft",
               "Panning - navigate to the left");
@@ -411,6 +421,11 @@
     addAction(theStrings, StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_RotXDown,
               "DoParamsRotXDown",
               "X Rotation - down");
+
+    // new actions
+    addAction(theStrings, StImageViewer::Action_PanoramaOnOff,
+              "DoPanoramaOnOff",
+              "Enable/disable panorama mode");
 }
 
 };

sview-15_08.tar.gz/StImageViewer/StImageViewerStrings.h -> sview-15_10.tar.gz/StImageViewer/StImageViewerStrings.h Changed

@@ -70,7 +70,7 @@
         MENU_VIEW_DISPLAY_RATIO = 1205,
         MENU_VIEW_TEXFILTER     = 1206,
         MENU_VIEW_IMAGE_ADJUST  = 1207,
-        MENU_VIEW_SURFACE       = 1208,
+        MENU_VIEW_PANORAMA      = 1208,
 
         MENU_VIEW_DISPLAY_MODE_STEREO       = 1210,
         MENU_VIEW_DISPLAY_MODE_LEFT         = 1211,
@@ -78,8 +78,9 @@
         MENU_VIEW_DISPLAY_MODE_PARALLEL     = 1213,
         MENU_VIEW_DISPLAY_MODE_CROSSYED     = 1214,
 
-        MENU_VIEW_DISPLAY_RATIO_SRC = 1250,
-        MENU_VIEW_KEEP_ON_RESTART   = 1251,
+        MENU_VIEW_DISPLAY_RATIO_SRC     = 1250,
+        MENU_VIEW_RATIO_KEEP_ON_RESTART = 1251,
+        MENU_VIEW_RATIO_HEAL_ANAMORPHIC = 1252,
 
         MENU_VIEW_TEXFILTER_NEAREST = 1260,
         MENU_VIEW_TEXFILTER_LINEAR  = 1261,
@@ -92,6 +93,9 @@
         MENU_VIEW_SURFACE_PLANE     = 1280,
         MENU_VIEW_SURFACE_SPHERE    = 1281,
         MENU_VIEW_SURFACE_CYLINDER  = 1282,
+        MENU_VIEW_SURFACE_CUBEMAP   = 1283,
+        MENU_VIEW_TRACK_HEAD        = 1285,
+        MENU_VIEW_TRACK_HEAD_POOR   = 1286,
 
         // Root -> Output -> Change Device menu
         MENU_CHANGE_DEVICE  = 1400,
@@ -109,6 +113,7 @@
         MENU_HELP_SYSINFO = 1508,
         MENU_HELP_SCALE   = 1509,
         MENU_HELP_HOTKEYS = 1510,
+        MENU_HELP_SETTINGS= 1511,
 
         // Root -> Help -> Check for updates menu
         MENU_HELP_UPDATES_NOW   = 1520,

sview-15_08.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng Changed

sview-15_10.tar.gz/StImageViewer/lang/czech Added

sview-15_10.tar.gz/StImageViewer/lang/czech/StImageViewer.lng Added

@@ -0,0 +1,170 @@
+# Czech translation file for StImageViewer program
+# @author Kirill Gavrilov
+# @translator Marek Audy
+--------
+1000=Zpět
+1001=Další
+1002=Přehodit levá/pravá
+1003=Vypnout přehození levá/pravá
+1004=Vstupní stereoskopický formát:
+1015=Otevřít soubor
+1028=zobrazit/skrýt soubory
+1029=Okno/přes celou obrazovku
+1100=Soubor
+1101=Otevřít soubor
+1102=Uložit jako…
+1103=Vstupní stereoformát
+1104=Informace o souboru
+1109=Zavřít (ESC)
+1110=Jeden stereosoubor
+1111=Dva soubory levý/pravý zvlášť
+1130=Původní
+1131=Mono
+1132=Křížem vedle sebe
+1133=Paralel vedle sebe
+1134=Nad/pod P/L
+1135=Nad/pod L/P
+1136=Prokládaný
+1137=Anaglyf červená/modrá
+1138=Anaglyf purporová
+1139=Anaglyf žlutá
+1142=2 stream
+1200=Zobrazení
+1201=Výstupní formát
+1202=Celá obrazovka (Enter)
+1203=Vrátit
+1204=Přehodit levá/pravá
+1205=Poměr stran
+1206=Vyhlazení
+1207=Barevné korekce
+1208=Panorama
+1210=Stereo
+1211=Levá
+1212=Pravá
+1213=Paralel vedle sebe
+1214=Křížem vedle sebe
+1250=Původní
+1251=Neukládat nastavení
+?1252=Heal anamorphic 1080p/720p
+1260=Sousední
+1261=Lineární
+1270=Resetovat nastavení
+1271=Jas
+1272=Sytost
+1273=Gama
+1280=Plocha
+1281=Koule
+1282=Válec
+?1283=Cubemap
+?1285="Track orientation"
+?1286="Track orientation (poor)"
+1400=Zobrazovací zařizení
+1401=O modulu
+1402=Zobrazovat snímkování (fps)
+1403=Vertikální synchronizace
+1500=Nápověda
+1501=O aplikaci sView…
+1502=Aktualizace
+1503=Licenční ujednání
+1504=Language
+1506=Nápověda/klávesové zkratky
+1508=O systému
+1509=Vzhled
+?1510=Hotkeys
+?1511=Settings
+1520=Nyní
+1521=Denně
+1522=Týdně
+1523=Ročně
+1524=Nikdy
+1590=Menší
+1591=Normální
+1592=Velké
+1593=Extravelké HiDPI 2x
+2000=Otevřít
+2001=Otevřít LEVÝ
+2002=Otevřít PRAVÝ
+2003=Informace o souboru
+2004=Žadné informace
+2005=Vymazat soubor
+2006=Skutečně chcete hodit soubor do koše?
+2007=Ukládání metadat
+2008=Skutečně chcete vložit metadata do souboru?
+2009=Ukládání metadat je možné jen v souborech JPEG
+2010=Vyberte místo uložení
+2011=Nic není otevřeno!
+2012=Obraz není možné uložit!
+?2013=Assign new Hot Key for action\n<i>{0}</i>
+?2014=Conflicts with: <i>{0}</i>
+3000=sView - aplikace pro zobrazení stereovizualizace.
+3001=verze
+3002=Aplikace zobrazuje soubory JPEG, PNG, MPO.\n © {0} Гаврилов Кирилл <{1}>\nOficiální stránka: {2}\n\nAplikace je vytvořena na platformě GPL3.0{3}\nČeská lokalizace Marek Audy
+3003=Nové verze aplikace jsou dostupné na:www.sview.ru.\nProsím aktualizujte svoji aplikaci
+3004=Informace o systému
+4000=Zavřít
+4001=Zrušit
+4006=Uložit
+4007=Smazat
+?4008=Default
+?4009=Defaults
+?4010=Assign
+5000=[levý]
+5001=[pravý]
+5002=Jméno souboru
+5003=Rozlišení
+5004=Načítání
+5005=ms
+5006=Poměr stran pixelu
+5007=Barevný model
+5008=(metada nejsou v informaci obsažena)
+5009=(neobsahuje metadata)
+5011=(informace není obsažena v metadatech,\nale byla přidělena podle jména souboru)
+5100=JPEG komentář
+5101=JPS komentář
+5200=Výrobce kamery
+5201=Model kamery
+5202=Komentář uživatele
+5203=Datum snímku
+?6000=Switch fullscreen/windowed
+?6001=Show/hide FPS meter
+?6002=Stereo format - Auto
+?6003=Stereo format - Mono
+?6004=Stereo format - Over/Under
+?6005=Stereo format - Side by side
+?6006=Show file info
+?6007=Playlist - Go to the first item
+?6008=Playlist - Go to the last item
+?6009=Playlist - Go to the previous item
+?6010=Playlist - Go to the next item
+?6011=Playlist - Start/stop slideshow
+?6012=Save in PNG format
+?6013=Save in JPEG format
+?6014=Save file metadata
+?6015=Delete the file from file system
+?6016=Reset image adjustment
+?6017=Reset image position
+?6018=Swap Left/Right
+?6019=Gamma correction - decrease
+?6020=Gamma correction - increase
+?6021=DX separation - decrease
+?6022=DX separation - increase
+?6023=DY separation - decrease
+?6024=DY separation - increase
+?6025=Angular separation - decrease
+?6026=Angular separation - increase
+?6027=Rotate 90 degrees counterclockwise
+?6028=Rotate 90 degrees clockwise
+?6029=Rotate counterclockwise
+?6030=Rotate clockwise
+?6031=Select next view mode
+?6032=Panning - navigate to the left
+?6033=Panning - navigate to the right
+?6034=Panning - navigate to the top
+?6035=Panning - navigate to the bottom
+?6036=Scale - increment
+?6037=Scale - decrement
+?6038=Y Rotation - left
+?6039=Y Rotation - right
+?6040=X Rotation - up
+?6041=X Rotation - down
+?6042=Enable/disable panorama mode

sview-15_10.tar.gz/StImageViewer/lang/czech/language.lng Added

sview-15_08.tar.gz/StImageViewer/lang/english/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/english/StImageViewer.lng Changed

@@ -17,7 +17,7 @@
 1109="Quit"
 1110="From One file"
 1111="Left+Right files"
-1130="Autodetection"
+1130="Source"
 1131="Mono"
 1132="Cross-eyed"
 1133="Parallel Pair"
@@ -36,7 +36,7 @@
 1205="Display Ratio"
 1206="Smooth Filter"
 1207="Image Adjust"
-1208="Surface"
+1208="Panorama"
 1210="Stereo"
 1211="Left View"
 1212="Right View"
@@ -44,15 +44,19 @@
 1214="Cross-eyed"
 1250="Source"
 1251="Keep on restart"
+1252="Heal anamorphic 1080p/720p"
 1260="Nearest"
 1261="Linear"
 1270="Reset to defaults"
 1271="Brightness"
 1272="Saturation"
 1273="Gamma"
-1280="Plane"
+1280="Off"
 1281="Sphere"
 1282="Cylinder"
+1283="Cubemap"
+1285="Track orientation"
+1286="Track orientation (poor)"
 1400="Change device"
 1401="About Plugin..."
 1402="Show FPS"
@@ -66,6 +70,7 @@
 1508="About system"
 1509="Interface Scale"
 1510="Hotkeys"
+1511="Settings"
 1520="Now"
 1521="Each day"
 1522="Each week"
@@ -150,7 +155,7 @@
 6028="Rotate 90 degrees clockwise"
 6029="Rotate counterclockwise"
 6030="Rotate clockwise"
-6031="Enable/disable panorama mode"
+6031="Select next view mode"
 6032="Panning - navigate to the left"
 6033="Panning - navigate to the right"
 6034="Panning - navigate to the top"
@@ -161,3 +166,4 @@
 6039="Y Rotation - right"
 6040="X Rotation - up"
 6041="X Rotation - down"
+6042="Enable/disable panorama mode"

sview-15_08.tar.gz/StImageViewer/lang/french/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/french/StImageViewer.lng Changed

@@ -17,7 +17,7 @@
 1109="Quitter"
 1110="Depuis un fichier"
 1111="2 Fichiers Gauche+Droit"
-1130="Auto-détection"
+1130="Source"
 1131="Mono"
 1132="Cross-eyed"
 1133="Coté/Coté (SbS)"
@@ -36,7 +36,7 @@
 1205="Ratio d'affichage"
 1206="Lissage antialiasing"
 1207="Réglage de l'image"
-1208="Surface"
+1208="Panorama"
 1210="Stéréo"
 1211="Vue Gauche"
 1212="Vue Droite"
@@ -44,6 +44,7 @@
 1214="Cross-eyed"
 1250="Source"
 1251="Garder après redémarrage"
+?1252="Heal anamorphic 1080p/720p"
 1260="Plus proche"
 1261="Lineaire"
 1270="Rétablir par défaut"
@@ -53,6 +54,9 @@
 1280="Plan"
 1281="Sphère"
 1282="Cylindre"
+1283="Cubemap"
+?1285="Track orientation"
+?1286="Track orientation (poor)"
 1400="Changer la sortie"
 1401="A propos du Plugin..."
 1402="Voir I/S"
@@ -66,6 +70,7 @@
 ?1508="About system"
 ?1509="Scale Interface"
 1510="Raccourcis"
+1511="Paramètres"
 1520="Maintenant"
 1521="Chaque Jour"
 1522="Chaque Mois"
@@ -150,7 +155,7 @@
 6028="Faire pivoter un objet de 90 degrés vers la droite"
 6029="Sens inverse des aiguilles d’une montre"
 6030="Sens des aiguilles d’une montre"
-6031="Activer / désactiver le mode panorama"
+?6031="Select next view mode"
 6032="Naviguer vers la gauche"
 6033="Naviguer vers la droite"
 6034="Naviguer vers le haut"
@@ -161,3 +166,4 @@
 ?6039="Y Rotation - right"
 ?6040="X Rotation - up"
 ?6041="X Rotation - down"
+6042="Activer / désactiver le mode panorama"

sview-15_08.tar.gz/StImageViewer/lang/german/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/german/StImageViewer.lng Changed

@@ -17,7 +17,7 @@
 1109="Beenden"
 1110="Einer Datei"
 1111="Zwei Dateien"
-1130="Autoerkennung"
+1130="Quelle"
 1131="Mono"
 1132="Schielend"
 1133="Parallel Pair"
@@ -36,7 +36,7 @@
 1205="Seitenverhältnis"
 1206="Glatte Filter"
 1207="Bildeinstellung"
-1208="Oberfläche"
+1208="Panorama"
 1210="Stereo"
 1211="Linke Bild"
 1212="Rechte Bild"
@@ -44,15 +44,19 @@
 1214="Cross-eyed"
 1250="Quelle"
 1251="Halten beim Neustart"
+?1252="Heal anamorphic 1080p/720p"
 1260="Nearest"
 1261="Linear"
 1270="Auf Standardwerte zurücksetzen"
 1271="Helligkeit"
 1272="Sättigung"
 1273="Gamma"
-1280="Fläche"
+1280="Aus"
 1281="Kugel"
 1282="Zylinder"
+1283="Cubemap"
+?1285="Track orientation"
+?1286="Track orientation (poor)"
 1400="Gerät ändern"
 1401="Über Plugin..."
 1402="FPS anzeigen"
@@ -66,6 +70,7 @@
 1508="Über System"
 1509="Maßstab Benutzeroberfläche"
 1510="Hotkeys"
+1511="Einstellungen"
 1520="jetzt"
 1521="täglich"
 1522="wöchentlich"
@@ -150,7 +155,7 @@
 6028="Um 90 Grad im Uhrzeigersinn drehen"
 6029="Drehen gegen den Uhrzeigersinn"
 6030="Im Uhrzeigersinn drehen"
-6031="Aktivieren / Deaktivieren der Panorama-Modus"
+?6031="Select next view mode"
 6032="Navigieren nach links"
 6033="Navigieren nach rechts"
 6034="Navigieren nach oben"
@@ -161,3 +166,4 @@
 6039="Y-Drehung - rechts"
 6040="X-Drehung - nach oben"
 6041="X-Drehung - nach unten"
+6042="Aktivieren / Deaktivieren der Panorama-Modus"

sview-15_08.tar.gz/StImageViewer/lang/korean/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/korean/StImageViewer.lng Changed

@@ -37,7 +37,7 @@
 1205="화면 비율"
 ?1206="Smooth Filter"
 1207="이미지 보정"
-?1208="Surface"
+?1208="Panorama"
 ?1210="Stereo"
 ?1211="Left View"
 ?1212="Right View"
@@ -45,15 +45,19 @@
 1214="크로스-아이"
 ?1250="Source"
 1251="재시작시 유지"
+?1252="Heal anamorphic 1080p/720p"
 ?1260="Nearest"
 ?1261="Linear"
 1270="기본값으로 리셋"
 1271="밝기"
 ?1272="Saturation"
 1273="감마"
-?1280="Plane"
+?1280="Off"
 ?1281="Sphere"
 ?1282="Cylinder"
+?1283="Cubemap"
+?1285="Track orientation"
+?1286="Track orientation (poor)"
 1400="장치 변경"
 ?1401="About Plugin..."
 ?1402="Show FPS"
@@ -67,6 +71,7 @@
 ?1508="About system"
 ?1509="Interface Scale"
 ?1510="Hotkeys"
+?1511="Settings"
 1520="지금"
 1521="매일Each day"
 1522="매주Each week"
@@ -151,7 +156,7 @@
 ?6028="Rotate 90 degrees clockwise"
 ?6029="Rotate counterclockwise"
 ?6030="Rotate clockwise"
-?6031="Enable/disable panorama mode"
+?6031="Select next view mode"
 ?6032="Panning - navigate to the left"
 ?6033="Panning - navigate to the right"
 ?6034="Panning - navigate to the top"
@@ -162,3 +167,4 @@
 ?6039="Y Rotation - right"
 ?6040="X Rotation - up"
 ?6041="X Rotation - down"
+?6042="Enable/disable panorama mode"

sview-15_08.tar.gz/StImageViewer/lang/russian/StImageViewer.lng -> sview-15_10.tar.gz/StImageViewer/lang/russian/StImageViewer.lng Changed

@@ -17,7 +17,7 @@
 1109="Выход"
 1110="Из одного файла"
 1111="Левый+Правый файлы"
-1130="Автоопределение"
+1130="Исходный"
 1131="Моно"
 1132="Перекрёстная пара"
 1133="Параллельная пара"
@@ -44,6 +44,7 @@
 1214="Перекрёстная пара"
 1250="Исходное"
 1251="Запомнить"
+?1252="Heal anamorphic 1080p/720p"
 1260="Nearest"
 1261="Linear"
 1270="Сбросить настройки"
@@ -53,6 +54,9 @@
 1280="Плоскость"
 1281="Сфера"
 1282="Цилиндр"
+1283="Куб"
+1285="Отслеживать ориентацию"
+1286="Отслеживать ориентацию (poor)"
 1400="Выбрать устройство"
 1401="О модуле..."
 1402="Отображать FPS"
@@ -66,6 +70,7 @@
 1508="О системе"
 1509="Масштаб. интерфейса"
 1510="Горячие клавиши"
+1511="Настройки"
 1520="Сейчас"
 1521="Каждый день"
 1522="Каждую неделю"
@@ -150,7 +155,7 @@
 6028="Поворот на 90 градусов по часовой стрелке"
 6029="Поворот против часовой стрелки"
 6030="Поворот по часовой стрелке"
-6031="Включить/выключить панорамный режим"
+6031="Выбрать следующий режим"
 6032="Паннинг - движение налево"
 6033="Паннинг - движение направо"
 6034="Паннинг - движение наверх"
@@ -161,3 +166,4 @@
 6039="Y наклон - направо"
 6040="X наклон - наверх"
 6041="X наклон - вниз"
+6042="Включить/выключить панорамный режим"

sview-15_08.tar.gz/StMonitorsDump/StMonitorsDump.cbp -> sview-15_10.tar.gz/StMonitorsDump/StMonitorsDump.cbp Changed

sview-15_08.tar.gz/StMonitorsDump/main.cpp -> sview-15_10.tar.gz/StMonitorsDump/main.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StMonitorsDump program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -175,7 +175,12 @@
 
 };
 
-int main(int , char** ) { // force console output
+#if defined(__APPLE__)
+int stMonitorsDump_main() {
+#else
+int main(int , char** ) {
+#endif
+
 #ifdef _WIN32
     setlocale(LC_ALL, ".OCP"); // we set default locale for console output (useful only for debug)
 #endif
@@ -270,7 +275,9 @@
             }
             genInf(anInputEdid, anOutInfFilename + ".inf");
         }
+    #if !defined(__APPLE__)
         st::cout << stostream_text("Press any key to exit...") << st::SYS_PAUSE_EMPTY;
+    #endif
         return 0;
     }
 
@@ -331,7 +338,9 @@
         aFileOut.open(aFileName.toCString());
         if(aFileOut.fail()) {
             st::cout << st::COLOR_FOR_RED << stostream_text("Couldn't open file \"stMonitorsDump.htm\"!\n") << st::COLOR_FOR_WHITE;
+        #if !defined(__APPLE__)
             st::cout << stostream_text("Press any key to exit...") << st::SYS_PAUSE_EMPTY;
+        #endif
             return -1;
         }
     }
@@ -343,7 +352,9 @@
     st::cout << st::COLOR_FOR_GREEN << stostream_text("Dump stored to file \"stMonitorsDump.htm\"\n") << st::COLOR_FOR_WHITE;
 
     StProcess::openURL(aFileName);
+#if !defined(__APPLE__)
     st::cout << stostream_text("Press any key to exit...") << st::SYS_PAUSE_EMPTY;
+#endif
     if(isTmpFile) {
         StFileNode::removeFile(aFileName);
     }

sview-15_10.tar.gz/StMonitorsDump/main_1.mm Added

@@ -0,0 +1,135 @@
+/**
+ * Copyright © 2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * StMonitorsDump program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * StMonitorsDump program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(__APPLE__)
+
+#include <StThreads/StThread.h>
+
+#import <Cocoa/Cocoa.h>
+
+#include <StCore/StApplication.h>
+#include <StCocoa/StCocoaLocalPool.h>
+#include <StStrings/stConsole.h>
+#include <StThreads/StProcess.h>
+
+extern int stMonitorsDump_main();
+
+/**
+ * Main Cocoa application responder.
+ */
+@interface StTestResponder : NSObject <NSApplicationDelegate>
+    {
+    }
+
+    + (StTestResponder* ) sharedInstance;
+
+    /**
+     * Default constructor.
+     */
+    - (id ) init;
+
+    /**
+     * Dummy method for thread-safety Cocoa initialization.
+     */
+    + (void ) doDummyThread: (id ) theParam;
+
+@end
+
+namespace {
+
+    static StTestResponder* TheAppResponder = NULL;
+
+}
+
+@implementation StTestResponder
+
+        /// Singletone implementation.
+
+    - (id ) init {
+        if(TheAppResponder != NULL) {
+            if(self != TheAppResponder) {
+                // should never happens
+                [self release];
+            }
+            return TheAppResponder;
+        }
+
+        self = [super init];
+        if(self == NULL) {
+            return NULL;
+        }
+        return self;
+    }
+
+    + (StTestResponder* ) sharedInstance {
+        if(TheAppResponder == NULL) {
+            TheAppResponder = [[super allocWithZone: NULL] init];
+        }
+        return TheAppResponder;
+    }
+
+    + (id ) allocWithZone: (NSZone* ) theZone { return [[self sharedInstance] retain]; }
+    - (id ) copyWithZone: (NSZone* ) theZone { return self; }
+    - (id ) retain { return self; }
+    - (NSUInteger ) retainCount { return NSUIntegerMax; } //denotes an object that cannot be released
+    - (oneway void ) release {}
+    - (id ) autorelease { return self; }
+
+        /// application logic
+
+    - (BOOL ) application: (NSApplication* ) theApplication
+                 openFile: (NSString* ) theFilename {
+        return YES;
+    }
+
+    - (void ) applicationDidFinishLaunching: (NSNotification* ) theNotification {
+        int aResult = stMonitorsDump_main();
+        exit(aResult);
+    }
+
+    - (void ) applicationWillTerminate: (NSNotification* ) theNotification {}
+    + (void ) doDummyThread: (id ) theParam {}
+
+@end
+
+int main(int , char** ) {
+    StCocoaLocalPool aPool;
+
+    // dummy NSThread to ensure Cocoa thread-safety
+    [NSThread detachNewThreadSelector: @selector(doDummyThread: )
+                             toTarget: [StTestResponder class]
+                           withObject: NULL];
+
+    NSApplication* anAppNs = [NSApplication sharedApplication];
+    StTestResponder* anAppResp = [StTestResponder sharedInstance];
+    [anAppNs setDelegate: anAppResp];
+
+    // dummy hidden window for as workaround
+    NSWindow* aWin = [NSWindow alloc];
+    [aWin initWithContentRect: NSMakeRect(16, 16, 16, 16)
+                    styleMask: NSBorderlessWindowMask
+                      backing: NSBackingStoreBuffered
+                        defer: NO];
+    [aWin release];
+
+    [anAppNs activateIgnoringOtherApps: YES];
+    [anAppNs run];
+    return 0;
+}
+
+#endif // __APPLE__

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayer.cpp -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.cpp Changed

@@ -21,6 +21,7 @@
 #include "StMoviePlayerGUI.h"
 #include "StMoviePlayerStrings.h"
 #include "StVideo/StVideo.h"
+#include "StSeekBar.h"
 #include "StTimeBox.h"
 
 #include <StImage/StImageFile.h>
@@ -63,6 +64,7 @@
     static const char ST_SETTING_OPENAL_DEVICE[] = "alDevice";
     static const char ST_SETTING_RECENT_FILES[]  = "recent";
     static const char ST_SETTING_SHOW_LIST[]     = "showPlaylist";
+    static const char ST_SETTING_TRACK_HEAD[]    = "toTrackHead";
     static const char ST_SETTING_SHOW_FPS[]      = "toShowFps";
     static const char ST_SETTING_MOBILE_UI[]     = "isMobileUI";
     static const char ST_SETTING_LIMIT_FPS[]     = "toLimitFps";
@@ -71,6 +73,9 @@
 
     static const char ST_SETTING_SCALE_ADJUST[]  = "scaleAdjust";
     static const char ST_SETTING_SCALE_FORCE2X[] = "scale2X";
+    static const char ST_SETTING_SUBTITLES_PLACE[]="subsPlace";
+    static const char ST_SETTING_SUBTITLES_TOPDY[]="subsTopDY";
+    static const char ST_SETTING_SUBTITLES_BOTTOMDY[]="subsBottomDY";
     static const char ST_SETTING_SUBTITLES_SIZE[]= "subsSize";
     static const char ST_SETTING_SUBTITLES_PARALLAX[] = "subsParallax";
     static const char ST_SETTING_SUBTITLES_PARSER[] = "subsParser";
@@ -84,6 +89,7 @@
     static const char ST_SETTING_LOOP_SINGLE[]   = "loopSingle";
     static const char ST_SETTING_GLOBAL_MKEYS[]  = "globalMediaKeys";
     static const char ST_SETTING_RATIO[]         = "ratio";
+    static const char ST_SETTING_HEAL_ANAMORPHIC[] = "toHealAnamorphic";
     static const char ST_SETTING_UPDATES_LAST_CHECK[] = "updatesLastCheck";
     static const char ST_SETTING_UPDATES_INTERVAL[]   = "updatesInterval";
     static const char ST_SETTING_SAVE_IMG_TYPE[] = "snapImgType";
@@ -271,6 +277,25 @@
      */
     ST_LOCAL const StString& getPathSubtitles() const { return myPathSubs; }
 
+    /**
+     * Set paths to open.
+     */
+    ST_LOCAL void setPaths(const StString& thePathLeft,
+                           const StString& thePathRight) {
+        StMutexAuto aLock(myMutex);
+        if(myState != StOpenVideo::Dialog_Inactive) {
+            return;
+        }
+
+        myPathVideoL = thePathLeft;
+        myPathVideoR = thePathRight;
+        myPathAudio.clear();
+        myPathSubs .clear();
+        if(!myPathVideoL.isEmpty()) {
+            myState = StOpenVideo::Dialog_HasFiles;
+        }
+    }
+
         private:
 
     /**
@@ -368,6 +393,11 @@
     // update menu
 }
 
+void StMoviePlayer::doPause(const StPauseEvent& theEvent) {
+    StApplication::doPause(theEvent);
+    saveAllParams();
+}
+
 StMoviePlayer::StMoviePlayer(const StHandle<StResourceManager>& theResMgr,
                              const StNativeWin_t                theParentWin,
                              const StHandle<StOpenInfo>&        theOpenInfo)
@@ -384,7 +414,8 @@
   myToRecreateMenu(false),
   myToUpdateALList(false),
   myIsBenchmark(false),
-  myToCheckUpdates(true) {
+  myToCheckUpdates(true),
+  myToCheckPoorOrient(true) {
     mySettings = new StSettings(myResMgr, ST_DRAWER_PLUGIN_NAME);
     myLangMap  = new StTranslations(myResMgr, StMoviePlayer::ST_DRAWER_PLUGIN_NAME);
     myOpenDialog = new StOpenVideo(this);
@@ -402,6 +433,17 @@
     params.ScaleHiDPI2X     = new StBoolParam(false);
     mySettings->loadParam (ST_SETTING_SCALE_FORCE2X, params.ScaleHiDPI2X);
     params.ScaleHiDPI2X->signals.onChanged = stSlot(this, &StMoviePlayer::doScaleHiDPI);
+    params.SubtitlesPlace   = new StInt32Param(ST_VCORNER_BOTTOM);
+    params.SubtitlesTopDY   = new StFloat32Param(100.0f,      // initial value
+                                                 0.0f, 400.0f,// min, max values
+                                                 100.0f,      // default value
+                                                 5.0f,        // incremental step
+                                                 0.1f);       // equality tolerance
+    params.SubtitlesBottomDY= new StFloat32Param(100.0f,      // initial value
+                                                 0.0f, 400.0f,// min, max values
+                                                 100.0f,      // default value
+                                                 5.0f,        // incremental step
+                                                 0.1f);       // equality tolerance
     params.SubtitlesSize    = new StFloat32Param(28.0f,       // initial value
                                                  8.0f, 96.0f, // min, max values
                                                  28.0f,       // default value
@@ -441,6 +483,7 @@
     params.srcFormat->signals.onChanged = stSlot(this, &StMoviePlayer::doSwitchSrcFormat);
     params.ToShowPlayList   = new StBoolParam(false);
     params.ToShowPlayList->signals.onChanged = stSlot(this, &StMoviePlayer::doShowPlayList);
+    params.ToTrackHead = new StBoolParamNamed(true,  tr(MENU_VIEW_TRACK_HEAD));
     params.ToShowFps   = new StBoolParamNamed(false, tr(MENU_FPS_METER));
     params.IsMobileUI  = new StBoolParamNamed(StWindow::isMobile(), "Mobile UI");
     params.IsMobileUI->signals.onChanged = stSlot(this, &StMoviePlayer::doScaleHiDPI);
@@ -473,11 +516,15 @@
     mySettings->loadParam (ST_SETTING_LOOP_SINGLE,        params.ToLoopSingle);
     mySettings->loadParam (ST_SETTING_GLOBAL_MKEYS,       params.areGlobalMKeys);
     mySettings->loadParam (ST_SETTING_SHOW_LIST,          params.ToShowPlayList);
+    mySettings->loadParam (ST_SETTING_SUBTITLES_PLACE,    params.SubtitlesPlace);
+    mySettings->loadParam (ST_SETTING_SUBTITLES_TOPDY,    params.SubtitlesTopDY);
+    mySettings->loadParam (ST_SETTING_SUBTITLES_BOTTOMDY, params.SubtitlesBottomDY);
     mySettings->loadParam (ST_SETTING_SUBTITLES_SIZE,     params.SubtitlesSize);
     mySettings->loadParam (ST_SETTING_SUBTITLES_PARALLAX, params.SubtitlesParallax);
     mySettings->loadParam (ST_SETTING_SUBTITLES_PARSER,   params.SubtitlesParser);
     mySettings->loadParam (ST_SETTING_SEARCH_SUBS,        params.ToSearchSubs);
 
+    myToCheckPoorOrient = !mySettings->loadParam(ST_SETTING_TRACK_HEAD, params.ToTrackHead);
     mySettings->loadParam (ST_SETTING_SHOW_FPS,           params.ToShowFps);
     mySettings->loadParam (ST_SETTING_MOBILE_UI,          params.IsMobileUI);
     mySettings->loadParam (ST_SETTING_VSYNC,              params.IsVSyncOn);
@@ -639,6 +686,9 @@
 
     anAction = new StActionIntSlot(stCString("DoImageAdjustReset"), stSlot(this, &StMoviePlayer::doImageAdjustReset), 0);
     addAction(Action_ImageAdjustReset, anAction);
+
+    anAction = new StActionIntSlot(stCString("DoPanoramaOnOff"), stSlot(this, &StMoviePlayer::doPanoramaOnOff), 0);
+    addAction(Action_PanoramaOnOff, anAction, ST_VK_P);
 }
 
 bool StMoviePlayer::resetDevice() {
@@ -663,6 +713,7 @@
 
     mySettings->saveParam (ST_SETTING_STEREO_MODE, myGUI->myImage->params.displayMode);
     mySettings->saveInt32 (ST_SETTING_GAMMA,       stRound(100.0f * myGUI->myImage->params.gamma->getValue()));
+    mySettings->saveParam (ST_SETTING_HEAL_ANAMORPHIC, myGUI->myImage->params.ToHealAnamorphicRatio);
     if(params.toRestoreRatio->getValue()) {
         mySettings->saveParam(ST_SETTING_RATIO,    myGUI->myImage->params.displayRatio);
     } else {
@@ -671,11 +722,14 @@
     mySettings->saveParam (ST_SETTING_TEXFILTER,   myGUI->myImage->params.textureFilter);
 }
 
-void StMoviePlayer::releaseDevice() {
+void StMoviePlayer::saveAllParams() {
     saveGuiParams();
     if(!myGUI.isNull()) {
         mySettings->saveParam (ST_SETTING_SCALE_ADJUST,       params.ScaleAdjust);
         mySettings->saveParam (ST_SETTING_SCALE_FORCE2X,      params.ScaleHiDPI2X);
+        mySettings->saveParam (ST_SETTING_SUBTITLES_PLACE,    params.SubtitlesPlace);
+        mySettings->saveParam (ST_SETTING_SUBTITLES_TOPDY,    params.SubtitlesTopDY);
+        mySettings->saveParam (ST_SETTING_SUBTITLES_BOTTOMDY, params.SubtitlesBottomDY);
         mySettings->saveParam (ST_SETTING_SUBTITLES_SIZE,     params.SubtitlesSize);
         mySettings->saveParam (ST_SETTING_SUBTITLES_PARALLAX, params.SubtitlesParallax);
         mySettings->saveParam (ST_SETTING_SUBTITLES_PARSER,   params.SubtitlesParser);
@@ -690,6 +744,7 @@
         mySettings->saveParam (ST_SETTING_GLOBAL_MKEYS,       params.areGlobalMKeys);
         mySettings->saveParam (ST_SETTING_SHOW_LIST,          params.ToShowPlayList);
 
+        mySettings->saveParam (ST_SETTING_TRACK_HEAD,         params.ToTrackHead);
         mySettings->saveParam (ST_SETTING_SHOW_FPS,           params.ToShowFps);
         mySettings->saveParam (ST_SETTING_MOBILE_UI,          params.IsMobileUI);
         mySettings->saveParam (ST_SETTING_VSYNC,              params.IsVSyncOn);
@@ -708,6 +763,13 @@
             mySettings->saveHotKey(anIter->second);
         }
     }
+    myPlayList->currentToRecent();
+    mySettings->saveString(ST_SETTING_RECENT_FILES, myPlayList->dumpRecentList());
+    mySettings->flush();
+}
+
+void StMoviePlayer::releaseDevice() {
+    saveAllParams();
 
     // release GUI data and GL resources before closing the window
     myKeyActions.clear();
@@ -722,8 +784,6 @@
     releaseDevice();
     // wait video playback thread to quit and release resources
     myVideo.nullify();
-
-    mySettings->saveString(ST_SETTING_RECENT_FILES, myPlayList->dumpRecentList());
 }
 
 bool StMoviePlayer::createGui(StHandle<StGLTextureQueue>& theTextureQueue,
@@ -750,6 +810,7 @@
     mySettings->loadParam (ST_SETTING_STEREO_MODE, myGUI->myImage->params.displayMode);
     mySettings->loadParam (ST_SETTING_TEXFILTER,   myGUI->myImage->params.textureFilter);
     mySettings->loadParam (ST_SETTING_RATIO,       myGUI->myImage->params.displayRatio);
+    mySettings->loadParam (ST_SETTING_HEAL_ANAMORPHIC, myGUI->myImage->params.ToHealAnamorphicRatio);
     params.toRestoreRatio->setValue(myGUI->myImage->params.displayRatio->getValue() != StGLImageRegion::RATIO_AUTO);
     int32_t loadedGamma = 100; // 1.0f
         mySettings->loadInt32(ST_SETTING_GAMMA, loadedGamma);
@@ -980,6 +1041,13 @@
         return false;
     }
 
+    // disable head-tracking by default for poor sensors
+    if(myToCheckPoorOrient
+    && myWindow->isPoorOrientationSensor()) {
+        myToCheckPoorOrient = false;
+        params.ToTrackHead->setValue(false);
+    }
+
     if(isReset) {
         //myVideo->doLoadNext();
         doUpdateStateLoaded();
@@ -1272,6 +1340,23 @@
         return;
     }
 
+    if(myVideo->isDisconnected() || myToUpdateALList) {
+        const StString aPrevDev = params.alDevice->getTitle();
+        params.alDevice->initList();
+        myGUI->updateOpenALDeviceMenu();
+        // switch audio device
+        if(!params.alDevice->init(aPrevDev)) {
+            // select first existing device if any
+            params.alDevice->init(params.alDevice->getTitle());
+        }
+        myVideo->switchAudioDevice(params.alDevice->getTitle());
+        myToUpdateALList = false;
+    }
+    if(myPlayList->isRecentChanged()) {
+        myGUI->updateRecentMenu();
+    }
+
+    // fetch Open File operation results
     if(myOpenDialog->hasResults()) {
         StHandle<StFileNode> aCurrFile = myPlayList->getCurrentFile();
         StString aFilePath;
@@ -1309,17 +1394,13 @@
         myOpenDialog->resetResults();
     }
 
+    // re-create GUI when necessary
+    const bool hasVideoStream = myVideo->hasVideoStream();
     if(params.ScaleHiDPI->setValue(myWindow->getScaleFactor())
     || myToRecreateMenu) {
         StHandle<StGLTextureQueue> aTextureQueue;
         StHandle<StSubQueue>       aSubQueue;
         createGui(aTextureQueue, aSubQueue);
-
-        myGUI->updateAudioStreamsMenu(myVideo->params.activeAudio->getList(),
-                                      myVideo->hasVideoStream());
-        myGUI->updateSubtitlesStreamsMenu(myVideo->params.activeSubtitles->getList(),
-                                          myVideo->hasAudioStream() || myVideo->hasVideoStream());
-
         myToRecreateMenu = false;
     }
 
@@ -1354,7 +1435,71 @@
         }
         myToCheckUpdates = false;
     }
-    myGUI->setVisibility(myWindow->getMousePos(), isMouseMove);
+
+    double aDuration = 0.0;
+    double aPts      = 0.0;
+    bool isVideoPlayed = false, isAudioPlayed = false;
+    const bool   isPlaying = myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
+    const double aPosition = (aDuration > 0.0) ? (aPts / aDuration) : 0.0;
+    if(myGUI->myBtnPlay != NULL) {
+        myGUI->myBtnPlay->setFaceId(isPlaying ? 1 : 0); // set play/pause
+    }
+    if(myGUI->myTimeBox != NULL) {
+        myGUI->myTimeBox->stglUpdateTime(aPts, aDuration);
+    }
+    if(myGUI->mySubtitles != NULL) {
+        myGUI->mySubtitles->setPTS(aPts);
+    }
+    if(myGUI->mySeekBar != NULL) {
+        myGUI->mySeekBar->setProgress(GLfloat(aPosition));
+    }
+    myGUI->stglUpdate(myWindow->getMousePos(), isMouseMove || !hasVideoStream);
+
+    // prevent display going to sleep
+    bool toBlockSleepDisplay = false;
+    bool toBlockSleepSystem  = false;
+    if(myIsBenchmark) {
+        toBlockSleepDisplay = true;
+        toBlockSleepSystem  = true;
+    } else {
+        switch(params.blockSleeping->getValue()) {
+            case BLOCK_SLEEP_NEVER: {
+                toBlockSleepDisplay = false;
+                toBlockSleepSystem  = false;
+                break;
+            }
+            case BLOCK_SLEEP_ALWAYS: {
+                toBlockSleepDisplay = true;
+                toBlockSleepSystem  = true;
+                break;
+            }
+            case BLOCK_SLEEP_PLAYBACK: {
+                toBlockSleepDisplay = isVideoPlayed;
+                toBlockSleepSystem  = isPlaying;
+                break;
+            }
+            case BLOCK_SLEEP_FULLSCREEN: {
+                toBlockSleepDisplay = myWindow->isFullScreen();;
+                toBlockSleepSystem  = toBlockSleepDisplay;
+                break;
+            }
+        }
+    }
+
+    const StWinAttr anAttribs[] = {
+        StWinAttr_ToBlockSleepSystem,  (StWinAttr )toBlockSleepSystem,
+        StWinAttr_ToBlockSleepDisplay, (StWinAttr )toBlockSleepDisplay,
+        StWinAttr_NULL
+    };
+    myWindow->setAttributes(anAttribs);
+    myWindow->showCursor(!myGUI->toHideCursor());
+
+    // check for mono state
+    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
+    if(!aParams.isNull()) {
+        myWindow->setStereoOutput(!aParams->isMono()
+                            && (myGUI->myImage->params.displayMode->getValue() == StGLImageRegion::MODE_STEREO));
+    }
 }
 
 void StMoviePlayer::doUpdateOpenALDeviceList(const size_t ) {
@@ -1368,8 +1513,30 @@
          && myGUI->myImage != NULL) {
             myGUI->myImage->stglSkipFrames();
         }
+
+        if(theView == ST_DRAW_LEFT
+        || theView == ST_DRAW_MONO) {
+            if(myWindow->isPaused()) {
+                double aDuration = 0.0;
+                double aPts      = 0.0;
+                bool isVideoPlayed = false, isAudioPlayed = false;
+                const bool isPlaying = !myVideo.isNull()
+                                     && myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
+                if(!myInactivityTimer.isOn()) {
+                    myInactivityTimer.restart();
+                } else if(myInactivityTimer.getElapsedTimeInSec() > 60.0
+                      && !isPlaying) {
+                    // perform delayed destruction on long inactivity
+                    exit(0);
+                } else if(!isVideoPlayed) {
+                    // force deep sleeps
+                    StThread::sleep(100);
+                }
+            }
+        }
         return;
     }
+    myInactivityTimer.stop();
 
     if(myContext->core20fwd != NULL) {
         // clear the screen and the depth buffer
@@ -1380,87 +1547,7 @@
         return;
     }
 
-    if(myVideo->isDisconnected() || myToUpdateALList) {
-        const StString aPrevDev = params.alDevice->getTitle();
-        params.alDevice->initList();
-        myGUI->updateOpenALDeviceMenu();
-        // switch audio device
-        if(!params.alDevice->init(aPrevDev)) {
-            // select first existing device if any
-            params.alDevice->init(params.alDevice->getTitle());
-        }
-        myVideo->switchAudioDevice(params.alDevice->getTitle());
-        myToUpdateALList = false;
-    }
-    if(myPlayList->isRecentChanged()) {
-        myGUI->updateRecentMenu();
-    }
-
     myGUI->getCamera()->setView(theView);
-    if(theView == ST_DRAW_LEFT
-    || theView == ST_DRAW_MONO) {
-        double aDuration = 0.0;
-        double aPts      = 0.0;
-        bool isVideoPlayed = false, isAudioPlayed = false;
-        bool isPlaying = myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
-        double aPosition = (aDuration > 0.0) ? (aPts / aDuration) : 0.0;
-        if(myGUI->myBtnPlay != NULL) {
-            myGUI->myBtnPlay->setFaceId(isPlaying ? 1 : 0); // set play/pause
-        }
-        if(myGUI->myTimeBox != NULL) {
-            myGUI->myTimeBox->setTime(aPts, aDuration);
-        }
-        myGUI->stglUpdate(myWindow->getMousePos(), GLfloat(aPosition), aPts);
-
-        // prevent display going to sleep
-        bool toBlockSleepDisplay = false;
-        bool toBlockSleepSystem  = false;
-        if(myIsBenchmark) {
-            toBlockSleepDisplay = true;
-            toBlockSleepSystem  = true;
-        } else {
-            switch(params.blockSleeping->getValue()) {
-                case BLOCK_SLEEP_NEVER: {
-                    toBlockSleepDisplay = false;
-                    toBlockSleepSystem  = false;
-                    break;
-                }
-                case BLOCK_SLEEP_ALWAYS: {
-                    toBlockSleepDisplay = true;
-                    toBlockSleepSystem  = true;
-                    break;
-                }
-                case BLOCK_SLEEP_PLAYBACK: {
-                    toBlockSleepDisplay = isVideoPlayed;
-                    toBlockSleepSystem  = isPlaying;
-                    break;
-                }
-                case BLOCK_SLEEP_FULLSCREEN: {
-                    toBlockSleepDisplay = myWindow->isFullScreen();;
-                    toBlockSleepSystem  = toBlockSleepDisplay;
-                    break;
-                }
-            }
-        }
-
-        const StWinAttr anAttribs[] = {
-            StWinAttr_ToBlockSleepSystem,  (StWinAttr )toBlockSleepSystem,
-            StWinAttr_ToBlockSleepDisplay, (StWinAttr )toBlockSleepDisplay,
-            StWinAttr_NULL
-        };
-        myWindow->setAttributes(anAttribs);
-
-        myWindow->showCursor(!myGUI->toHideCursor());
-
-        // check for mono state
-        StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-        if(!aParams.isNull()) {
-            myWindow->setStereoOutput(!aParams->isMono()
-                                && (myGUI->myImage->params.displayMode->getValue() == StGLImageRegion::MODE_STEREO));
-        }
-    }
-
-    // draw GUI
     myGUI->stglDraw(theView);
 }
 
@@ -1541,11 +1628,7 @@
     } else {
         myWindow->setTitle(aFileToLoad + " - sView");
     }
-    myGUI->updateAudioStreamsMenu(myVideo->params.activeAudio->getList(),
-                                  myVideo->hasVideoStream());
-    params.audioStream->setValue(myVideo->params.activeAudio->getValue());
-    myGUI->updateSubtitlesStreamsMenu(myVideo->params.activeSubtitles->getList(),
-                                      myVideo->hasAudioStream() || myVideo->hasVideoStream());
+    params.audioStream    ->setValue(myVideo->params.activeAudio->getValue());
     params.subtitlesStream->setValue(myVideo->params.activeSubtitles->getValue());
     if(mySeekOnLoad > 0.0) {
         myVideo->pushPlayEvent(ST_PLAYEVENT_SEEK, mySeekOnLoad);
@@ -1569,6 +1652,32 @@
     }
 }
 
+void StMoviePlayer::doPanoramaOnOff(const size_t ) {
+    if(myVideo.isNull()) {
+        return;
+    }
+
+    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
+    if(aParams.isNull()
+    || aParams->Src1SizeX == 0
+    || aParams->Src1SizeY == 0) {
+        return;
+    }
+
+    int aMode = myGUI->myImage->params.ViewMode->getValue();
+    if(aMode != StStereoParams::FLAT_IMAGE) {
+        myGUI->myImage->params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+        return;
+    }
+
+    StPanorama aPano = st::probePanorama(aParams->StereoFormat,
+                                         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);
+}
+
 void StMoviePlayer::doSwitchSrcFormat(const int32_t theSrcFormat) {
     myVideo->setStereoFormat(StFormat(theSrcFormat));
 }
@@ -1630,6 +1739,10 @@
     StApplication::exit(0);
 }
 
+void StMoviePlayer::doOpen1FileFromGui(StHandle<StString> thePath) {
+    myOpenDialog->setPaths(*thePath, "");
+}
+
 void StMoviePlayer::doOpen1File(const size_t ) {
     myOpenDialog->openDialog(StOpenVideo::Dialog_SingleMovie);
 }

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayer.h -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2007-2015 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
@@ -164,6 +164,7 @@
     ST_LOCAL void doQuit(const size_t dummy = 0);
 
     ST_LOCAL void doFileNext();
+    ST_LOCAL void doOpen1FileFromGui(StHandle<StString> thePath);
     ST_LOCAL void doOpen1File(const size_t dummy = 0);
     ST_LOCAL void doOpen2Files(const size_t dummy = 0);
     ST_LOCAL void doSaveFileInfo(const size_t theToSave);
@@ -195,6 +196,9 @@
         StHandle<StInt32Param>    ScaleAdjust;      //!< adjust GUI size, see StGLRootWidget::ScaleAdjust
         StHandle<StFloat32Param>  ScaleHiDPI;       //!< adapt  GUI size for HiDPI resolution
         StHandle<StBoolParam>     ScaleHiDPI2X;     //!< option to set HiDPI resolution to 2.0
+        StHandle<StInt32Param>    SubtitlesPlace;   //!< subtitles placement
+        StHandle<StFloat32Param>  SubtitlesTopDY;   //!< subtitles vertical displacement
+        StHandle<StFloat32Param>  SubtitlesBottomDY;//!< subtitles vertical displacement
         StHandle<StFloat32Param>  SubtitlesSize;    //!< subtitles font size
         StHandle<StFloat32Param>  SubtitlesParallax;//!< subtitles parallax
         StHandle<StBoolParam>     ToSearchSubs;     //!< automatically search for additional subtitles/audio track files nearby video file
@@ -210,6 +214,7 @@
         StHandle<StBoolParam>     areGlobalMKeys;   //!< capture global multimedia keys
         StHandle<StInt32Param>    checkUpdatesDays; //!< days count between updates checks
         StHandle<StInt32Param>    srcFormat;        //!< source format
+        StHandle<StBoolParam>     ToTrackHead;      //!< enable/disable head-tracking
         StHandle<StBoolParam>     ToShowPlayList;   //!< display playlist
         StHandle<StBoolParam>     ToShowFps;        //!< display FPS meter
         StHandle<StBoolParam>     IsMobileUI;       //!< display mobile interface
@@ -232,6 +237,7 @@
         private: //! @name window events slots
 
     ST_LOCAL virtual void doChangeDevice(const int32_t theValue);
+    ST_LOCAL virtual void doPause    (const StPauseEvent&  theEvent);
     ST_LOCAL virtual void doResize   (const StSizeEvent&   theEvent);
     ST_LOCAL virtual void doKeyDown  (const StKeyEvent&    theEvent);
     ST_LOCAL virtual void doKeyHold  (const StKeyEvent&    theEvent);
@@ -248,6 +254,7 @@
      */
     ST_LOCAL bool init();
     ST_LOCAL void saveGuiParams();
+    ST_LOCAL void saveAllParams();
     ST_LOCAL bool createGui(StHandle<StGLTextureQueue>& theTextureQueue,
                             StHandle<StSubQueue>&       theSubQueue);
 
@@ -287,6 +294,7 @@
     ST_LOCAL void doSwitchLoopSingle(const bool theValue);
     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 doSwitchAudioStream(const int32_t theStreamId);
     ST_LOCAL void doSwitchSubtitlesStream(const int32_t theStreamId);
     ST_LOCAL void doShowPlayList(const bool theToShow);
@@ -333,7 +341,8 @@
         Action_ShowList,
         Action_ImageAdjustReset,
         Action_StereoParamsBegin,
-        Action_StereoParamsEnd = Action_StereoParamsBegin + StGLImageRegion::ActionsNb,
+        Action_StereoParamsEnd = Action_StereoParamsBegin + StGLImageRegion::ActionsNb - 1,
+        Action_PanoramaOnOff,
     };
 
         private: //! @name Web UI methods
@@ -361,6 +370,7 @@
     StHandle<StOpenVideo>      myOpenDialog;      //!< file open dialog
 
     StCondition                myEventLoaded;     //!< indicate that new file was open
+    StTimer                    myInactivityTimer; //!< timer initialized when application goes into paused state
     double                     mySeekOnLoad;      //!< seeking target
     int32_t                    myAudioOnLoad;     //!< audio     track on load
     int32_t                    mySubsOnLoad;      //!< subtitles track on load
@@ -372,6 +382,7 @@
     bool                       myToUpdateALList;
     bool                       myIsBenchmark;
     bool                       myToCheckUpdates;
+    bool                       myToCheckPoorOrient; //!< switch off orientation sensor with poor quality
 
     friend class StMoviePlayerGUI;

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp Changed

@@ -47,6 +47,7 @@
 #include <StGLWidgets/StGLMenuItem.h>
 #include <StGLWidgets/StGLMessageBox.h>
 #include <StGLWidgets/StGLMsgStack.h>
+#include <StGLWidgets/StGLOpenFile.h>
 #include <StGLWidgets/StGLPlayList.h>
 #include <StGLWidgets/StGLRangeFieldFloat32.h>
 #include <StGLWidgets/StGLScrollArea.h>
@@ -124,6 +125,7 @@
  */
 void StMoviePlayerGUI::createUpperToolbar() {
     int aBtnIter = 0;
+    int aNbBtnRight = 0;
     const int aTop  = scale(DISPL_Y_REGION_UPPER);
     const int aLeft = scale(DISPL_X_REGION_UPPER);
     StMarginsI aButtonMargins;
@@ -159,7 +161,7 @@
         iconTexture(stCString("menuOverUnderRL"),    anIconSize),
         iconTexture(stCString("menuRowLR"),          anIconSize),
         iconTexture(stCString("menuColLR"),          anIconSize),
-        iconTexture(stCString("menuSrcSeparate"),    anIconSize),
+        iconTexture(stCString("menuDual"),           anIconSize),
         iconTexture(stCString("menuFrameSeqLR"),     anIconSize),
         iconTexture(stCString("menuRedCyanLR"),      anIconSize),
         iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
@@ -177,6 +179,37 @@
                                            StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
     myBtnSwapLR->setDrawShadow(true);
     myBtnSwapLR->changeMargins() = aButtonMargins;
+
+    StHandle<StBoolParam> aTrackedPano = new StBoolParam(false);
+    myBtnPanorama = new StGLCheckboxTextured(myPanelUpper, aTrackedPano,
+                                             iconTexture(stCString("actionPanoramaOff"), anIconSize),
+                                             iconTexture(stCString("actionPanorama"),    anIconSize),
+                                             aLeft + (aBtnIter++) * anIconStep, aTop,
+                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnPanorama->signals.onBtnClick += stSlot(this, &StMoviePlayerGUI::doPanoramaCombo);
+    myBtnPanorama->setDrawShadow(true);
+    myBtnPanorama->changeMargins() = aButtonMargins;
+
+    // right buttons
+    StHandle<StBoolParam> aTrackedSubs = new StBoolParam(false);
+    myBtnSubs = new StGLCheckboxTextured(myPanelUpper, aTrackedSubs,
+                                         iconTexture(stCString("actionStreamSubtitlesOff"), anIconSize),
+                                         iconTexture(stCString("actionStreamSubtitles"),    anIconSize),
+                                         (aNbBtnRight++) * (-anIconStep) - aLeft, aTop,
+                                         StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+    myBtnSubs->signals.onBtnClick = stSlot(this, &StMoviePlayerGUI::doSubtitlesStreamsCombo);
+    myBtnSubs->setDrawShadow(true);
+    myBtnSubs->changeMargins() = aButtonMargins;
+
+    StHandle<StBoolParam> aTrackedAudio = new StBoolParam(false);
+    myBtnAudio = new StGLCheckboxTextured(myPanelUpper, aTrackedAudio,
+                                          iconTexture(stCString("actionStreamAudioOff"), anIconSize),
+                                          iconTexture(stCString("actionStreamAudio"),    anIconSize),
+                                          (aNbBtnRight++) * (-anIconStep) - aLeft, aTop,
+                                          StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+    myBtnAudio->signals.onBtnClick = stSlot(this, &StMoviePlayerGUI::doAudioStreamsCombo);
+    myBtnAudio->setDrawShadow(true);
+    myBtnAudio->changeMargins() = aButtonMargins;
 }
 
 /**
@@ -282,16 +315,12 @@
 
     StGLMenu* aMenuMedia   = createMediaMenu();     // Root -> Media menu
     StGLMenu* aMenuView    = createViewMenu();      // Root -> View menu
-              myMenuAudio  = createAudioMenu();     // Root -> Audio menu
-           myMenuSubtitles = createSubtitlesMenu(); // Root -> Subtitles menu
     StGLMenu* aDevicesMenu = createOutputMenu();    // Root -> Output menu
     StGLMenu* aMenuHelp    = createHelpMenu();      // Root -> Help menu
 
     // Attach sub menus to root
     myMenuRoot->addItem(tr(MENU_MEDIA),     aMenuMedia);
     myMenuRoot->addItem(tr(MENU_VIEW),      aMenuView);
-    myMenuRoot->addItem(tr(MENU_AUDIO),     myMenuAudio);
-    myMenuRoot->addItem(tr(MENU_SUBTITLES), myMenuSubtitles);
     myMenuRoot->addItem(myPlugin->StApplication::params.ActiveDevice->getActiveValue(), aDevicesMenu);
     myMenuRoot->addItem(tr(MENU_HELP),      aMenuHelp);
 }
@@ -514,7 +543,8 @@
     StGLMenu* aMenuView = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
     StGLMenu* aMenuDispMode  = createDisplayModeMenu();
     StGLMenu* aMenuDispRatio = createDisplayRatioMenu();
-    StGLMenu* aMenuSurface   = createSurfaceMenu();
+    StGLMenu* aMenuPanorama  = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
+    fillPanoramaMenu(aMenuPanorama);
     StGLMenu* aMenuTexFilter = createSmoothFilterMenu();
     StGLMenu* aMenuImgAdjust = createImageAdjustMenu();
 
@@ -528,7 +558,8 @@
     aMenuView->addItem(tr(MENU_VIEW_SWAP_LR),       myImage->params.swapLR);
     aMenuView->addItem(tr(MENU_VIEW_DISPLAY_RATIO), aMenuDispRatio)
              ->setIcon(stCMenuIcon("actionDisplayRatio"), false);
-    aMenuView->addItem(tr(MENU_VIEW_SURFACE),       aMenuSurface);
+    aMenuView->addItem(tr(MENU_VIEW_PANORAMA),      aMenuPanorama)
+             ->setIcon(stCMenuIcon("actionPanorama"), false);
     aMenuView->addItem(tr(MENU_VIEW_TEXFILTER),     aMenuTexFilter)
              ->setIcon(stCMenuIcon("actionInterpolation"), false);
     aMenuView->addItem(tr(MENU_VIEW_IMAGE_ADJUST),  aMenuImgAdjust)
@@ -554,12 +585,13 @@
 StGLMenu* StMoviePlayerGUI::createDisplayRatioMenu() {
     StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
     fillDisplayRatioMenu(aMenu);
-    aMenu->addItem("Keep on restart", myPlugin->params.toRestoreRatio);
+    aMenu->addItem(tr(MENU_VIEW_RATIO_KEEP_ON_RESTART), myPlugin->params.toRestoreRatio);
+    aMenu->addItem(tr(MENU_VIEW_RATIO_HEAL_ANAMORPHIC), myImage->params.ToHealAnamorphicRatio);
     return aMenu;
 }
 
 void StMoviePlayerGUI::fillDisplayRatioMenu(StGLMenu* theMenu) {
-    theMenu->addItem("Source", myImage->params.displayRatio, StGLImageRegion::RATIO_AUTO)
+    theMenu->addItem(tr(MENU_VIEW_DISPLAY_RATIO_SRC), myImage->params.displayRatio, StGLImageRegion::RATIO_AUTO)
            ->setIcon(stCMenuIcon("menuAuto"));
     theMenu->addItem("2.21:1", myImage->params.displayRatio, StGLImageRegion::RATIO_221_1)
            ->setIcon(stCMenuIcon("menuRatio2_1_"));
@@ -578,21 +610,27 @@
 void StMoviePlayerGUI::doDisplayRatioCombo(const size_t ) {
     StGLCombobox::ListBuilder aBuilder(this);
     fillDisplayRatioMenu(aBuilder.getMenu());
+    aBuilder.getMenu()->addItem(tr(MENU_VIEW_RATIO_HEAL_ANAMORPHIC), myImage->params.ToHealAnamorphicRatio);
     aBuilder.display();
 }
 
-/**
- * Root -> View menu -> Surface
- */
-StGLMenu* StMoviePlayerGUI::createSurfaceMenu() {
-    StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-    aMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
-                   myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
-    aMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
-                   myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
-    aMenu->addItem("Cubemap",
-                   myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
-    return aMenu;
+void StMoviePlayerGUI::fillPanoramaMenu(StGLMenu* theMenu) {
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_PLANE),
+                     myImage->params.ViewMode, StStereoParams::FLAT_IMAGE);
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_SPHERE),
+                     myImage->params.ViewMode, StStereoParams::PANORAMA_SPHERE);
+    theMenu->addItem(tr(MENU_VIEW_SURFACE_CUBEMAP),
+                     myImage->params.ViewMode, StStereoParams::PANORAMA_CUBEMAP);
+    if(myWindow->hasOrientationSensor()) {
+        theMenu->addItem(tr(myWindow->isPoorOrientationSensor() ? MENU_VIEW_TRACK_HEAD_POOR : MENU_VIEW_TRACK_HEAD),
+                         myPlugin->params.ToTrackHead);
+    }
+}
+
+void StMoviePlayerGUI::doPanoramaCombo(const size_t ) {
+    StGLCombobox::ListBuilder aBuilder(this);
+    fillPanoramaMenu(aBuilder.getMenu());
+    aBuilder.display();
 }
 
 /**
@@ -1142,6 +1180,12 @@
 
     int aBtnIter = 0;
 
+    myBtnOpen = new StGLTextureButton(myPanelUpper, (aBtnIter++) * myIconStep, 0);
+    myBtnOpen->signals.onBtnClick.connect(this, &StMoviePlayerGUI::doOpenFile);
+    myBtnOpen->setTexturePath(iconTexture(stCString("actionOpen"), anIconSize));
+    myBtnOpen->setDrawShadow(true);
+    myBtnOpen->changeMargins() = aButtonMargins;
+
     StGLTextureButton* aSrcBtn = new StGLTextureButton(myPanelUpper, (aBtnIter++) * myIconStep, 0,
                                                        StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB);
     aSrcBtn->changeMargins() = aButtonMargins;
@@ -1154,7 +1198,7 @@
         iconTexture(stCString("menuOverUnderRL"),    anIconSize),
         iconTexture(stCString("menuRowLR"),          anIconSize),
         iconTexture(stCString("menuColLR"),          anIconSize),
-        iconTexture(stCString("menuSrcSeparate"),    anIconSize),
+        iconTexture(stCString("menuDual"),           anIconSize),
         iconTexture(stCString("menuFrameSeqLR"),     anIconSize),
         iconTexture(stCString("menuRedCyanLR"),      anIconSize),
         iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
@@ -1173,6 +1217,16 @@
     myBtnSwapLR->setDrawShadow(true);
     myBtnSwapLR->changeMargins() = aButtonMargins;
 
+    StHandle<StBoolParam> aTrackedPano = new StBoolParam(false);
+    myBtnPanorama = new StGLCheckboxTextured(myPanelUpper, aTrackedPano,
+                                             iconTexture(stCString("actionPanoramaOff"), anIconSize),
+                                             iconTexture(stCString("actionPanorama"),    anIconSize),
+                                             (aBtnIter++) * myIconStep, 0,
+                                             StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT));
+    myBtnPanorama->signals.onBtnClick += stSlot(this, &StMoviePlayerGUI::doPanoramaCombo);
+    myBtnPanorama->setDrawShadow(true);
+    myBtnPanorama->changeMargins() = aButtonMargins;
+
     aBtnIter = 0;
     StGLTextureButton* aBtnEx = new StGLTextureButton(myPanelUpper, (aBtnIter--) * (-myIconStep), 0,
                                                       StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
@@ -1242,6 +1296,28 @@
     myTimeBox->changeRectPx().bottom() = myTimeBox->getRectPx().top()  + scale(56);
 }
 
+void StMoviePlayerGUI::doOpenFile(const size_t ) {
+    /*if(!isMobile()) {
+        myPlugin->doOpen1File();
+        return;
+    }*/
+
+    StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
+    aDialog->setMimeList(myPlugin->myVideo->getMimeListVideo());
+    aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Downloads));
+    aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Videos));
+    aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Music));
+    aDialog->signals.onFileSelected = stSlot(myPlugin, &StMoviePlayer::doOpen1FileFromGui);
+
+    if(myPlugin->params.lastFolder.isEmpty()) {
+        StHandle<StFileNode> aCurrFile = myPlugin->myVideo->getPlayList().getCurrentFile();
+        if(!aCurrFile.isNull()) {
+            myPlugin->params.lastFolder = aCurrFile->isEmpty() ? aCurrFile->getFolderPath() : aCurrFile->getValue(0)->getFolderPath();
+        }
+    }
+    aDialog->openFolder(myPlugin->params.lastFolder);
+}
+
 void StMoviePlayerGUI::doShowMobileExMenu(const size_t ) {
     const int aTop = scale(56);
 
@@ -1288,8 +1364,7 @@
     anItem = aMenu->addItem(tr(MENU_HELP_ABOUT));
     anItem->setIcon(stCMenuIcon("actionHelp"));
     anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doAboutProgram);
-    //anItem = aMenu->addItem(myPlugin->StApplication::params.ActiveDevice->getActiveValue());
-    anItem = aMenu->addItem("Settings");
+    anItem = aMenu->addItem(tr(MENU_HELP_SETTINGS));
     anItem->setIcon(stCMenuIcon("actionSettings"));
     anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doMobileSettings);
     aMenu->stglInit();
@@ -1316,14 +1391,15 @@
   myMenuRoot(NULL),
   myMenuOpenAL(NULL),
   myMenuRecent(NULL),
-  myMenuAudio(NULL),
-  myMenuSubtitles(NULL),
   // upper toolbar
   myPanelUpper(NULL),
   myBtnOpen(NULL),
   myBtnInfo(NULL),
   myBtnSwapLR(NULL),
+  myBtnPanorama(NULL),
   myBtnSrcFrmt(NULL),
+  myBtnAudio(NULL),
+  myBtnSubs(NULL),
   // bottom toolbar
   myPanelBottom(NULL),
   mySeekBar(NULL),
@@ -1364,8 +1440,12 @@
     myImage->params.displayMode->changeValues()[StGLImageRegion::MODE_ONLY_RIGHT] = tr(MENU_VIEW_DISPLAY_MODE_RIGHT);
     myImage->params.displayMode->changeValues()[StGLImageRegion::MODE_PARALLEL]   = tr(MENU_VIEW_DISPLAY_MODE_PARALLEL);
     myImage->params.displayMode->changeValues()[StGLImageRegion::MODE_CROSSYED]   = tr(MENU_VIEW_DISPLAY_MODE_CROSSYED);
+    myImage->params.ToHealAnamorphicRatio->setValue(true);
 
     mySubtitles = new StGLSubtitles  (this, theSubQueue,
+                                      myPlugin->params.SubtitlesPlace,
+                                      myPlugin->params.SubtitlesTopDY,
+                                      myPlugin->params.SubtitlesBottomDY,
                                       myPlugin->params.SubtitlesSize,
                                       myPlugin->params.SubtitlesParallax,
                                       myPlugin->params.SubtitlesParser);
@@ -1388,15 +1468,22 @@
 }
 
 void StMoviePlayerGUI::stglUpdate(const StPointD_t& thePointZo,
-                                  const GLfloat theProgress,
-                                  const double thePTS) {
-    StGLRootWidget::stglUpdate(thePointZo);
-    if(mySubtitles != NULL) {
-        mySubtitles->setPTS(thePTS);
+                                  bool              theIsMouseMoved) {
+    if(mySeekBar != NULL
+    && myPanelBottom != NULL
+    && myTimeBox->wasResized()) {
+        stglResizeSeekBar();
     }
-    if(mySeekBar != NULL) {
-        mySeekBar->setProgress(theProgress);
+
+    if(myBtnAudio != NULL) {
+        myBtnAudio->getTrackedValue()->setValue(myPlugin->params.audioStream->getValue() != -1);
+    }
+    if(myBtnSubs != NULL) {
+        myBtnSubs->getTrackedValue()->setValue(myPlugin->params.subtitlesStream->getValue() != -1);
     }
+
+    setVisibility(thePointZo, theIsMouseMoved);
+    StGLRootWidget::stglUpdate(thePointZo);
     if(myVolumeBar != NULL) {
         char aBuff[128];
         stsprintf(aBuff, 128, "%+03.0f dB", myPlugin->params.AudioGain->getValue());
@@ -1456,6 +1543,11 @@
         }
     }
 
+    stglResizeSeekBar();
+    StGLRootWidget::stglResize(theRectPx);
+}
+
+void StMoviePlayerGUI::stglResizeSeekBar() {
     if(mySeekBar != NULL
     && myPanelBottom != NULL) {
         const int aPanelSizeY = myPanelBottom->getRectPx().height();
@@ -1477,7 +1569,7 @@
             mySeekBar->changeRectPx().right() = aPanelSizeX - anXOffset - myBottomBarNbRight * myIconStep;
             if(anXSpace2 >= anMinXSpace) {
                 // wide mode
-                mySeekBar->changeRectPx().right() -= myIconStep * 2;
+                mySeekBar->changeRectPx().right() -= aBoxWidth;
                 myTimeBox->changeRectPx().moveLeftTo(myBottomBarNbRight * (-myIconStep));
                 myTimeBox->setOverlay(false);
             } else {
@@ -1502,8 +1594,6 @@
             }
         }
     }
-
-    StGLRootWidget::stglResize(theRectPx);
 }
 
 bool StMoviePlayerGUI::toHideCursor() {
@@ -1539,7 +1629,7 @@
     inline bool isPointIn(const StGLWidget* theWidget,
                           const StPointD_t& theCursorZo) {
         return theWidget != NULL
-            && theWidget->isVisible()
+            && theWidget->isVisibleWithParents()
             && theWidget->isPointIn(theCursorZo);
     }
 
@@ -1548,14 +1638,25 @@
 void StMoviePlayerGUI::setVisibility(const StPointD_t& theCursor,
                                      bool              theIsMouseMoved) {
     const bool toShowPlayList = myPlugin->params.ToShowPlayList->getValue();
-    const int aRootSizeY = getRectPx().height();
+    const int  aRootSizeY     = getRectPx().height();
+    const bool hasVideo       = myPlugin->myVideo->hasVideoStream();
+    StHandle<StStereoParams> aParams = myImage->getSource();
     myIsVisibleGUI = theIsMouseMoved
+        || aParams.isNull()
         || myVisibilityTimer.getElapsedTime() < 2.0
         || (myPanelUpper  != NULL && myPanelUpper ->isPointIn(theCursor))
-        || (myPanelBottom != NULL && int(aRootSizeY * theCursor.y()) > (aRootSizeY - 2 * myPanelBottom->getRectPx().height()))
+        || (myPanelBottom != NULL && int(aRootSizeY * theCursor.y()) > (aRootSizeY - 2 * myPanelBottom->getRectPx().height())
+                                  && theCursor.y() < 1.0)
         || (mySeekBar     != NULL && mySeekBar    ->isPointIn(theCursor))
         || (myPlayList    != NULL && toShowPlayList && myPlayList->isPointIn(theCursor))
         || (myMenuRoot    != NULL && myMenuRoot->isActive());
+    if(!myIsVisibleGUI
+     && myBtnPlay != NULL
+     && myBtnPlay->getFaceId() == 0
+     && (theCursor.x() < 0.0 || theCursor.x() > 1.0
+      || theCursor.y() < 0.0 || theCursor.y() > 1.0)) {
+        myIsVisibleGUI = true;
+    }
     const float anOpacity = (float )myVisLerp.perform(myIsVisibleGUI, false);
     if(theIsMouseMoved) {
         myVisibilityTimer.restart();
@@ -1581,10 +1682,10 @@
 
     StFormat aSrcFormat = (StFormat )myPlugin->params.srcFormat->getValue();
     if(aSrcFormat == StFormat_AUTO
-    && !myImage->params.stereoFile.isNull()) {
-        aSrcFormat = myImage->params.stereoFile->StereoFormat;
+    && !aParams.isNull()) {
+        aSrcFormat = aParams->StereoFormat;
     }
-    if(!myImage->params.stereoFile.isNull()
+    if(!aParams.isNull()
      && myImage->params.swapLR->getValue()) {
         aSrcFormat = st::formatReversed(aSrcFormat);
     }
@@ -1598,6 +1699,27 @@
         myBtnSwapLR->setOpacity(aSrcFormat != StFormat_Mono ? anOpacity : 0.0f, false);
     }
 
+    const StStereoParams::ViewMode aViewMode = hasVideo && !aParams.isNull()
+                                             ? aParams->ViewingMode
+                                             : StStereoParams::FLAT_IMAGE;
+    bool toShowPano = aViewMode != StStereoParams::FLAT_IMAGE;
+    if(!toShowPano
+    &&  hasVideo
+    && !aParams.isNull()
+    &&  st::probePanorama(aParams->StereoFormat,
+                          aParams->Src1SizeX, aParams->Src1SizeY,
+                          aParams->Src2SizeX, aParams->Src2SizeY) != StPanorama_OFF) {
+        toShowPano = true;
+    }
+    if(myBtnPanorama != NULL) {
+        myBtnPanorama->getTrackedValue()->setValue(aViewMode != StStereoParams::FLAT_IMAGE);
+        myBtnPanorama->setOpacity(toShowPano ? anOpacity : 0.0f, false);
+    }
+    myWindow->setTrackOrientation(aViewMode != StStereoParams::FLAT_IMAGE
+                               && myPlugin->params.ToTrackHead->getValue());
+    StQuaternion<double> aQ = myWindow->getDeviceOrientation();
+    myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
+
     if(myDescr != NULL) {
         myDescr->setOpacity(1.0f, false);
         if(::isPointIn(myBtnOpen, theCursor)) {
@@ -1609,6 +1731,18 @@
             myDescr->setText(tr(aLngId));
         } else if(::isPointIn(myBtnSrcFrmt, theCursor)) {
             myDescr->setText(tr(BTN_SRC_FORMAT) + "\n" + trSrcFormat(aSrcFormat));
+        } 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;
+            }
+            myDescr->setText(tr(MENU_VIEW_PANORAMA) + "\n" + tr(aTrPano));
+        } else if(::isPointIn(myBtnAudio, theCursor)) {
+            myDescr->setText(tr(MENU_AUDIO));
+        } else if(::isPointIn(myBtnSubs, theCursor)) {
+            myDescr->setText(tr(MENU_SUBTITLES));
         } else if(::isPointIn(myBtnVolume, theCursor)) {
             myDescr->setText("Mute");
         } else if(::isPointIn(myBtnPlay, theCursor)) {
@@ -1644,129 +1778,121 @@
             aBuilder.getMenu()->addItem(aStreams->getValue(aStreamId), myPlugin->params.audioStream, int32_t(aStreamId));
         }
     }
-    aBuilder.display();
-}
-
-void StMoviePlayerGUI::updateAudioStreamsMenu(const StHandle< StArrayList<StString> >& theStreamsList,
-                                              const bool theHasVideo) {
-    if(myMenuAudio == NULL) {
+    if(myWindow->isMobile()) {
+        aBuilder.display();
         return;
     }
-    for(StGLWidget* aChild = myMenuAudio->getChildren()->getStart(); aChild != NULL;) {
-        StGLWidget* anItem = aChild;
-        aChild = aChild->getNext();
-        delete anItem;
-    }
-
-    if(theHasVideo || theStreamsList.isNull() || theStreamsList->isEmpty()) {
-        myMenuAudio->addItem(tr(MENU_AUDIO_NONE), myPlugin->params.audioStream, -1);
-    }
-    if(!theStreamsList.isNull()) {
-        for(size_t aStreamId = 0; aStreamId < theStreamsList->size(); ++aStreamId) {
-            myMenuAudio->addItem(theStreamsList->getValue(aStreamId), myPlugin->params.audioStream, int32_t(aStreamId));
-        }
-    }
 
-    //myMenuAudio->addSplitter();
+    //aBuilder.getMenu()->addSplitter();
     StGLMenuItem* aDelayItem = NULL;
     StGLRangeFieldFloat32* aDelayRange = NULL;
-    if(theHasVideo) {
-        if(!theStreamsList.isNull()
-        && !theStreamsList->isEmpty()) {
-            aDelayItem = myMenuAudio->addItem(tr(MENU_AUDIO_DELAY));
+    if(hasVideo) {
+        if(!aStreams.isNull()
+        && !aStreams->isEmpty()) {
+            aDelayItem = aBuilder.getMenu()->addItem(tr(MENU_AUDIO_DELAY));
             aDelayItem->changeMargins().right = scale(100 + 16);
             aDelayItem->signals.onItemClick.connect(this, &StMoviePlayerGUI::doAudioDelay);
             aDelayRange = new StGLRangeFieldFloat32(aDelayItem, myPlugin->params.AudioDelay,
                                                     -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
-            aDelayRange->changeRectPx().bottom() = aDelayRange->getRectPx().top()  + myMenuAudio->getItemHeight();
+            aDelayRange->changeRectPx().bottom() = aDelayRange->getRectPx().top()  + aBuilder.getMenu()->getItemHeight();
             aDelayRange->setFormat(stCString("%+01.3f"));
             aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Default,  StGLVec3(0.0f, 0.0f, 0.0f));
             aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, StGLVec3(0.4f, 0.8f, 0.4f));
             aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, StGLVec3(1.0f, 0.0f, 0.0f));
         }
-        myMenuAudio->addItem(tr(MENU_AUDIO_ATTACH))
-                   ->setIcon(stCMenuIcon("actionOpen"), false)
-                   ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doAddAudioStream);
+        aBuilder.getMenu()->addItem(tr(MENU_AUDIO_ATTACH))
+                          ->setIcon(stCMenuIcon("actionOpen"), false)
+                          ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doAddAudioStream);
     }
 
-    // update menu representation
-    myMenuAudio->stglInit();
+    aBuilder.display();
 }
 
 void StMoviePlayerGUI::doSubtitlesStreamsCombo(const size_t ) {
     const StHandle< StArrayList<StString> >& aStreams = myPlugin->myVideo->params.activeSubtitles->getList();
 
     StGLCombobox::ListBuilder aBuilder(this);
+
+    // create text parser menu
+    StGLMenu* aParserMenu = NULL;
+    if(!myWindow->isMobile()) {
+        aParserMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
+        for(size_t anIter = 0; anIter < myPlugin->params.SubtitlesParser->getValues().size(); ++anIter) {
+            aParserMenu->addItem(myPlugin->params.SubtitlesParser->getValues()[anIter], myPlugin->params.SubtitlesParser, (int32_t )anIter);
+        }
+    }
+
     aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_NONE), myPlugin->params.subtitlesStream, -1);
     if(!aStreams.isNull()) {
         for(size_t aStreamId = 0; aStreamId < aStreams->size(); ++aStreamId) {
             aBuilder.getMenu()->addItem(aStreams->getValue(aStreamId), myPlugin->params.subtitlesStream, int32_t(aStreamId));
         }
     }
-    aBuilder.display();
-}
-
-void StMoviePlayerGUI::updateSubtitlesStreamsMenu(const StHandle< StArrayList<StString> >& theStreamsList,
-                                                  const bool theIsFilePlayed) {
-    if(myMenuSubtitles == NULL) {
+    if(myWindow->isMobile()) {
+        aBuilder.display();
         return;
     }
-    for(StGLWidget* aChild = myMenuSubtitles->getChildren()->getStart(); aChild != NULL;) {
-        StGLWidget* anItem = aChild;
-        aChild = aChild->getNext();
-        delete anItem;
-    }
 
-    // create text parser menu
-    StGLMenu* aParserMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-    for(size_t anIter = 0; anIter < myPlugin->params.SubtitlesParser->getValues().size(); ++anIter) {
-        aParserMenu->addItem(myPlugin->params.SubtitlesParser->getValues()[anIter], myPlugin->params.SubtitlesParser, (int32_t )anIter);
-    }
-    aParserMenu->stglInit();
-
-    myMenuSubtitles->addItem(tr(MENU_SUBTITLES_NONE), myPlugin->params.subtitlesStream, -1);
-    if(!theStreamsList.isNull()) {
-        for(size_t aStreamId = 0; aStreamId < theStreamsList->size(); ++aStreamId) {
-            myMenuSubtitles->addItem(theStreamsList->getValue(aStreamId), myPlugin->params.subtitlesStream, int32_t(aStreamId));
-        }
-    }
-
-    if(!theStreamsList.isNull()
-    && !theStreamsList->isEmpty()) {
+    if(!aStreams.isNull()
+    && !aStreams->isEmpty()) {
         //myMenuSubtitles->addSplitter();
-        StGLMenuItem* anItem = myMenuSubtitles->addItem(tr(MENU_SUBTITLES_SIZE));
+        StGLMenuItem* anItem = aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_SIZE));
         anItem->setIcon(stCMenuIcon("actionFontSize"), false);
         anItem->changeMargins().right = scale(100 + 16);
         StGLRangeFieldFloat32* aRange = new StGLRangeFieldFloat32(anItem, myPlugin->params.SubtitlesSize,
                                                                  -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
-        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + myMenuSubtitles->getItemHeight();
+        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + aBuilder.getMenu()->getItemHeight();
         aRange->setFormat(stCString("%02.0f"));
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Default,  aBlack);
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, aBlack);
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, aBlack);
 
-        anItem = myMenuSubtitles->addItem(tr(MENU_SUBTITLES_PARALLAX));
+        StGLMenu* aPlaceMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
+
+        anItem = aPlaceMenu->addItem(tr(MENU_SUBTITLES_TOP), myPlugin->params.SubtitlesPlace, ST_VCORNER_TOP);
+        anItem->changeMargins().right  = scale(100 + 16);
+        aRange = new StGLRangeFieldFloat32(anItem, myPlugin->params.SubtitlesTopDY,
+                                          -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
+        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + aBuilder.getMenu()->getItemHeight();
+        aRange->setFormat(stCString("%+03.0f"));
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Default,  aBlack);
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, aGreen);
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, aRed);
+
+        anItem = aPlaceMenu->addItem(tr(MENU_SUBTITLES_BOTTOM), myPlugin->params.SubtitlesPlace, ST_VCORNER_BOTTOM);
+        anItem->changeMargins().right  = scale(100 + 16);
+        aRange = new StGLRangeFieldFloat32(anItem, myPlugin->params.SubtitlesBottomDY,
+                                          -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
+        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + aBuilder.getMenu()->getItemHeight();
+        aRange->setFormat(stCString("%+03.0f"));
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Default,  aBlack);
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, aGreen);
+        aRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, aRed);
+
+        anItem = aPlaceMenu->addItem(tr(MENU_SUBTITLES_PARALLAX));
         anItem->changeMargins().right  = scale(100 + 16);
         aRange = new StGLRangeFieldFloat32(anItem, myPlugin->params.SubtitlesParallax,
                                           -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
-        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + myMenuSubtitles->getItemHeight();
+        aRange->changeRectPx().bottom() = aRange->getRectPx().top() + aBuilder.getMenu()->getItemHeight();
         aRange->setFormat(stCString("%+03.0f"));
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Default,  aBlack);
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, aBlack);
         aRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, aBlack);
+
+        anItem = aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_PLACEMENT), aPlaceMenu);
     }
 
-    myMenuSubtitles->addItem(tr(MENU_SUBTITLES_PARSER), aParserMenu)
-                   ->setIcon(stCMenuIcon("actionTextFormat"), false);
-    if(theIsFilePlayed) {
-        //myMenuSubtitles->addSplitter();
-        myMenuSubtitles->addItem(tr(MENU_SUBTITLES_ATTACH))
-                       ->setIcon(stCMenuIcon("actionOpen"), false)
-                       ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doAddSubtitleStream);
+    aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_PARSER), aParserMenu)
+                      ->setIcon(stCMenuIcon("actionTextFormat"), false);
+    if(myPlugin->myVideo->hasAudioStream()
+    || myPlugin->myVideo->hasVideoStream()) {
+        //aBuilder.getMenu()->addSplitter();
+        aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_ATTACH))
+                          ->setIcon(stCMenuIcon("actionOpen"), false)
+                          ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doAddSubtitleStream);
     }
 
-    // update menu representation
-    myMenuSubtitles->stglInit();
+    aBuilder.display();
 }
 
 void StMoviePlayerGUI::stglDraw(unsigned int theView) {
@@ -1777,7 +1903,8 @@
                                                  myFpsWidget->changePlayQueueLength(),
                                                  myFpsWidget->changePlayFps());
         myFpsWidget->update(myPlugin->getMainWindow()->isStereoOutput(),
-                            myPlugin->getMainWindow()->getTargetFps());
+                            myPlugin->getMainWindow()->getTargetFps(),
+                            myPlugin->getMainWindow()->getStatistics());
     }
     StGLRootWidget::stglDraw(theView);
 }
@@ -1927,8 +2054,7 @@
     aParams.add(myPlugin->params.IsMobileUI);
     myLangMap->params.language->setName(tr(MENU_HELP_LANGS));
 
-    const StString aTitle  = "Settings";
-    StInfoDialog*  aDialog = new StInfoDialog(myPlugin, this, aTitle, scale(512), scale(300));
+    StInfoDialog* aDialog = new StInfoDialog(myPlugin, this, tr(MENU_HELP_SETTINGS), scale(512), scale(300));
 
     const int aWidthMax  = aDialog->getContent()->getRectPx().width();
     int       aRowLast   = (int )aParams.size();

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayerGUI.h -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerGUI.h Changed

@@ -112,8 +112,7 @@
 
     using StGLRootWidget::stglUpdate;
     ST_LOCAL void stglUpdate(const StPointD_t& thePointZo,
-                             const GLfloat     theProgress,
-                             const double      thePTS);
+                             bool              theIsMouseMoved);
     ST_LOCAL void setVisibility(const StPointD_t& theCursor,
                                 bool              theIsMouseMoved);
 
@@ -124,12 +123,8 @@
 
         public: //! @name menu update routines
 
+    ST_LOCAL void stglResizeSeekBar();
     ST_LOCAL void updateOpenALDeviceMenu();
-    ST_LOCAL void updateAudioStreamsMenu    (const StHandle< StArrayList<StString> >& theStreamsList,
-                                             const bool theHasVideo);
-    ST_LOCAL void updateSubtitlesStreamsMenu(const StHandle< StArrayList<StString> >& theStreamsList,
-                                             const bool theIsFilePlayed);
-
     ST_LOCAL void updateRecentMenu();
 
     ST_LOCAL void doAboutFile(const size_t );
@@ -155,7 +150,6 @@
     ST_LOCAL StGLMenu* createViewMenu();         // Root -> View menu
     ST_LOCAL StGLMenu* createDisplayModeMenu();  // Root -> View   -> Output
     ST_LOCAL StGLMenu* createDisplayRatioMenu(); // Root -> View   -> Display Ratio
-    ST_LOCAL StGLMenu* createSurfaceMenu();      // Root -> View   -> Surface
     ST_LOCAL StGLMenu* createSmoothFilterMenu(); // Root -> View   -> Smooth Filter
     ST_LOCAL StGLMenu* createImageAdjustMenu();  // Root -> View   -> Image Adjust
     ST_LOCAL StGLMenu* createAudioMenu();        // Root -> Audio menu
@@ -172,6 +166,7 @@
     ST_LOCAL void fillRecentMenu(StGLMenu* theMenu);
     ST_LOCAL void fillDisplayRatioMenu(StGLMenu* theMenu);
     ST_LOCAL void fillSrcFormatMenu(StGLMenu* theMenu);
+    ST_LOCAL void fillPanoramaMenu (StGLMenu* theMenu);
 
         private: //! @name mobile interface creation routines
 
@@ -199,12 +194,14 @@
     ST_LOCAL void doChangeHotKey1(const size_t );
     ST_LOCAL void doChangeHotKey2(const size_t );
 
+    ST_LOCAL void doOpenFile(const size_t );
     ST_LOCAL void doShowMobileExMenu(const size_t );
     ST_LOCAL void doMobileSettings(const size_t );
     ST_LOCAL void doAudioStreamsCombo(const size_t );
     ST_LOCAL void doSubtitlesStreamsCombo(const size_t );
     ST_LOCAL void doDisplayRatioCombo(const size_t );
     ST_LOCAL void doDisplayStereoFormatCombo(const size_t );
+    ST_LOCAL void doPanoramaCombo(const size_t );
 
         private: //! @name private fields
 
@@ -223,15 +220,17 @@
     StGLMenu*           myMenuRoot;         //!< root of the main menu
     StGLMenu*           myMenuOpenAL;
     StGLMenu*           myMenuRecent;
-    StGLMenu*           myMenuAudio;
-    StGLMenu*           myMenuSubtitles;
 
     StGLWidget*         myPanelUpper;       //!< upper toolbar
     StGLTextureButton*  myBtnOpen;
     StGLTextureButton*  myBtnInfo;
     StGLTextureButton*  myBtnSwapLR;
+    StGLCheckboxTextured* myBtnPanorama;
     StGLTextureButton*  myBtnSrcFrmt;
 
+    StGLCheckboxTextured* myBtnAudio;
+    StGLCheckboxTextured* myBtnSubs;
+
     StGLWidget*         myPanelBottom;      //!< bottom toolbar
     StSeekBar*          mySeekBar;
     StSeekBar*          myVolumeBar;

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayerStrings.cpp -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerStrings.cpp Changed

@@ -80,6 +80,12 @@
                "Parallax");
     theStrings(MENU_SUBTITLES_PARSER,
                "Parser");
+    theStrings(MENU_SUBTITLES_PLACEMENT,
+               "Placement");
+    theStrings(MENU_SUBTITLES_TOP,
+               "Top");
+    theStrings(MENU_SUBTITLES_BOTTOM,
+               "Bottom");
     theStrings(MENU_SUBTITLES_PLAIN_TEXT,
                "Plain text");
     theStrings(MENU_SUBTITLES_LITE_HTML,
@@ -121,7 +127,7 @@
     theStrings(MENU_MEDIA_OPEN_MOVIE_2,
                "Left+Right files");
     theStrings(MENU_SRC_FORMAT_AUTO,
-               "Autodetection");
+               "Source");
     theStrings(MENU_SRC_FORMAT_MONO,
                "Mono");
     theStrings(MENU_SRC_FORMAT_CROSS_EYED,
@@ -170,14 +176,20 @@
                "Saturation");
     theStrings(MENU_VIEW_ADJUST_GAMMA,
                "Gamma");
-    theStrings(MENU_VIEW_SURFACE,
-               "Surface");
+    theStrings(MENU_VIEW_PANORAMA,
+               "Panorama");
     theStrings(MENU_VIEW_SURFACE_PLANE,
                "Plane");
     theStrings(MENU_VIEW_SURFACE_SPHERE,
                "Sphere");
     theStrings(MENU_VIEW_SURFACE_CYLINDER,
                "Cylinder");
+    theStrings(MENU_VIEW_SURFACE_CUBEMAP,
+               "Cubemap");
+    theStrings(MENU_VIEW_TRACK_HEAD,
+               "Track orientation");
+    theStrings(MENU_VIEW_TRACK_HEAD_POOR,
+               "Track orientation (poor)");
     theStrings(MENU_VIEW_DISPLAY_MODE_STEREO,
                "Stereo");
     theStrings(MENU_VIEW_DISPLAY_MODE_LEFT,
@@ -190,8 +202,10 @@
                "Cross-eyed pair");
     theStrings(MENU_VIEW_DISPLAY_RATIO_SRC,
                "Source");
-    theStrings(MENU_VIEW_KEEP_ON_RESTART,
+    theStrings(MENU_VIEW_RATIO_KEEP_ON_RESTART,
                "Keep on restart");
+    theStrings(MENU_VIEW_RATIO_HEAL_ANAMORPHIC,
+               "Heal anamorphic 1080p/720p");
     theStrings(MENU_VIEW_TEXFILTER_NEAREST,
                "Nearest");
     theStrings(MENU_VIEW_TEXFILTER_LINEAR,
@@ -269,6 +283,8 @@
                "Never");
     theStrings(MENU_HELP_HOTKEYS,
                "Hotkeys");
+    theStrings(MENU_HELP_SETTINGS,
+               "Settings");
     theStrings(FILE_VIDEO_OPEN,
                "Open another movie");
     theStrings(BTN_SRC_FORMAT,
@@ -599,6 +615,11 @@
     addAction(theStrings, StMoviePlayer::Action_StereoParamsBegin + StGLImageRegion::Action_RotXDown,
               "DoParamsRotXDown",
               "X Rotation - down");
+
+    // new actions
+    addAction(theStrings, StMoviePlayer::Action_PanoramaOnOff,
+              "DoPanoramaOnOff",
+              "Enable/disable panorama mode");
 }
 
 };

sview-15_08.tar.gz/StMoviePlayer/StMoviePlayerStrings.h -> sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerStrings.h Changed

@@ -88,7 +88,7 @@
         MENU_VIEW_DISPLAY_RATIO = 1205,
         MENU_VIEW_TEXFILTER     = 1206,
         MENU_VIEW_IMAGE_ADJUST  = 1207,
-        MENU_VIEW_SURFACE       = 1208,
+        MENU_VIEW_PANORAMA      = 1208,
 
         MENU_VIEW_DISPLAY_MODE_STEREO       = 1210,
         MENU_VIEW_DISPLAY_MODE_LEFT         = 1211,
@@ -96,8 +96,9 @@
         MENU_VIEW_DISPLAY_MODE_PARALLEL     = 1213,
         MENU_VIEW_DISPLAY_MODE_CROSSYED     = 1214,
 
-        MENU_VIEW_DISPLAY_RATIO_SRC = 1250,
-        MENU_VIEW_KEEP_ON_RESTART   = 1251,
+        MENU_VIEW_DISPLAY_RATIO_SRC     = 1250,
+        MENU_VIEW_RATIO_KEEP_ON_RESTART = 1251,
+        MENU_VIEW_RATIO_HEAL_ANAMORPHIC = 1252,
 
         MENU_VIEW_TEXFILTER_NEAREST = 1260,
         MENU_VIEW_TEXFILTER_LINEAR  = 1261,
@@ -111,6 +112,9 @@
         MENU_VIEW_SURFACE_PLANE     = 1280,
         MENU_VIEW_SURFACE_SPHERE    = 1281,
         MENU_VIEW_SURFACE_CYLINDER  = 1282,
+        MENU_VIEW_SURFACE_CUBEMAP   = 1283,
+        MENU_VIEW_TRACK_HEAD        = 1285,
+        MENU_VIEW_TRACK_HEAD_POOR   = 1286,
 
         // Root -> Audio menu
         MENU_AUDIO = 1300,
@@ -131,6 +135,9 @@
         MENU_SUBTITLES_SIZE     = 1354,
         MENU_SUBTITLES_PARALLAX = 1355,
         MENU_SUBTITLES_PARSER   = 1356,
+        MENU_SUBTITLES_PLACEMENT= 1357,
+        MENU_SUBTITLES_TOP      = 1358,
+        MENU_SUBTITLES_BOTTOM   = 1359,
 
         MENU_SUBTITLES_PLAIN_TEXT = 1360,
         MENU_SUBTITLES_LITE_HTML  = 1361,
@@ -157,6 +164,7 @@
         MENU_HELP_SYSINFO = 1508,
         MENU_HELP_SCALE   = 1509,
         MENU_HELP_HOTKEYS = 1510,
+        MENU_HELP_SETTINGS= 1511,
 
         // Root -> Help -> Check for updates menu
         MENU_HELP_UPDATES_NOW   = 1520,

sview-15_08.tar.gz/StMoviePlayer/StSeekBar.cpp -> sview-15_10.tar.gz/StMoviePlayer/StSeekBar.cpp Changed

sview-15_08.tar.gz/StMoviePlayer/StTimeBox.h -> sview-15_10.tar.gz/StMoviePlayer/StTimeBox.h Changed

@@ -36,11 +36,13 @@
               const StGLCorner& theCorner,
               const StGLTextArea::FontSize theSize = StGLTextArea::SIZE_NORMAL)
     : StGLTextureButton(theParent, theLeft, theTop, theCorner),
-      myProgressSec(0.0),
-      myDurationSec(0.0),
+      myProgressSec(-1.0),
+      myDurationSec(-1.0),
       myToShowElapsed(true),
       myIsOverlay(false) {
-        myTextArea = new StGLTextArea(this, 0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_CENTER),
+        myMargins.left  = myRoot->scale(8);
+        myMargins.right = myRoot->scale(8);
+        myTextArea = new StGLTextArea(this, 0, 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT),
                                       myRoot->scale(32), myRoot->scale(32), theSize);
         myTextArea->setBorder(false);
         myTextArea->setTextColor(StGLVec3(1.0f, 1.0f, 1.0f));
@@ -69,18 +71,15 @@
         bool isBtnInit = StGLTextureButton::stglInit();
         myTextArea->changeRectPx().right()  = getRectPx().width();
         myTextArea->changeRectPx().bottom() = getRectPx().height();
-        return isBtnInit && myTextArea->stglInit();
+        const bool isOk = isBtnInit && myTextArea->stglInit();
+        myTextArea->setTextWidth(-1);
+        return isOk;
     }
 
     virtual void stglDraw(unsigned int theView) {
-        if(myToShowElapsed) {
-            myTextArea->setText(StFormatTime::formatSeconds(myProgressSec) + " / "
-                              + StFormatTime::formatSeconds(myDurationSec));
-        } else {
-            myTextArea->setText(StFormatTime::formatSeconds(myProgressSec - myDurationSec));
-        }
         StGLTextureButton::stglDraw(theView);
         myTextArea->stglDraw(theView);
+        myIsResized = false;
     }
 
     virtual bool tryClick(const StPointD_t& theCursor,
@@ -99,10 +98,33 @@
              : StGLTextureButton::tryUnClick(theCursor, theMouseBtn, theIsItemUnclicked);
     }
 
-    void setTime(const double theProgressSec,
-                 const double theDurationSec) {
+    void stglUpdateTime(const double theProgressSec,
+                        const double theDurationSec) {
+        if(std::abs(myDurationSec - theDurationSec) > 0.1
+        && (theDurationSec > 0.1 || myDurationSec < 0.0)) {
+            int aWidth  = 0;
+            int aHeight = 0;
+            myTextArea->computeTextWidth(StFormatTime::formatSeconds(theDurationSec) + " / "
+                                       + StFormatTime::formatSeconds(theDurationSec),
+                                        -1.0f, aWidth, aHeight);
+            const int aWidthNew = aWidth + myMargins.left + myMargins.right;
+            const int aWidthOld = getRectPx().width();
+            const int aToler    = myRoot->scale(4);
+            if(std::abs(aWidthNew - aWidthOld) > aToler) {
+                myTextArea->changeRectPx().right() = myTextArea->getRectPx().left() + aWidthNew;
+                myTextArea->setTextWidth(aWidthNew);
+                changeRectPx().right() = getRectPx().left() + aWidthNew;
+            }
+        }
+
         myProgressSec = theProgressSec;
         myDurationSec = theDurationSec;
+        if(myToShowElapsed) {
+            myTextArea->setText(StFormatTime::formatSeconds(myProgressSec) + " / "
+                              + StFormatTime::formatSeconds(myDurationSec));
+        } else {
+            myTextArea->setText(StFormatTime::formatSeconds(myProgressSec - myDurationSec));
+        }
     }
 
         public: //! @name callback Slots

sview-15_08.tar.gz/StMoviePlayer/StVideo/StVideo.cpp -> sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideo.cpp Changed

@@ -205,6 +205,7 @@
         #endif
         }
     }
+    myFileList.clear();
     myCtxList.clear();
     myPlayCtxList.clear();
     mySlaveCtx    = NULL;
@@ -318,9 +319,9 @@
                     const int aCodedSizeX = myVideoMaster->getCodedSizeX();
                     const int aCodedSizeY = myVideoMaster->getCodedSizeY();
                     StString  aDimsStr    = StString() + aSizeX + " x " + aSizeY;
-                    if(aCodedSizeX != aSizeX
-                    || aCodedSizeY != aSizeY) {
-                        aDimsStr += StString(" (") + aCodedSizeX + " x " + aCodedSizeY + ")";
+                    if((aCodedSizeX != aSizeX && aCodedSizeX != 0)
+                    || (aCodedSizeY != aSizeY && aCodedSizeY != 0)) {
+                        aDimsStr += StString(" [") + aCodedSizeX + " x " + aCodedSizeY + "]";
                     }
 
                     StDictEntry& aDimInfo = myFileInfoTmp->Info.addChange(tr(INFO_DIMENSIONS));
@@ -344,9 +345,9 @@
                     const int aCodedSizeX = myVideoSlave->getCodedSizeX();
                     const int aCodedSizeY = myVideoSlave->getCodedSizeY();
                     StString  aDimsStr    = StString() + aSizeX + " x " + aSizeY;
-                    if(aCodedSizeX != aSizeX
-                    || aCodedSizeY != aSizeY) {
-                        aDimsStr += StString(" (") + aCodedSizeX + " x " + aCodedSizeY + ")";
+                    if((aCodedSizeX != aSizeX && aCodedSizeX != 0)
+                    || (aCodedSizeY != aSizeY && aCodedSizeY != 0)) {
+                        aDimsStr += StString(" [") + aCodedSizeX + " x " + aCodedSizeY + "]";
                     }
                     aDimsStr += " [2]";
 
@@ -465,6 +466,7 @@
     }
 
     myCtxList.add(aFormatCtx);
+    myFileList.add(theFileToLoad);
     return true;
 }
 
@@ -717,6 +719,9 @@
             }
             while(!myVideoMaster->isEmpty() || !myVideoMaster->isInDowntime()
                || !myVideoSlave->isEmpty()  || !myVideoSlave->isInDowntime()) {
+                if(toQuit) {
+                    break;
+                }
                 StThread::sleep(10);
             }
             myVideoMaster->deinit();
@@ -738,8 +743,9 @@
 }
 
 void StVideo::packetsLoop() {
-    double aPts     = 0.0;
-    double aPtsbar  = 10.0; /// debug variable
+#ifdef ST_DEBUG
+    double aPtsbar  = 10.0;
+#endif
     double aSeekPts = 0.0;
     bool toSeekBack = false;
     StPlayEvent_t aPlayEvent = ST_PLAYEVENT_NONE;
@@ -880,6 +886,9 @@
             if(myAudio->isInitialized()) {
                 myAudio->pushEnd();
                 while(!myAudio->isEmpty() || !myAudio->isInDowntime()) {
+                    if(toQuit) {
+                        break;
+                    }
                     StThread::sleep(10);
                 }
                 myAudio->deinit();
@@ -933,6 +942,9 @@
             if(mySubtitles->isInitialized()) {
                 mySubtitles->pushEnd();
                 while(!mySubtitles->isEmpty() || !mySubtitles->isInDowntime()) {
+                    if(toQuit) {
+                        break;
+                    }
                     StThread::sleep(10);
                 }
                 mySubtitles->deinit();
@@ -988,12 +1000,14 @@
             StThread::sleep(2);
         }
 
-        aPts = getPts();
+    #ifdef ST_DEBUG
+        const double aPts = getPts();
         if(aPts > aPtsbar) {
             aPtsbar = aPts + 10.0;
             ST_DEBUG_LOG("Current position: " + StFormatTime::formatSeconds(aPts)
                       + " from "              + StFormatTime::formatSeconds(myDuration));
         }
+    #endif
 
         // All packets sent
         if(anEmptyQueues == myPlayCtxList.size()) {

sview-15_08.tar.gz/StMoviePlayer/StVideo/StVideo.h -> sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideo.h Changed

sview-15_08.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp -> sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp Changed

sview-15_08.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng Changed

sview-15_10.tar.gz/StMoviePlayer/lang/czech Added

sview-15_10.tar.gz/StMoviePlayer/lang/czech/StMoviePlayer.lng Added

@@ -0,0 +1,247 @@
+# Czech translation file for StMoviePlayer program
+# @author Kirill Gavrilov
+# @translator Marek Audy
+--------
+1002=Přehodit levá/pravá
+1003=Vypnout přehození levá/pravá
+1004=Vstupní stereoskopický formát:
+1015=Otevřít soubor
+1020=Play/Pause
+1021=Zobrazit/skrýt playlist
+1022=Předchozí soubor
+1023=Další soubor
+1029=Okno/přes celou obrazovku
+1100=Soubor
+1101=Otevřít soubor...
+1102=Uložit jako...
+1103=Vstupní stereoformát
+1170=Informace o souboru
+1104=Audio zařízení
+1105=Náhodné pořadí
+1106=Otevřít poslední položku
+1107=Dekódování videa na GPU
+1108=Web UI
+1109=Zavřít (ESC)
+1110=Jeden stereosoubor
+1111=Dva soubory levý/pravý zvlášť
+1130=Původní
+1131=Mono
+1132=Křížem vedle sebe
+1133=Paralel vedle sebe
+1134=Nad/pod P/L
+1135=Nad/pod L/P
+1136=Prokládaný
+1137=Anaglyf červená/modrá
+1138=Anaglyf purporová
+1139=Anaglyf žlutá
+1140=Střídání L/R
+1141=2x720p v 1080p dlaždice
+1142=2 stream
+1160=Smazat historii
+1180=Vypnout
+1181=Spustit jednou
+1182=Spustit při startu
+1185=Zobrazit chyby
+1186=Web-připojení nemůže být na portu {0}!
+1200=Zobrazení
+1201=Výstupní formát
+1202=Celá obrazovka (Enter)
+1203=Vrátit
+1204=Přehodit levá/pravá
+1205=Poměr stran
+1206=Vyhlazení
+1207=Barevné korekce
+1208=Panorama
+1210=Stereo
+1211=Levá
+1212=Pravá
+1213=Paralel vedle sebe
+1214=Křížem vedle sebe
+1250=Původní
+1251=Neukládat nastavení
+?1252=Heal anamorphic 1080p/720p
+1260=Nevyhlazovat
+1261=Lineární
+1262=Odstranit prokládání
+1270=Resetovat nastavení
+1271=Jas
+1272=Sytost
+1273=Gama
+1280=Plocha
+1281=Koule
+1282=Válec
+?1283=Cubemap
+?1285="Track orientation"
+?1286="Track orientation (poor)"
+1300=Zvuk
+1301=Vypnout zvuk
+1302=Zpoždění zvuku
+1303=Přidat stopu ze souboru
+1320=Synchronizace zvuk/video
+1321=Zadejte kladnou hodnotu v případě, že zvuk předbíhá video, kladnou je-li opožděn.
+1322=Zpoždění zvuku
+1323=sekund (s)
+1350=Titulky
+1351=Bez titulků
+1353=Přidat soubor
+1354=Velikost textu
+1355=Paralaxa
+1356=Text parser
+?1357=Placement
+?1358=Top
+?1359=Bottom
+1360=Plain text
+1361=Lite HTML
+1400=Vybrat zařízení
+1401=O modulu…
+1402=FPS nastavení
+1420=Vertikální synchronizace
+1421=Zobrazovat snímkování (fps)
+1422=Omezit využití CPU
+1500=Nápověda
+1501=O aplikaci…
+1502=Aktualizace
+1503=Licenční ujednání
+1504=Language
+1505=Zakázat usínání
+1506=Nápověda/Tipy
+1507=Experimentální funkce
+1508=O systému
+1509=Vzhled/měřítko
+?1510=Hotkeys
+?1511=Settings
+1520=Nyní
+1521=Denně
+1522=Týdně
+1523=Ročně
+1524=Nikdy
+1550=Nikdy
+1551=Vždy
+1552=Během přehrávání
+1553=V režimu celé obrazovky
+1590=Menší
+1591=Normální
+1592=Velké
+1593=Extravelké HiDPI 2x
+2000=Otevřít video
+2001=Otevřít video s LEVOU stopou
+2002=Otevřít video s PRAVOU stopou
+2003=Informace o souboru
+2004=Žadné informace
+2005=Vymazat soubor
+2006=Skutečně chcete hodit soubor do koše?
+2007=Aktivní dekódery
+2010=Zvolte místo pro uložení obrázku
+2011=Nic není otevřeno!
+2012=Obraz není možné uložit!
+?2013=Assign new Hot Key for action\n<i>{0}</i>
+?2014=Conflicts with: <i>{0}</i>
+3000=sView - aplikace na přehrávání stereoskopického videa
+3001=verze
+3002=Aplikace přehrává stereoskopické video.\n © {0} Гаврилов Кирилл <{1}>\nOficiální stránka: {2}\n\nAplikace je vytvořena na platformě GPL3.0 {3}\nČeská lokalizace Marek Audy
+3003=Nové verze aplikace jsou dostupné na: www.sview.ru
+3004=Informace o systému
+4000=Zavřít
+4001=Zrušit
+4005=Obnovit
+4006=Uložit
+4007=Smazat
+?4008=Default
+?4009=Defaults
+?4010=Assign
+5000=[levý]
+5001=[pravý]
+5002=Jména souborů
+5003=Rozlišení videa
+5004=Načítání
+5005=мс
+5006=Poměr stran pixelu
+5007=Formát pixelu
+5008=(metada nejsou v informaci obsažena)
+5009=(neobsahuje metadata)
+5010=Doba trvání
+5011=(informace není obsažena v metadatech,\nale byla přidělena podle jména souboru)
+5300=Nadpis
+5301=Skladatel
+5302=Interpret
+5303=Výtvarník
+5304=Album
+5305=Disk
+5306=Kvalita disku
+5307=Žánr
+5308=Komentář
+5309=Poznámky
+5310=Popis
+5311=Vydavatel
+5312=Copyright
+5313=Encoder
+5314=Engineer
+5315=Původ
+5316=Datum vydání
+5317=Datum
+5318=Rok
+5319=Jazyk
+5320=Stopa
+5321=Počet stop
+5322=Track gain
+5323=Track peak
+5324=Album gain
+5325=Album peak
+?6000=Quit program
+?6001=Switch fullscreen/windowed
+?6002=Show/hide FPS meter
+?6003=Stereo format - Auto
+?6004=Stereo format - Mono
+?6005=Stereo format - Over/Under
+?6006=Stereo format - Side by side
+?6007=Show file info
+?6008=Playlist - Go to the first item
+?6009=Playlist - Go to the last item
+?6010=Playlist - Go to the previous item
+?6011=Playlist - Go to the next item
+?6012=Playlist - Go to the previous item [2]
+?6013=Playlist - Go to the next item [2]
+?6014=Play/pause playback
+?6015=Stop playback
+?6016=Seek 5 seconds backward
+?6017=Seek 5 seconds forward
+?6018=Show open file dialog
+?6019=Save snapshot
+?6020=Delete the file from file system
+?6021=Mute/unmute audio
+?6022=Audio volume down
+?6023=Audio volume up
+?6024=Previous audio track
+?6025=Next audio track
+?6026=Next subtitles track
+?6027=Next subtitles track
+?6028=Copy displayed subtitles text
+?6029=Open URL from clipboard
+?6030=Show/hide playlist
+?6031=Reset image adjustment
+?6032=Reset image position
+?6033=Swap Left/Right
+?6034=Gamma correction - decrease
+?6035=Gamma correction - increase
+?6036=DX separation - decrease
+?6037=DX separation - increase
+?6038=DY separation - decrease
+?6039=DY separation - increase
+?6040=Angular separation - decrease
+?6041=Angular separation - increase
+?6042=Rotate 90 degrees counterclockwise
+?6043=Rotate 90 degrees clockwise
+?6044=Rotate counterclockwise
+?6045=Rotate clockwise
+?6046=Enable/disable panorama mode
+?6047=Panning - navigate to the left
+?6048=Panning - navigate to the right
+?6049=Panning - navigate to the top
+?6050=Panning - navigate to the bottom
+?6051=Scale - increment
+?6052=Scale - decrement
+?6053=Y Rotation - left
+?6054=Y Rotation - right
+?6055=X Rotation - up
+?6056=X Rotation - down
+?6057=Enable/disable panorama mode

sview-15_10.tar.gz/StMoviePlayer/lang/czech/language.lng Added

sview-15_08.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng Changed

@@ -23,7 +23,7 @@
 1109="Quit"
 1110="From One file"
 1111="Left+Right files"
-1130="Autodetection"
+1130="Source"
 1131="Mono"
 1132="Cross-eyed"
 1133="Parallel Pair"
@@ -50,7 +50,7 @@
 1205="Display Ratio"
 1206="Smooth Filter"
 1207="Image Adjust"
-1208="Surface"
+1208="Panorama"
 1210="Stereo"
 1211="Left View"
 1212="Right View"
@@ -58,6 +58,7 @@
 1214="Cross-eyed"
 1250="Source"
 1251="Keep on restart"
+1252="Heal anamorphic 1080p/720p"
 1260="Nearest"
 1261="Linear"
 1262="Blend Deinterlace"
@@ -68,6 +69,9 @@
 1280="Plane"
 1281="Sphere"
 1282="Cylinder"
+1283="Cubemap"
+1285="Track orientation"
+1286="Track orientation (poor)"
 1300="Audio"
 1301="None"
 1302="Audio/Video delay"
@@ -82,6 +86,9 @@
 1354="Font Size"
 1355="Parallax"
 1356="Text parser"
+1357="Placement"
+1358="Top"
+1359="Bottom"
 1360="Plain text"
 1361="Lite HTML"
 1400="Change device"
@@ -101,6 +108,7 @@
 1508="About system"
 1509="Interface Scale"
 1510="Hotkeys"
+1511="Settings"
 1520="Now"
 1521="Each day"
 1522="Each week"
@@ -235,3 +243,4 @@
 6054="Y Rotation - right"
 6055="X Rotation - up"
 6056="X Rotation - down"
+6057="Enable/disable panorama mode"

sview-15_08.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng Changed

@@ -23,7 +23,7 @@
 1109="Quitter"
 1110="Depuis un fichier"
 1111="2 Fichiers Gauche+Droit"
-1130="Auto-détection"
+1130="Source"
 1131="Mono"
 1132="Cross-eyed"
 1133="Coté/Coté (SbS)"
@@ -50,7 +50,7 @@
 1205="Ratio d'affichage"
 1206="Lissage antialiasing"
 1207="Réglage de l'image"
-1208="Surface"
+1208="Panorama"
 1210="Stéréo"
 1211="Vue Gauche"
 1212="Vue Droite"
@@ -58,6 +58,7 @@
 1214="Cross-eyed"
 1250="Source"
 1251="Garder après redémarrage"
+?1252="Heal anamorphic 1080p/720p"
 1260="Plus proche"
 1261="Lineaire"
 1262="Blend Deinterlace"
@@ -68,6 +69,9 @@
 1280="Plan"
 1281="Sphère"
 1282="Cylindre"
+1283="Cubemap"
+?1285="Track orientation"
+?1286="Track orientation (poor)"
 1300="Audio"
 1301="Aucun"
 1302="Audio/Video delay"
@@ -82,6 +86,9 @@
 1354="Taille De Police"
 1355="Parallaxe"
 ?1356="Text parser"
+1357="Placement"
+1358="En haut"
+1359="Au fond"
 ?1360="Plain text"
 ?1361="Lite HTML"
 1400="Changer la sortie"
@@ -101,6 +108,7 @@
 ?1508="About system"
 ?1509="Scale Interface"
 1510="Raccourcis"
+1511="Paramètres"
 1520="Maintenant"
 1521="Chaque Jour"
 1522="Chaque Mois"
@@ -235,3 +243,4 @@
 ?6054="Y Rotation - right"
 ?6055="X Rotation - up"
 ?6056="X Rotation - down"
+6057="Activer / désactiver le mode panorama"

sview-15_08.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng Changed

@@ -23,7 +23,7 @@
 1109="Beenden"
 1110="Einer Datei"
 1111="Zwei Dateien"
-1130="Autoerkennung"
+1130="Quelle"
 1131="Mono"
 1132="Schielend"
 1133="Parallel Pair"
@@ -50,7 +50,7 @@
 1205="Seitenverhältnis"
 1206="Glatte Filter"
 1207="Bildeinstellung"
-1208="Oberfläche"
+1208="Panorama"
 1210="Stereo"
 1211="Linke Bild"
 1212="Rechte Bild"
@@ -58,6 +58,7 @@
 1214="Cross-eyed"
 1250="Quelle"
 1251="Halten beim Neustart"
+?1252="Heal anamorphic 1080p/720p"
 1260="Nearest"
 1261="Linear"
 1262="Blend Deinterlace"
@@ -68,6 +69,9 @@
 1280="Fläche"
 1281="Kugel"
 1282="Zylinder"
+1283="Cubemap"
+?1285="Track orientation"
+?1286="Track orientation (poor)"
 1300="Audio"
 1301="keiner"
 1302="Audio/Video Verzögerung"
@@ -82,6 +86,9 @@
 1354="Schriftgröße"
 1355="Parallax"
 1356="Text parser"
+1357="Platzierungen"
+1358="Top"
+1359="Boden"
 1360="Plain text"
 1361="Lite HTML"
 1400="Gerät ändern"
@@ -101,6 +108,7 @@
 1508="Über System"
 1509="Maßstab Benutzeroberfläche"
 1510="Hotkeys"
+1511="Einstellungen"
 1520="jetzt"
 1521="täglich"
 1522="wöchentlich"
@@ -235,3 +243,4 @@
 6054="Y-Drehung - rechts"
 6055="X-Drehung - nach oben"
 6056="X-Drehung - nach unten"
+6057="Aktivieren / Deaktivieren der Panorama-Modus"

sview-15_08.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng Changed

sview-15_08.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng -> sview-15_10.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng Changed

@@ -23,7 +23,7 @@
 1109="Выход"
 1110="Из одного файла"
 1111="Левый+Правый файлы"
-1130="Автоопределение"
+1130="Исходный"
 1131="Моно"
 1132="Перекрёстная пара"
 1133="Параллельная пара"
@@ -59,6 +59,7 @@
 1140="Чередование кадров"
 1250="Исходное"
 1251="Запомнить"
+?1252="Heal anamorphic 1080p/720p"
 1260="Без сглаживания"
 1261="Линейное"
 1262="Blend Deinterlace"
@@ -69,6 +70,9 @@
 1280="Плоскость"
 1281="Сфера"
 1282="Цилиндр
+1283="Куб"
+1285="Отслеживать ориентацию"
+1286="Отслеживать ориентацию (poor)"
 1300="Аудио"
 1301="Без звука"
 1302="Задержка звука"
@@ -97,6 +101,7 @@
 1508="О системе"
 1509="Масштаб. интерфейса"
 1510="Горячие клавиши"
+1511="Настройки"
 1520="Сейчас"
 1521="Каждый день"
 1522="Каждую неделю"
@@ -109,6 +114,9 @@
 1354="Размер текста"
 1355="Параллакс"
 1356="Text parser"
+1357="Положение"
+1358="Сверху"
+1359="Снизу"
 1360="Plain text"
 1361="Lite HTML"
 1590="Мелко"
@@ -236,3 +244,4 @@
 6054="Y наклон - направо"
 6055="X наклон - наверх"
 6056="X наклон - вниз"
+6057="Включить/выключить панорамный режим"

sview-15_08.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp -> sview-15_10.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp Changed

sview-15_08.tar.gz/StOutAnaglyph/StOutAnaglyph.h -> sview-15_10.tar.gz/StOutAnaglyph/StOutAnaglyph.h Changed

sview-15_10.tar.gz/StOutAnaglyph/lang/czech Added

sview-15_10.tar.gz/StOutAnaglyph/lang/czech/StOutAnaglyph.lng Added

sview-15_10.tar.gz/StOutAnaglyph/lang/czech/language.lng Added

sview-15_08.tar.gz/StOutDistorted/StOutDistorted.cpp -> sview-15_10.tar.gz/StOutDistorted/StOutDistorted.cpp Changed

@@ -369,7 +369,7 @@
     aDevDistorted->PluginId = ST_OUT_PLUGIN_NAME;
     aDevDistorted->DeviceId = "Distorted";
     aDevDistorted->Priority = ST_DEVICE_SUPPORT_NONE;
-    aDevDistorted->Name     = aLangMap.changeValueId(STTR_DISTORTED_NAME, "Parallel Pair");
+    aDevDistorted->Name     = aLangMap.changeValueId(STTR_DISTORTED_NAME, "TV (parallel pair)");
     aDevDistorted->Desc     = aLangMap.changeValueId(STTR_DISTORTED_DESC, "Distorted Output");
     myDevices.add(aDevDistorted);
 
@@ -443,8 +443,11 @@
     StWindow::hide();
     if(isMovable()) {
         StWindow::setFullScreen(false);
-        mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getPlacement());
     }
+}
+
+void StOutDistorted::beforeClose() {
+    mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
 
     StRectI_t aMargins;
     aMargins.left()   = myBarMargins.left;
@@ -461,6 +464,7 @@
     if(myWasUsed) {
         mySettings->saveInt32(ST_SETTING_DEVICE_ID, myDevice);
     }
+    mySettings->flush();
 }
 
 StOutDistorted::~StOutDistorted() {
@@ -473,6 +477,8 @@
 }
 
 void StOutDistorted::close() {
+    beforeClose();
+
 #ifdef ST_HAVE_LIBOVR
     if(myOvrHmd != NULL) {
         ovrHmd_Destroy(myOvrHmd);

sview-15_08.tar.gz/StOutDistorted/StOutDistorted.h -> sview-15_10.tar.gz/StOutDistorted/StOutDistorted.h Changed

sview-15_08.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/czech Added

sview-15_10.tar.gz/StOutDistorted/lang/czech/StOutDistorted.lng Added

sview-15_10.tar.gz/StOutDistorted/lang/czech/language.lng Added

sview-15_08.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng Changed

sview-15_08.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng Changed

sview-15_08.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng Changed

sview-15_08.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng Changed

sview-15_08.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng -> sview-15_10.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng Changed

sview-15_08.tar.gz/StOutDual/StOutDual.cpp -> sview-15_10.tar.gz/StOutDual/StOutDual.cpp Changed

sview-15_08.tar.gz/StOutDual/StOutDual.h -> sview-15_10.tar.gz/StOutDual/StOutDual.h Changed

sview-15_10.tar.gz/StOutDual/lang/czech Added

sview-15_10.tar.gz/StOutDual/lang/czech/StOutDual.lng Added

sview-15_10.tar.gz/StOutDual/lang/czech/language.lng Added

sview-15_08.tar.gz/StOutIZ3D/StOutIZ3D.cpp -> sview-15_10.tar.gz/StOutIZ3D/StOutIZ3D.cpp Changed

sview-15_08.tar.gz/StOutIZ3D/StOutIZ3D.h -> sview-15_10.tar.gz/StOutIZ3D/StOutIZ3D.h Changed

sview-15_10.tar.gz/StOutIZ3D/lang/czech Added

sview-15_10.tar.gz/StOutIZ3D/lang/czech/StOutIZ3D.lng Added

sview-15_10.tar.gz/StOutIZ3D/lang/czech/language.lng Added

sview-15_08.tar.gz/StOutInterlace/StOutInterlace.cpp -> sview-15_10.tar.gz/StOutInterlace/StOutInterlace.cpp Changed

@@ -276,8 +276,8 @@
 #endif
 
     // detect connected displays
-    bool myIsMonReversed = false;
-    StHandle<StMonitor> aMonInterlaced = StOutInterlace::getHInterlaceMonitor(aMonitors, myIsMonReversed);
+    bool isDummyReversed= false;
+    StHandle<StMonitor> aMonInterlaced = StOutInterlace::getHInterlaceMonitor(aMonitors, isDummyReversed);
     if(!aMonInterlaced.isNull()) {
         aDevRow->Priority = ST_DEVICE_SUPPORT_PREFER;
     }
@@ -300,7 +300,7 @@
         StMonitor aMonitor = aMonitors[aRect.center()];
         if(params.BindToMon->getValue()
         && !aMonInterlaced.isNull()
-        && !isInterlacedMonitor(aMonitor, myIsMonReversed)) {
+        && !isInterlacedMonitor(aMonitor, isDummyReversed)) {
             aMonitor = *aMonInterlaced;
         }
         if(isLoadedPosition) {
@@ -320,6 +320,13 @@
         StWindow::setPlacement(aRect);
     }
 
+    // setup myIsMonReversed value for actual placement
+    if(!aMonInterlaced.isNull()) {
+        myIsMonReversed = false;
+        StMonitor aMonitor = aMonitors[StWindow::getPlacement().center()];
+        isInterlacedMonitor(aMonitor, myIsMonReversed);
+    }
+
     // load device settings
     mySettings->loadInt32(ST_SETTING_DEVICE_ID, myDevice);
     if(myDevice == DEVICE_AUTO) {
@@ -354,11 +361,7 @@
     StWindow::hide();
     if(isMovable()) {
         StWindow::setFullScreen(false);
-        mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getPlacement());
     }
-    mySettings->saveParam(ST_SETTING_BIND_MONITOR, params.BindToMon);
-    mySettings->saveParam(ST_SETTING_REVERSE,      params.ToReverse);
-    mySettings->saveInt32(ST_SETTING_DEVICE_ID,    myDevice);
 }
 
 StOutInterlace::~StOutInterlace() {
@@ -374,6 +377,12 @@
 }
 
 void StOutInterlace::beforeClose() {
+    mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+    mySettings->saveParam(ST_SETTING_BIND_MONITOR, params.BindToMon);
+    mySettings->saveParam(ST_SETTING_REVERSE,      params.ToReverse);
+    mySettings->saveInt32(ST_SETTING_DEVICE_ID,    myDevice);
+    mySettings->flush();
+
     // process exit from StApplication
     if((myDevice == DEVICE_HINTERLACE_ED) && myIsEDactive) {
         // disactivate eDimensional shuttered glasses
@@ -433,7 +442,7 @@
     if(!aShaderRow.init(*myContext,
                         ST_SHADER_TEMPLATE[0],
                         // drop odd horizontal line (starts from bottom)
-                        "if(int(mod(gl_FragCoord.y + 1.5, 2.0)) == 1) { discard; }\n",
+                        "if(int(mod(gl_FragCoord.y - 1023.5, 2.0)) != 1) { discard; }\n",
                         ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -441,7 +450,7 @@
     } else if(!aShaderRowRev.init(*myContext,
                                   ST_SHADER_TEMPLATE[0],
               // drop even horizontal line (starts from bottom)
-              "if(int(mod(gl_FragCoord.y + 1.5, 2.0)) != 1) { discard; }\n",
+              "if(int(mod(gl_FragCoord.y - 1023.5, 2.0)) == 1) { discard; }\n",
               ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -464,7 +473,7 @@
     if(!aShaderCol.init(*myContext,
                         ST_SHADER_TEMPLATE[0],
                         // drop odd column (starts from left)
-                        "if(int(mod(gl_FragCoord.x + 1.5, 2.0)) != 1) { discard; }\n",
+                        "if(int(mod(gl_FragCoord.x - 1023.5, 2.0)) == 1) { discard; }\n",
                         ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -472,7 +481,7 @@
     } else if(!aShaderColRev.init(*myContext,
                                   ST_SHADER_TEMPLATE[0],
               // drop even column (starts from left)
-              "if(int(mod(gl_FragCoord.x + 1.5, 2.0)) == 1) { discard; }\n",
+              "if(int(mod(gl_FragCoord.x - 1023.5, 2.0)) != 1) { discard; }\n",
               ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
         myIsBroken = true;
@@ -494,8 +503,8 @@
     StGLAutoRelease aTmp7(*myContext, aShaderChessRev);
     if(!aShaderChess.init(*myContext,
                           ST_SHADER_TEMPLATE[0],
-                          "bool isEvenX = int(mod(floor(gl_FragCoord.x + 1.5), 2.0)) == 1;\n"
-                          "bool isEvenY = int(mod(floor(gl_FragCoord.y + 1.5), 2.0)) != 1;\n"
+                          "bool isEvenX = int(mod(floor(gl_FragCoord.x - 1023.5), 2.0)) != 1;\n"
+                          "bool isEvenY = int(mod(floor(gl_FragCoord.y - 1023.5), 2.0)) == 1;\n"
                           "if((isEvenX && isEvenY) || (!isEvenX && !isEvenY)) { discard; }\n",
                            ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
@@ -503,8 +512,8 @@
         return true;
     } else if(!aShaderChessRev.init(*myContext,
                                     ST_SHADER_TEMPLATE[0],
-              "bool isEvenX = int(mod(floor(gl_FragCoord.x + 1.5), 2.0)) == 1;\n"
-              "bool isEvenY = int(mod(floor(gl_FragCoord.y + 1.5), 2.0)) != 1;\n"
+              "bool isEvenX = int(mod(floor(gl_FragCoord.x - 1023.5), 2.0)) != 1;\n"
+              "bool isEvenY = int(mod(floor(gl_FragCoord.y - 1023.5), 2.0)) == 1;\n"
               "if(!((isEvenX && isEvenY) || (!isEvenX && !isEvenY))) { discard; }\n",
               ST_SHADER_TEMPLATE[2])) {
         myMsgQueue->pushError(aShadersError);
@@ -850,20 +859,21 @@
     const StSearchMonitors& aMonitors = StWindow::getMonitors();
     StRectI_t aRect = StWindow::getPlacement();
     StMonitor aMon  = aMonitors[aRect.center()];
-    StHandle<StMonitor> anInterlacedMon = StOutInterlace::getHInterlaceMonitor(aMonitors, myIsMonReversed);
-
-    if(isMovable()) {
+    if(isInterlacedMonitor(aMon, myIsMonReversed)
+    || !isMovable()) {
         return;
     }
 
-    if(!anInterlacedMon.isNull()
-    && !isInterlacedMonitor(aMon, myIsMonReversed)) {
-        int aWidth  = aRect.width();
-        int aHeight = aRect.height();
-        aRect.left()   = anInterlacedMon->getVRect().left() + 256;
-        aRect.right()  = aRect.left() + aWidth;
-        aRect.top()    = anInterlacedMon->getVRect().top() + 256;
-        aRect.bottom() = aRect.top() + aHeight;
-        StWindow::setPlacement(aRect);
+    StHandle<StMonitor> anInterlacedMon = StOutInterlace::getHInterlaceMonitor(aMonitors, myIsMonReversed);
+    if(anInterlacedMon.isNull()) {
+        return;
     }
+
+    int aWidth  = aRect.width();
+    int aHeight = aRect.height();
+    aRect.left()   = anInterlacedMon->getVRect().left() + 256;
+    aRect.right()  = aRect.left() + aWidth;
+    aRect.top()    = anInterlacedMon->getVRect().top() + 256;
+    aRect.bottom() = aRect.top() + aHeight;
+    StWindow::setPlacement(aRect);
 }

sview-15_10.tar.gz/StOutInterlace/lang/czech Added

sview-15_10.tar.gz/StOutInterlace/lang/czech/StOutInterlace.lng Added

sview-15_10.tar.gz/StOutInterlace/lang/czech/language.lng Added

sview-15_08.tar.gz/StOutPageFlip/StOutPageFlip.cpp -> sview-15_10.tar.gz/StOutPageFlip/StOutPageFlip.cpp Changed

sview-15_08.tar.gz/StOutPageFlip/StOutPageFlip.h -> sview-15_10.tar.gz/StOutPageFlip/StOutPageFlip.h Changed

sview-15_08.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp -> sview-15_10.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp Changed

sview-15_08.tar.gz/StOutPageFlip/StOutPageFlipExt.h -> sview-15_10.tar.gz/StOutPageFlip/StOutPageFlipExt.h Changed

sview-15_10.tar.gz/StOutPageFlip/lang/czech Added

sview-15_10.tar.gz/StOutPageFlip/lang/czech/StOutPageFlip.lng Added

sview-15_10.tar.gz/StOutPageFlip/lang/czech/language.lng Added

sview-15_10.tar.gz/StShared/StAVVideoMuxer.cpp Added

@@ -0,0 +1,349 @@
+/**
+ * Copyright © 2015 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
+ */
+
+#include <StAV/StAVVideoMuxer.h>
+
+#include <StAV/StAVPacket.h>
+#include <StStrings/StLogger.h>
+#include <StFile/StFileNode.h>
+
+#include <vector>
+
+StAVVideoMuxer::StAVVideoMuxer()
+: myStereoFormat(StFormat_Mono) {
+    //
+}
+
+StAVVideoMuxer::~StAVVideoMuxer() {
+    close();
+}
+
+void StAVVideoMuxer::close() {
+    for(size_t aCtxId = 0; aCtxId < myCtxListSrc.size(); ++aCtxId) {
+        AVFormatContext*& aFormatCtx = myCtxListSrc[aCtxId];
+        if(aFormatCtx != NULL) {
+        #if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0))
+            avformat_close_input(&aFormatCtx);
+        #else
+            av_close_input_file(aFormatCtx);
+        #endif
+        }
+    }
+    myCtxListSrc.clear();
+}
+
+bool StAVVideoMuxer::addFile(const StString& theFileToLoad) {
+    StString aFileName, aDummy;
+    StFileNode::getFolderAndFile(theFileToLoad, aDummy, aFileName);
+
+    AVFormatContext* aFormatCtx = NULL;
+#if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0))
+    int avErrCode = avformat_open_input(&aFormatCtx, theFileToLoad.toCString(), NULL, NULL);
+#else
+    int avErrCode = av_open_input_file (&aFormatCtx, theFileToLoad.toCString(), NULL, 0, NULL);
+#endif
+    if(avErrCode != 0) {
+        signals.onError(StString("FFmpeg: Couldn't open video file '") + theFileToLoad
+                      + "'\nError: " + stAV::getAVErrorDescription(avErrCode));
+        if(aFormatCtx != NULL) {
+        #if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0))
+            avformat_close_input(&aFormatCtx);
+        #else
+            av_close_input_file(aFormatCtx);
+        #endif
+        }
+        return false;
+    }
+
+    // retrieve stream information
+#if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0))
+    if(avformat_find_stream_info(aFormatCtx, NULL) < 0) {
+#else
+    if(av_find_stream_info(aFormatCtx) < 0) {
+#endif
+        signals.onError(StString("FFmpeg: Couldn't find stream information in '") + theFileToLoad + "'");
+        if(aFormatCtx != NULL) {
+        #if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0))
+            avformat_close_input(&aFormatCtx);
+        #else
+            av_close_input_file(aFormatCtx); // close video file at all
+        #endif
+        }
+        return false;
+    }
+
+#ifdef ST_DEBUG
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 101, 0))
+    av_dump_format(aFormatCtx, 0, theFileToLoad.toCString(), false);
+#else
+    dump_format   (aFormatCtx, 0, theFileToLoad.toCString(), false);
+#endif
+#endif
+
+    myCtxListSrc.add(aFormatCtx);
+    return true;
+}
+
+class StAVOutContext {
+
+        public:
+
+    AVFormatContext* Context;
+
+    /**
+     * Empty constructor.
+     */
+    StAVOutContext() : Context(NULL), myFormat(NULL) {}
+
+    /**
+     * Determine the format.
+     */
+    bool findFormat(const char* theShortName,
+                    const char* theFilename,
+                    const char* theMimeType = NULL) {
+        myFormat = av_guess_format(theShortName, theFilename, theMimeType);
+        return myFormat != NULL;
+    }
+
+    /**
+     * Create context.
+     */
+    bool create(const StString& theFile) {
+        if(myFormat == NULL) {
+            return false;
+        }
+
+    #if !defined(ST_LIBAV_FORK)
+        avformat_alloc_output_context2(&Context, myFormat, NULL, theFile.toCString());
+    #else
+        Context = avformat_alloc_context();
+        if(Context == NULL) {
+            return false;
+        }
+
+        Context->oformat = myFormat;
+        if(Context->oformat->priv_data_size > 0) {
+            Context->priv_data = av_mallocz(Context->oformat->priv_data_size);
+            if(!Context->priv_data) {
+                //goto nomem;
+            }
+            if(Context->oformat->priv_class) {
+                *(const AVClass**)Context->priv_data = Context->oformat->priv_class;
+                //av_opt_set_defaults(aCtxOut->priv_data);
+            }
+        } else {
+            Context->priv_data = NULL;
+        }
+
+        const size_t aStrLen = stMin(theFile.Size + 1, size_t(1024));
+        stMemCpy(Context->filename, theFile.toCString(), aStrLen);
+        Context->filename[1023] = '\0';
+    #endif
+        return Context != NULL;
+    }
+
+    /**
+     * Destructor.
+     */
+    ~StAVOutContext() {
+        if(Context == NULL) {
+            return;
+        }
+
+        if(!(Context->oformat->flags & AVFMT_NOFILE)) {
+            avio_close(Context->pb);
+        }
+        avformat_free_context(Context);
+    }
+
+        private:
+
+    AVOutputFormat* myFormat;
+
+};
+
+/**
+ * Return string identifier for specified stereo format.
+ */
+const char* formatToMetadata(const StFormat theFormat) {
+    switch(theFormat) {
+        case StFormat_Mono:                 return "mono";
+        case StFormat_SideBySide_RL:        return "right_left";
+        case StFormat_SideBySide_LR:        return "left_right";
+        case StFormat_TopBottom_RL:         return "bottom_top";
+        case StFormat_TopBottom_LR:         return "top_bottom";
+        case StFormat_Rows:                 return "row_interleaved_lr";
+        case StFormat_Columns:              return "col_interleaved_lr";
+        case StFormat_FrameSequence:        return "block_lr";
+        case StFormat_AnaglyphRedCyan:      return "anaglyph_cyan_red";
+        case StFormat_AnaglyphGreenMagenta: return "anaglyph_green_magenta";
+        case StFormat_AUTO:
+        case StFormat_SeparateFrames:
+        case StFormat_AnaglyphYellowBlue:
+        case StFormat_Tiled4x:
+        case StFormat_NB:
+            return NULL;
+    }
+    return NULL;
+}
+
+bool StAVVideoMuxer::addStream(AVFormatContext* theContext,
+                               const AVStream*  theStream) {
+    AVStream* aStreamOut = avformat_new_stream(theContext, theStream->codec->codec);
+    if(aStreamOut == NULL) {
+        signals.onError(StString("Failed allocating output stream."));
+        return false;
+    }
+    if(avcodec_copy_context(aStreamOut->codec, theStream->codec) < 0) {
+        signals.onError(StString("Failed to copy context from input to output stream codec context."));
+        return false;
+    }
+    av_dict_copy(&aStreamOut->metadata, theStream->metadata, AV_DICT_DONT_OVERWRITE);
+//#if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 100))
+//    myIsAttachedPic = (theStream->disposition & AV_DISPOSITION_ATTACHED_PIC) != 0;
+//#endif
+    if(theStream->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+        aStreamOut->sample_aspect_ratio        = theStream->sample_aspect_ratio;
+        aStreamOut->codec->sample_aspect_ratio = aStreamOut->sample_aspect_ratio;
+    }
+
+    if(theContext->oformat->flags & AVFMT_GLOBALHEADER) {
+        aStreamOut->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+    }
+    return true;
+}
+
+bool StAVVideoMuxer::save(const StString& theFile) {
+    if(myCtxListSrc.isEmpty()
+    || theFile.isEmpty()) {
+        return false;
+    }
+
+    StString aFormatName = myCtxListSrc[0]->iformat->name;
+    const char* aFormatStr = formatToMetadata(myStereoFormat);
+
+    std::vector<StRemuxContext> aSrcCtxList;
+    //StArrayList<StRemuxContext> aSrcCtxList;
+    unsigned int aStreamCount = 0;
+
+    StAVOutContext aCtxOut;
+    if(!aCtxOut.findFormat(NULL, theFile.toCString())) {
+        signals.onError(StString("Unable to find a suitable output format for '") + theFile + "'.");
+        return false;
+    } else if(!aCtxOut.create(theFile)) {
+        signals.onError(StString("Could not create output context."));
+        return false;
+    }
+
+    for(size_t aCtxId = 0; aCtxId < myCtxListSrc.size(); ++aCtxId) {
+        StRemuxContext aCtxSrc;
+        aCtxSrc.Context = myCtxListSrc[aCtxId];
+        if(aCtxId == 0) {
+            av_dict_copy(&aCtxOut.Context->metadata, aCtxSrc.Context->metadata, AV_DICT_DONT_OVERWRITE);
+            av_dict_set(&aCtxOut.Context->metadata, "STEREO_MODE", aFormatStr, 0);
+        }
+        for(unsigned int aStreamId = 0; aStreamId < aCtxSrc.Context->nb_streams; ++aStreamId) {
+            aCtxSrc.Streams.add((unsigned int )-1);
+            AVStream* aStreamSrc = aCtxSrc.Context->streams[aStreamId];
+            if(aStreamSrc->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                if(addStream(aCtxOut.Context, aStreamSrc)) {
+                    aCtxSrc.Streams[aStreamId] = aStreamCount++;
+                }
+            }
+        }
+        aSrcCtxList.push_back(aCtxSrc);
+    }
+
+    // add audio streams after video
+    for(size_t aCtxId = 0; aCtxId < myCtxListSrc.size(); ++aCtxId) {
+        StRemuxContext& aCtxSrc = aSrcCtxList[aCtxId];
+        for(unsigned int aStreamId = 0; aStreamId < aCtxSrc.Context->nb_streams; ++aStreamId) {
+            AVStream* aStreamSrc = aCtxSrc.Context->streams[aStreamId];
+            if(aStreamSrc->codec->codec_type == AVMEDIA_TYPE_AUDIO
+            && addStream(aCtxOut.Context, aStreamSrc)) {
+                aCtxSrc.Streams[aStreamId] = aStreamCount++;
+            }
+        }
+    }
+
+    // add other streams (subtitles) at the end
+    for(size_t aCtxId = 0; aCtxId < myCtxListSrc.size(); ++aCtxId) {
+        StRemuxContext& aCtxSrc = aSrcCtxList[aCtxId];
+        for(unsigned int aStreamId = 0; aStreamId < aCtxSrc.Context->nb_streams; ++aStreamId) {
+            AVStream* aStreamSrc = aCtxSrc.Context->streams[aStreamId];
+            if(aStreamSrc->codec->codec_type != AVMEDIA_TYPE_VIDEO
+            && aStreamSrc->codec->codec_type != AVMEDIA_TYPE_AUDIO
+            && addStream(aCtxOut.Context, aStreamSrc)) {
+                aCtxSrc.Streams[aStreamId] = aStreamCount++;
+            }
+        }
+    }
+
+    av_dump_format(aCtxOut.Context, 0, theFile.toCString(), 1);
+    if(!(aCtxOut.Context->oformat->flags & AVFMT_NOFILE)) {
+        const int aState = avio_open2(&aCtxOut.Context->pb, theFile.toCString(), AVIO_FLAG_WRITE, NULL, NULL);
+        if(aState < 0) {
+            signals.onError(StString("Could not open output file '") + theFile + "' (" + stAV::getAVErrorDescription(aState) + ")");
+            return false;
+        }
+    }
+
+    int aState = avformat_write_header(aCtxOut.Context, NULL);
+    if(aState < 0) {
+        signals.onError(StString("Error occurred when opening output file (") + stAV::getAVErrorDescription(aState) + ").");
+        return false;
+    }
+
+    AVPacket aPacket;
+    for(;;) {
+        size_t aNbEmpty = 0;
+        for(size_t aCtxId = 0; aCtxId < aSrcCtxList.size(); ++aCtxId) {
+            StRemuxContext& aCtxSrc = aSrcCtxList[aCtxId];
+            if(!aCtxSrc.State) {
+                ++aNbEmpty;
+                continue;
+            }
+
+            if(av_read_frame(aCtxSrc.Context, &aPacket) < 0) {
+                aCtxSrc.State = false;
+                ++aNbEmpty;
+                continue;
+            }
+
+            unsigned int aStreamOutIndex = aCtxSrc.Streams[aPacket.stream_index];
+            if(aStreamOutIndex == (unsigned int )-1) {
+                continue;
+            }
+
+            AVStream* aStreamIn  = aCtxSrc.Context->streams[aPacket.stream_index];
+            AVStream* aStreamOut = aCtxOut.Context->streams[aStreamOutIndex];
+
+        #ifdef ST_LIBAV_FORK
+            const AVRounding aRoundParams = AV_ROUND_NEAR_INF;
+        #else
+            const AVRounding aRoundParams = AVRounding(AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
+        #endif
+            aPacket.pts      = av_rescale_q_rnd(aPacket.pts, aStreamIn->time_base, aStreamOut->time_base, aRoundParams);
+            aPacket.dts      = av_rescale_q_rnd(aPacket.dts, aStreamIn->time_base, aStreamOut->time_base, aRoundParams);
+            aPacket.duration = static_cast<int >(av_rescale_q(aPacket.duration, aStreamIn->time_base, aStreamOut->time_base));
+            aPacket.pos      = -1;
+
+            aState = av_interleaved_write_frame(aCtxOut.Context, &aPacket);
+            if(aState < 0) {
+                signals.onError(StString("Error muxing packet (") + stAV::getAVErrorDescription(aState) + ").");
+                return false;
+            }
+            av_free_packet(&aPacket);
+        }
+        if(aNbEmpty == aSrcCtxList.size()) {
+            break;
+        }
+    }
+    av_write_trailer(aCtxOut.Context);
+    return true;
+}

sview-15_08.tar.gz/StShared/StConfigImpl.cpp -> sview-15_10.tar.gz/StShared/StConfigImpl.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov
+ * Copyright © 2007-2015 Kirill Gavrilov
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -8,22 +8,6 @@
 
 #include <StSettings/StSettings.h>
 
-/*#if defined(__ANDROID__)
-
-bool StSettings::load() { return true; }
-bool StSettings::save() { return false; }
-StSettings::StSettings(const StString& theSettingsSet) {}
-StSettings::~StSettings() {}
-bool StSettings::loadInt32 (const StString& ,
-                            int32_t&        ) { return false; }
-bool StSettings::saveInt32 (const StString& ,
-                            const int32_t&  ) { return false; }
-bool StSettings::loadString(const StString& ,
-                            StString&       ) { return false; }
-bool StSettings::saveString(const StString& ,
-                            const StString& ) { return false; }
-
-#elif !defined(_WIN32) && !defined(__APPLE__)*/
 #if !defined(_WIN32) && !defined(__APPLE__)
 
 #include <StStrings/StLogger.h>
@@ -36,43 +20,65 @@
 using namespace libconfig;
 
 bool StSettings::load() {
-    if(myIsLoaded) {
-        return true;
+    if(myFullFileName.isEmpty()
+    || !StFileNode::isFileExists(myFullFileName)) {
+        myIsLoaded = false;
+        ST_DEBUG_LOG("StSettings, file " + myFullFileName + " does not exist");
+        return false;
     }
 
     try {
-        myConfig->readFile(myFullFileName.toCString()); // load the configuration
+        myConfig->readFile(myFullFileName.toCString());
+        myIsLoaded = true;
+        return true;
     } catch(...) {
-        ST_DEBUG_LOG("StSettings, failed to parse " + myFullFileName);
+        //
+    }
+
+    // the only option to recover?
+    delete myConfig;
+    myConfig = new Config();
+    ST_ERROR_LOG("StSettings, failed to parse " + myFullFileName);
+    if(!StFileNode::removeFile(myFullFileName)) {
+        ST_ERROR_LOG("StSettings, file " + myFullFileName + " can not be removed");
         return false;
     }
-    return true;
+    return false;
 }
 
-bool StSettings::save() {
+bool StSettings::flush() {
+    if(!myToFlush) {
+        return true;
+    }
+
     try {
         myConfig->writeFile(myFullFileName.toCString());
     } catch(...) {
         ST_DEBUG_LOG("StSettings, failed write to " + myFullFileName);
         return false;
     }
+
+    myToFlush = false;
     return true;
 }
 
 StSettings::StSettings(const StHandle<StResourceManager>& theResMgr,
                        const StString&                    theSettingsSet)
 : myConfig(new Config()),
-  myIsLoaded(false) {
+  myIsLoaded(false),
+  myToFlush(false) {
     myFullFileName = theResMgr->getSettingsFolder() + theSettingsSet + ".cfg";
+    load();
 }
 
 StSettings::~StSettings() {
+    flush();
     delete myConfig;
 }
 
 bool StSettings::loadInt32(const StString& theParamPath,
                            int32_t&        theValue) {
-    if(!load()) {
+    if(!myIsLoaded) {
         return false;
     }
     try {
@@ -105,9 +111,8 @@
 
 bool StSettings::saveInt32(const StString& theParamPath,
                            const int32_t&  theValue) {
-    bool isLoaded = load(); // try to load config firstly
     try {
-        if(!isLoaded || !myConfig->exists(theParamPath.toCString())) {
+        if(!myConfig->exists(theParamPath.toCString())) {
             Setting& aRoot = myConfig->getRoot();
             StString aParamGroup, aParamName;
             if(groupName(theParamPath, aParamGroup, aParamName)) {
@@ -126,7 +131,6 @@
             );*/
         }
         myConfig->lookup(theParamPath.toCString()) = theValue;
-        save();
     } catch(ParseException& ex) {
         ST_DEBUG_LOG("StSettings, error on line " + ex.getLine() + ": " + ex.getError());
         return false;
@@ -137,12 +141,13 @@
         ST_DEBUG_LOG("StSettings[" + theParamPath + "], config exception!");
         return false;
     }
+    myToFlush = true;
     return true;
 }
 
 bool StSettings::loadString(const StString& theParamPath,
                             StString&       theValue) {
-    if(!load()) {
+    if(!myIsLoaded) {
         return false;
     }
     try {
@@ -161,9 +166,8 @@
 
 bool StSettings::saveString(const StString& theParamPath,
                             const StString& theValue) {
-    bool isLoaded = load(); // try to load config firstly
     try {
-        if(!isLoaded || !myConfig->exists(theParamPath.toCString())) {
+        if(!myConfig->exists(theParamPath.toCString())) {
             Setting& aRoot = myConfig->getRoot();
             StString aParamGroup, aParamName;
             if(groupName(theParamPath, aParamGroup, aParamName)) {
@@ -182,7 +186,6 @@
             );*/
         }
         myConfig->lookup(theParamPath.toCString()) = theValue.toCString();
-        save();
     } catch(ParseException& ex) {
         ST_DEBUG_LOG("StSettings, error on line " + ex.getLine() + ": " + ex.getError());
         return false;
@@ -193,6 +196,7 @@
         ST_DEBUG_LOG("StSettings[" + theParamPath + "], config exception!");
         return false;
     }
+    myToFlush = true;
     return true;
 }

sview-15_08.tar.gz/StShared/StFileNode.cpp -> sview-15_10.tar.gz/StShared/StFileNode.cpp Changed

sview-15_08.tar.gz/StShared/StGLContext.cpp -> sview-15_10.tar.gz/StShared/StGLContext.cpp Changed

@@ -19,6 +19,8 @@
 #include <StStrings/StDictionary.h>
 #include <StStrings/StLogger.h>
 
+#include <StTemplates/StQuaternion.h>
+
 #include <stAssert.h>
 
 #if defined(__APPLE__)
@@ -51,10 +53,12 @@
   arbTexRG(false),
   arbTexClear(false),
 #if defined(GL_ES_VERSION_2_0)
+  hasUnpack(false),
   hasHighp(false),
   hasTexRGBA8(false),
   extTexBGRA8(false),
 #else
+  hasUnpack(true),
   hasHighp(true),
   hasTexRGBA8(true), // always available on desktop
   extTexBGRA8(true),
@@ -101,12 +105,14 @@
   arbTexRG(false),
   arbTexClear(false),
 #if defined(GL_ES_VERSION_2_0)
+  hasUnpack(false),
   hasHighp(false),
   hasTexRGBA8(false),
   extTexBGRA8(false),
 #else
+  hasUnpack(true), // always available on desktop
   hasHighp(true),
-  hasTexRGBA8(true), // always available on desktop
+  hasTexRGBA8(true),
   extTexBGRA8(true),
 #endif
   extAll(NULL),
@@ -508,6 +514,16 @@
                    StString() + (aDedicatedFree / 1024)  + " MiB (from " + (aDedicated / 1024) + " MiB)"));
     }
 #endif
+
+#if !defined(GL_ES_VERSION_2_0) && !defined(__APPLE__) && !defined(_WIN32)
+    // GLX_RENDERER_VENDOR_ID_MESA
+    if(myFuncs->glXQueryCurrentRendererIntegerMESA != NULL) {
+        unsigned int aVMemMiB = 0;
+        if(myFuncs->glXQueryCurrentRendererIntegerMESA(GLX_RENDERER_VIDEO_MEMORY_MESA, &aVMemMiB) != False) {
+            theMap.add(StDictEntry("GPU memory", StString() + aVMemMiB  + " MiB"));
+        }
+    }
+#endif
 }
 
 void StGLContext::stglSyncState() {
@@ -697,6 +713,12 @@
     if(stglCheckExtension(aGlxExts, "GLX_SGI_swap_control")) {
         STGL_READ_FUNC(glXSwapIntervalSGI);
     }
+    if(stglCheckExtension(aGlxExts, "GLX_MESA_query_renderer")) {
+        STGL_READ_FUNC(glXQueryRendererIntegerMESA);
+        STGL_READ_FUNC(glXQueryCurrentRendererIntegerMESA);
+        STGL_READ_FUNC(glXQueryRendererStringMESA);
+        STGL_READ_FUNC(glXQueryCurrentRendererStringMESA);
+    }
     extSwapTear = stglCheckExtension(aGlxExts, "GLX_EXT_swap_control_tear");
 #endif
 
@@ -712,6 +734,7 @@
                || stglCheckExtension("GL_EXT_texture_rg");
     const bool hasFBO = isGlGreaterEqual(2, 0)
                      || stglCheckExtension("GL_OES_framebuffer_object");
+    hasUnpack = isGlGreaterEqual(3, 0);
 
     if(isGlGreaterEqual(2, 0)) {
         // enable compatible functions
@@ -1632,3 +1655,12 @@
 
     return true;
 }
+
+template class StVec2<float>;
+template class StVec2<double>;
+template class StVec3<float>;
+template class StVec3<double>;
+template class StVec4<float>;
+template class StVec4<double>;
+template class StQuaternion<float>;
+template class StQuaternion<double>;

sview-15_08.tar.gz/StShared/StGLMatrix.cpp -> sview-15_10.tar.gz/StShared/StGLMatrix.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2011 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -17,7 +17,7 @@
         0.0f, 0.0f, 1.0f, 0.0f,
         0.0f, 0.0f, 0.0f, 1.0f
     };
-};
+}
 
 StGLMatrix::StGLMatrix() {
     initIdentity();
@@ -32,6 +32,29 @@
     return *this;
 }
 
+StGLMatrix::StGLMatrix(const StGLQuaternion& theQ) {
+    initIdentity();
+
+    float wx, wy, wz, xx, yy, yz, xy, xz, zz, x2, y2, z2;
+    float s = 2.0f / theQ.vec4().squareModulus();
+    x2 = theQ.x() * s;    y2 = theQ.y() * s;    z2 = theQ.z() * s;
+    xx = theQ.x() * x2;   xy = theQ.x() * y2;   xz = theQ.x() * z2;
+    yy = theQ.y() * y2;   yz = theQ.y() * z2;   zz = theQ.z() * z2;
+    wx = theQ.w() * x2;   wy = theQ.w() * y2;   wz = theQ.w() * z2;
+
+    changeValue(0, 0) = 1.0f - (yy + zz);
+    changeValue(0, 1) = xy - wz;
+    changeValue(0, 2) = xz + wy;
+
+    changeValue(1, 0) = xy + wz;
+    changeValue(1, 1) = 1.0f - (xx + zz);
+    changeValue(1, 2) = yz - wx;
+
+    changeValue(2, 0) = xz - wy;
+    changeValue(2, 1) = yz + wx;
+    changeValue(2, 2) = 1.0f - (xx + yy);
+}
+
 StGLMatrix::~StGLMatrix() {
     //
 }

sview-15_08.tar.gz/StShared/StGLTexture.cpp -> sview-15_10.tar.gz/StShared/StGLTexture.cpp Changed

@@ -564,7 +564,7 @@
     theCtx.core20fwd->glPixelStorei(GL_UNPACK_ALIGNMENT, GLint(anAligment));
 
     bool toBatchCopy = theData.getSizeX() <= size_t(getSizeX())
-                    && theBatchRows > 1;
+                    && theBatchRows != 1;
 
     size_t anExtraBytes       = theData.getRowExtraBytes();
     size_t aPixelsWidth       = theData.getSizeRowBytes() / theData.getSizePixelBytes();
@@ -576,42 +576,42 @@
         toBatchCopy  = false;
     }
 
-#if defined(GL_ES_VERSION_2_0)
-    if(anExtraBytes >= anAligment) {
+    if(!theCtx.hasUnpack
+    && anExtraBytes >= anAligment) {
         toBatchCopy = false;
     }
-#endif
+
     if(toBatchCopy) {
-    #if !defined(GL_ES_VERSION_2_0)
-        // notice that GL_UNPACK_ROW_LENGTH is not available on OpenGL ES 2.0 without GL_EXT_unpack_subimage extension!
-        theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, GLint(aPixelsWidth));
-    #endif
+        if(theCtx.hasUnpack) {
+            theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, GLint(aPixelsWidth));
+        }
 
         // do batch copy (more effective)
         GLsizei aPatchWidth = GLsizei(theData.getSizeX());
-        GLsizei aBatchRows = theBatchRows;
-        for(GLsizei aRow(theRowFrom), aRowsRemain(aRowTo); aRow < aRowTo; aRow += theBatchRows) {
+        GLsizei aBatchRows  = theBatchRows >= 1 ? theBatchRows : (aRowTo - theRowFrom);
+        GLsizei aNbRows     = aBatchRows;
+        for(GLsizei aRow(theRowFrom), aRowsRemain(aRowTo); aRow < aRowTo; aRow += aBatchRows) {
             aRowsRemain = aRowTo - aRow;
-            if(aRowsRemain < aBatchRows) {
-                aBatchRows = aRowsRemain;
+            if(aNbRows > aRowsRemain) {
+                aNbRows = aRowsRemain;
             }
 
             theCtx.core20fwd->glTexSubImage2D(theTarget, 0,     // 0 = LOD number
                                               0, aRow,          // a texel offset in the (x, y) direction
-                                              aPatchWidth, aBatchRows,
+                                              aPatchWidth, aNbRows,
                                               aPixelFormat,     // format of the pixel data
                                               aDataType,        // data type of the pixel data
                                               theData.getData(aRow, 0));
         }
 
-    #if !defined(GL_ES_VERSION_2_0)
-        theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    #endif
+        if(theCtx.hasUnpack) {
+            theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+        }
     } else {
         // copy row by row copy (the image plane greater than texture or batch copy is impossible)
-    #if !defined(GL_ES_VERSION_2_0)
-        theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    #endif
+        if(theCtx.hasUnpack) {
+            theCtx.core20fwd->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+        }
 
         GLsizei aPatchWidth = stMin(GLsizei(theData.getSizeX()), getSizeX());
         for(GLsizei aRow = theRowFrom; aRow < aRowTo; ++aRow) {

sview-15_08.tar.gz/StShared/StGLTextureData.cpp -> sview-15_10.tar.gz/StShared/StGLTextureData.cpp Changed

@@ -300,6 +300,31 @@
     return aBufferSize;
 }
 
+/**
+ * Determine packed cubemap format (6:1 or 3:2).
+ */
+inline bool checkCubeMap(const StImagePlane& thePlane,
+                         size_t&             theCoeffX,
+                         size_t&             theCoeffY) {
+    if(thePlane.isNull()) {
+        return true;
+    }
+
+    if(theCoeffX == 0) {
+        if(thePlane.getSizeX() / 6 == thePlane.getSizeY()) {
+            theCoeffX = 6;
+            theCoeffY = 1;
+            return true;
+        } else if(thePlane.getSizeX() / 3 == thePlane.getSizeY() / 2) {
+            theCoeffX = 3;
+            theCoeffY = 2;
+            return true;
+        }
+        return false;
+    }
+    return thePlane.getSizeX() / theCoeffX == thePlane.getSizeY() / theCoeffY;
+}
+
 void StGLTextureData::updateData(const StImage&                  theDataL,
                                  const StImage&                  theDataR,
                                  const StHandle<StStereoParams>& theStParams,
@@ -400,10 +425,11 @@
         }
     }
     if(myCubemapFormat == StCubemap_Packed) {
+        size_t aCoeffs[2] = {0, 0};
         if(!myDataL.isNull()) {
             for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
                 const StImagePlane& aPlane = myDataL.getPlane(aPlaneId);
-                if(aPlane.getSizeX() / 6 != aPlane.getSizeY()) {
+                if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
                     myCubemapFormat = StCubemap_OFF;
                     break;
                 }
@@ -412,7 +438,7 @@
         if(!myDataR.isNull()) {
             for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
                 const StImagePlane& aPlane = myDataR.getPlane(aPlaneId);
-                if(aPlane.getSizeX() / 6 != aPlane.getSizeY()) {
+                if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
                     myCubemapFormat = StCubemap_OFF;
                     break;
                 }
@@ -433,8 +459,13 @@
         return;
     }
 
-    size_t aPatchX = theData.getSizeX() / 6;
-    if(aPatchX < 2) {
+    size_t aCoeffs[2] = {0, 0};
+    if(!checkCubeMap(theData, aCoeffs[0], aCoeffs[1])) {
+        return;
+    }
+
+    const size_t aPatch = theData.getSizeX() / aCoeffs[0];
+    if(aPatch < 2) {
         return;
     }
 
@@ -446,8 +477,11 @@
                                  GL_TEXTURE_CUBE_MAP_NEGATIVE_Z };
     for(size_t aTargetIter = 0; aTargetIter < 6; ++aTargetIter) {
         StImagePlane aPlane;
-        if(!aPlane.initWrapper(theData.getFormat(), const_cast<GLubyte* >(theData.getData(0, aPatchX * aTargetIter)),
-                               aPatchX, theData.getSizeY(), theData.getSizeRowBytes())) {
+        const bool isSecondRow = (aCoeffs[1] == 2 && aTargetIter >= 3);
+        const size_t aLeft = isSecondRow ? (aPatch * (aTargetIter - 3)) : (aPatch * aTargetIter);
+        const size_t aTop  = isSecondRow ? aPatch : 0;
+        if(!aPlane.initWrapper(theData.getFormat(), const_cast<GLubyte* >(theData.getData(aTop, aLeft)),
+                               aPatch, aPatch, theData.getSizeRowBytes())) {
             ST_DEBUG_LOG("StGLTextureData::fillTexture(). wrapping failure");
             continue;
         }
@@ -506,8 +540,14 @@
         GLsizei aSizeX  = (GLsizei )anImgPlane.getSizeX();
         GLsizei aSizeY  = (GLsizei )anImgPlane.getSizeY();
         if(theCubemap == StCubemap_Packed) {
+            size_t aCoeffs[2] = {0, 0};
+            if(!checkCubeMap(anImgPlane, aCoeffs[0], aCoeffs[1])) {
+                aTexture.release(theCtx);
+                continue;
+            }
             aTarget = GL_TEXTURE_CUBE_MAP;
-            aSizeX  = aSizeX / 6;
+            aSizeX  = aSizeX / GLsizei(aCoeffs[0]);
+            aSizeY  = aSizeY / GLsizei(aCoeffs[1]);
         }
         if(aSizeX < 1) {
             aTexture.release(theCtx);

sview-15_08.tar.gz/StShared/StPListImpl.mm -> sview-15_10.tar.gz/StShared/StPListImpl.mm Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2011-2014 Kirill Gavrilov
+ * Copyright © 2011-2015 Kirill Gavrilov
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -35,25 +35,32 @@
     return true;
 }
 
-bool StSettings::save() {
+bool StSettings::flush() {
+    if(!myToFlush) {
+        return true;
+    }
+
     StCocoaLocalPool aLocalPool;
     StCocoaString aPath(myFilePath);
     if([myDict writeToFile: aPath.toStringNs() atomically: NO] == NO) {
         ST_DEBUG_LOG("StConfig, failed write to " + myFilePath);
         return false;
     }
+
+    myToFlush = false;
     return true;
 }
 
 StSettings::StSettings(const StHandle<StResourceManager>& theResMgr,
                        const StString&                    theSettingsSet)
-: myDict(NULL){
+: myDict(NULL),
+  myToFlush(false) {
     myFilePath = theResMgr->getSettingsFolder() + theSettingsSet + ".plist";
     load();
 }
 
 StSettings::~StSettings() {
-    save();
+    flush();
     [myDict release];
 }
 
@@ -76,7 +83,8 @@
     NSNumber* aNumber = [[NSNumber alloc] initWithInt: theValue];
     [myDict setObject: aNumber forKey: aPath.toStringNs()];
     [aNumber release];
-    return save();
+    myToFlush = true;
+    return true;
 }
 
 bool StSettings::loadString(const StString& theParamPath,
@@ -98,7 +106,8 @@
     StCocoaString aPath(theParamPath);
     StCocoaString aValue(theValue);
     [myDict setObject: aValue.toStringNs() forKey: aPath.toStringNs()];
-    return save();
+    myToFlush = true;
+    return true;
 }
 
 #endif // __APPLE__

sview-15_08.tar.gz/StShared/StPlayList.cpp -> sview-15_10.tar.gz/StShared/StPlayList.cpp Changed

sview-15_08.tar.gz/StShared/StRegisterImpl.cpp -> sview-15_10.tar.gz/StShared/StRegisterImpl.cpp Changed

sview-15_08.tar.gz/StShared/StResourceManager.cpp -> sview-15_10.tar.gz/StShared/StResourceManager.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -100,6 +100,11 @@
         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);
@@ -117,6 +122,23 @@
             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) {
@@ -154,6 +176,12 @@
     myUserDataFolder = myUserHomeFolder + "Library/Application Support/" + myAppName + "/";
     mySettingsFolder = myUserHomeFolder + "Library/Preferences/"         + myAppName + "/";
     myCacheFolder    = myUserHomeFolder + "Library/Caches/"              + myAppName + "/";
+
+    myFolders[FolderId_Downloads] = myUserHomeFolder + "Downloads";
+    myFolders[FolderId_Pictures]  = myUserHomeFolder + "Pictures";
+    myFolders[FolderId_Music]     = myUserHomeFolder + "Music";
+    myFolders[FolderId_Videos]    = myUserHomeFolder + "Movies";
+
     // make sure parent paths are also exist (on broken home)
     StFolder::createFolder(myUserHomeFolder + "Library");
     StFolder::createFolder(myUserHomeFolder + "Library/Application Support");
@@ -164,6 +192,12 @@
     myUserDataFolder = myUserHomeFolder + ".local/share/" + myAppName + "/";
     mySettingsFolder = myUserHomeFolder + ".config/"      + myAppName + "/";
     myCacheFolder    = myUserHomeFolder + ".cache/"       + myAppName + "/";
+
+    myFolders[FolderId_Downloads] = myUserHomeFolder + "Downloads";
+    myFolders[FolderId_Pictures]  = myUserHomeFolder + "Pictures";
+    myFolders[FolderId_Music]     = myUserHomeFolder + "Music";
+    myFolders[FolderId_Videos]    = myUserHomeFolder + "Videos";
+
     // make sure parent paths are also exist (on broken home)
     StFolder::createFolder(myUserHomeFolder + ".local");
     StFolder::createFolder(myUserHomeFolder + ".local/share");
@@ -192,6 +226,8 @@
         myLang = "ko";
     } else if(aSysLoc.isStartsWith(stCString("chinese"))) {
         myLang = "zh";
+    } else if(aSysLoc.isStartsWith(stCString("czech"))) {
+        myLang = "cs";
     }
 #endif
 }

sview-15_08.tar.gz/StShared/StShared.cbp -> sview-15_10.tar.gz/StShared/StShared.cbp Changed

sview-15_08.tar.gz/StShared/StShared.vcxproj -> sview-15_10.tar.gz/StShared/StShared.vcxproj Changed

sview-15_08.tar.gz/StShared/StTranslations.cpp -> sview-15_10.tar.gz/StShared/StTranslations.cpp Changed

@@ -69,6 +69,10 @@
             params.language->changeValues().add("한국어");
             myLangFolderList.add("Korean");
         }
+        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Czech"  ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
+            params.language->changeValues().add("Čeština");
+            myLangFolderList.add("Czech");
+        }
     }
 #endif
 
@@ -113,6 +117,11 @@
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
+        } else if(aLang.isEqualsIgnoreCase(stCString("cs"))) {
+            if(myLangFolderList.contains(stCString("Čeština"), anIdInList)) {
+                params.language->setValue(int32_t(anIdInList));
+                isLangSet = true;
+            }
         }
     }
     if(!isLangSet) {
@@ -162,6 +171,8 @@
         myLangCode = "kor";
     } else if(aLang == stCString("简体中文")) {
         myLangCode = "chi";
+    } else if(aLang == stCString("Čeština")) {
+        myLangCode = "cze";
     } else if(aLang == stCString("English")) {
         myLangCode = "eng";
     } else {

sview-15_08.tar.gz/copy_res.bat -> sview-15_10.tar.gz/copy_res.bat Changed

sview-15_08.tar.gz/copy_res.sh -> sview-15_10.tar.gz/copy_res.sh Changed

sview-15_08.tar.gz/debian/changelog.tmpl -> sview-15_10.tar.gz/debian/changelog.tmpl Changed

sview-15_08.tar.gz/distribution/build.bat -> sview-15_10.tar.gz/distribution/build.bat Changed

@@ -26,6 +26,7 @@
 if exist "%~dp0env.bat" call "%~dp0env.bat"
 
 set YEAR=%date:~-2,4%
+set MONTH00=%date:~-7,2%
 set MONTH=%date:~-7,2%
 set DAY=%date:~0,2%
 
@@ -79,9 +80,9 @@
 echo   #define SVIEW_SDK_VERSION ^%YEAR%^, ^%MONTH%^, ^%SVIEW_VER_TYPE_NUM%^, ^%DAY%>> "%SVIEW_BUILD_CONF%"
 echo #endif>> "%SVIEW_BUILD_CONF%"
 
-echo     Version String="%YEAR%.%MONTH%%SVIEW_VER_TYPE%%DAY%"
+echo     Version String="%YEAR%.%MONTH00%%SVIEW_VER_TYPE%%DAY%"
 echo #ifndef SVIEW_SDK_VER_STRING>> "%SVIEW_BUILD_CONF%"
-echo   #define SVIEW_SDK_VER_STRING "%YEAR%.%MONTH%%SVIEW_VER_TYPE%%DAY%">> "%SVIEW_BUILD_CONF%"
+echo   #define SVIEW_SDK_VER_STRING "%YEAR%.%MONTH00%%SVIEW_VER_TYPE%%DAY%">> "%SVIEW_BUILD_CONF%"
 echo #endif>> "%SVIEW_BUILD_CONF%"
 
 rem Activate experimental WebP support
@@ -89,8 +90,8 @@
 
 rem Create configuration for InnoSetup build script
 echo #define SVIEW_VER      "%YEAR%.%MONTH%.%SVIEW_VER_TYPE_NUM%.%DAY%"> config.iss
-echo #define SVIEW_VER_FULL "v.%YEAR%.%MONTH%%SVIEW_VER_TYPE%%DAY%">> config.iss
-echo #define SVIEW_VER_NAME "sView (version %YEAR%.%MONTH%%SVIEW_VER_TYPE%%DAY%)">> config.iss
+echo #define SVIEW_VER_FULL "v.%YEAR%.%MONTH00%%SVIEW_VER_TYPE%%DAY%">> config.iss
+echo #define SVIEW_VER_NAME "sView (version %YEAR%.%MONTH00%%SVIEW_VER_TYPE%%DAY%)">> config.iss
 echo #define SVIEW_DISTR_PATH_x86   "%SVIEW_DISTR_PATH_X86%">> config.iss
 echo #define SVIEW_DISTR_PATH_AMD64 "%SVIEW_DISTR_PATH_AMD64%">> config.iss
 
@@ -129,6 +130,7 @@
 
 rem shared resources
 xcopy /Y ..\share\sView\demo\demo.jps       %SVIEW_DISTR_PATH_X86%\
+xcopy /Y ..\share\sView\demo\demo_robot.jps %SVIEW_DISTR_PATH_X86%\
 xcopy /S /Y ..\bin\WIN_vc_x86\lang\*        %SVIEW_DISTR_PATH_X86%\lang\
 xcopy /S /Y ..\bin\WIN_vc_x86\shaders\*     %SVIEW_DISTR_PATH_X86%\shaders\
 xcopy /Y ..\bin\WIN_vc_x86\textures\*       %SVIEW_DISTR_PATH_X86%\textures\

sview-15_08.tar.gz/distribution/build.iss -> sview-15_10.tar.gz/distribution/build.iss Changed

@@ -1,4 +1,4 @@
-
+
 #include "temp\config.iss"
 
 ; Should be defined in config file
@@ -169,6 +169,7 @@
 Source: {#SVIEW_DISTR_PATH_x86}\shaders\StGLWidgets\*;         DestDir: {app}\shaders\StGLWidgets;       Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_x86}\lang\Korean\language.lng;      DestDir: {app}\lang\Korean;               Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_x86}\lang\ChineseS\language.lng;    DestDir: {app}\lang\ChineseS;             Flags: 32bit ignoreversion; Components: StCore
+Source: {#SVIEW_DISTR_PATH_x86}\lang\Czech\language.lng;       DestDir: {app}\lang\Czech;                Flags: 32bit ignoreversion; Components: StCore
 ; MSVC C-Runtime libraries (mask compatible for vc100)
 Source: {#SVIEW_DISTR_PATH_x86}\msvc*.dll;        DestDir: {app};        Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_AMD64}\msvc*.dll;      DestDir: {app}\amd64;  Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
@@ -224,6 +225,7 @@
 Source: {#SVIEW_DISTR_PATH_x86}\icons\sView_JPS.ico;           DestDir: {app}\icons;           Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer
 Source: {#SVIEW_DISTR_PATH_x86}\icons\sView_PNS.ico;           DestDir: {app}\icons;           Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer
 Source: {#SVIEW_DISTR_PATH_x86}\demo.jps;                      DestDir: {app};                 Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer
+Source: {#SVIEW_DISTR_PATH_x86}\demo_robot.jps;                DestDir: {app};                 Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer
 Source: {#SVIEW_DISTR_PATH_AMD64}\StImageViewer.dll;           DestDir: {app}\amd64;           Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
 ; FreeImage library (should be optional)
 Source: {#SVIEW_DISTR_PATH_x86}\FreeImage.dll;                 DestDir: {app};                 Flags: 32bit ignoreversion; Components: StDrawers\StImageViewer
@@ -311,12 +313,16 @@
 
 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: .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
 Root: HKCR; SubKey: .png;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .exr;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .hdr;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .webp;                                     ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 Root: HKCR; SubKey: .webpll;                                   ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
+Root: HKCR; SubKey: .tif;                                      ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
+Root: HKCR; SubKey: .tiff;                                     ValueType: string; ValueData: sView Image;                   Tasks: flagAssocImages;       Flags: uninsdeletekey
 
 ; Associations Video
 Root: HKCR; SubKey: sView Video;                               ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
@@ -330,6 +336,17 @@
 Root: HKCR; SubKey: .webm;                                     ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
 Root: HKCR; SubKey: .wmv;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
 Root: HKCR; SubKey: .ts;                                       ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mts;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .m2ts;                                     ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mt2s;                                     ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .vob;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mp4;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mpg;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .flv;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mov;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .ogm;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .bik;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
+Root: HKCR; SubKey: .mj2;                                      ValueType: string; ValueData: sView Video;                   Tasks: flagAssocMovies; Flags: uninsdeletekey
 
 ; Associations Audio
 Root: HKCR; SubKey: sView Audio;                               ValueType: string; ValueData: sView Audio;                   Tasks: flagAssocMusic;  Flags: uninsdeletekey
@@ -345,6 +362,7 @@
 Root: HKCR; SubKey: .wav;                                      ValueType: string; ValueData: sView Audio;                   Tasks: flagAssocMusic;  Flags: uninsdeletekey
 Root: HKCR; SubKey: .flac;                                     ValueType: string; ValueData: sView Audio;                   Tasks: flagAssocMusic;  Flags: uninsdeletekey
 Root: HKCR; SubKey: .ape;                                      ValueType: string; ValueData: sView Audio;                   Tasks: flagAssocMusic;  Flags: uninsdeletekey
+Root: HKCR; SubKey: .mka;                                      ValueType: string; ValueData: sView Audio;                   Tasks: flagAssocMusic;  Flags: uninsdeletekey
 
 ; StCoreXX environment variables
 Root: HKLM32; SubKey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: StShare;  ValueData: {app}\; Flags: uninsdeletevalue

sview-15_10.tar.gz/distribution/media/sView_Logo.svg Added

@@ -0,0 +1,746 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg3214"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="sView_Logo.svg"
+   inkscape:export-filename="sView_Logo.png"
+   inkscape:export-xdpi="720"
+   inkscape:export-ydpi="720">
+  <defs
+     id="defs3216">
+    <linearGradient
+       y2="20.731297"
+       x2="27.375"
+       y1="31.77206"
+       x1="28.029287"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5820"
+       xlink:href="#linearGradient6234"
+       inkscape:collect="always" />
+    <filter
+       id="filter5737"
+       height="1.4385543"
+       y="-0.21927714"
+       width="1.3626142"
+       x="-0.18130708"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur5739"
+         stdDeviation="2.1813507"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter5729"
+       height="2.4825463"
+       y="-0.74127316"
+       width="1.3227895"
+       x="-0.16139475"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur5731"
+         stdDeviation="2.1813507"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6234">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6236" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6238" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467-1">
+      <stop
+         id="stop4469-8"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop4471-9"
+         style="stop-color:#ffffff;stop-opacity:0.24761905;"
+         offset="1.0000000" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.617019,0,0,0.617019,9.054796,7.969543)"
+       cx="25.0527"
+       cy="39.5928"
+       gradientUnits="userSpaceOnUse"
+       fy="39.5928"
+       fx="25.0527"
+       id="aigrd2-2-3"
+       r="15.7572">
+      <stop
+         id="stop8602-3"
+         style="stop-color:#777777;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop8604-3"
+         style="stop-color:#000000"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient3290-6">
+      <stop
+         id="stop3292-0"
+         style="stop-color:#fffcde;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop3294-4"
+         style="stop-color:#f6e76a;stop-opacity:1.0000000;"
+         offset="0.64485979" />
+      <stop
+         id="stop3296-8"
+         style="stop-color:#ffb738;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4565-8">
+      <stop
+         id="stop4567-9"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop4569-7"
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter78486-7"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         id="feGaussianBlur78488-6"
+         stdDeviation="0.246274" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter78694-4"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         id="feGaussianBlur78696-3"
+         stdDeviation="0.84984893" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       height="1.2604995"
+       x="-0.046955407"
+       y="-0.13024975"
+       width="1.0939108"
+       id="filter78638-0"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         id="feGaussianBlur78640-3"
+         stdDeviation="1.1747766" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter78450-0"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         id="feGaussianBlur78452-9"
+         stdDeviation="0.39648414" />
+    </filter>
+    <radialGradient
+       gradientTransform="matrix(1.158233,-0.08160287,0.05119299,1.1715514,-36.462915,48.248828)"
+       cx="134.13086"
+       cy="81.594727"
+       gradientUnits="userSpaceOnUse"
+       fy="81.594727"
+       fx="134.13086"
+       id="XMLID_55_-5"
+       r="95.281982">
+      <stop
+         id="stop382-4"
+         style="stop-color:#0099ff;stop-opacity:1.0000000;"
+         offset="0.0056179999" />
+      <stop
+         id="stop384-0"
+         style="stop-color:#0066cc;stop-opacity:1.0000000;"
+         offset="0.39887601" />
+      <stop
+         id="stop386-5"
+         style="stop-color:#00008d;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </radialGradient>
+    <radialGradient
+       gradientTransform="matrix(1.158233,-0.08160287,0.05119299,1.1715514,-36.462915,48.248828)"
+       cx="138.71191"
+       cy="128.80225"
+       gradientUnits="userSpaceOnUse"
+       fy="128.80225"
+       fx="138.71191"
+       id="XMLID_54_-4"
+       r="103.02309">
+      <stop
+         id="stop361-6"
+         style="stop-color:#3e9ade;stop-opacity:1.0000000;"
+         offset="0.0056179999" />
+      <stop
+         id="stop363-9"
+         style="stop-color:#0066cc;stop-opacity:1.0000000;"
+         offset="0.39887601" />
+      <stop
+         id="stop365-2"
+         style="stop-color:#00008d;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </radialGradient>
+    <radialGradient
+       gradientTransform="matrix(1.158233,-0.08160287,0.05119299,1.1715514,-36.462915,48.248828)"
+       cx="138.72363"
+       cy="128.80811"
+       gradientUnits="userSpaceOnUse"
+       fy="128.80811"
+       fx="138.72363"
+       id="XMLID_53_-4"
+       r="103.00073">
+      <stop
+         id="stop340-7"
+         style="stop-color:#3e9ade;stop-opacity:1.0000000;"
+         offset="0.0056179999" />
+      <stop
+         id="stop342-7"
+         style="stop-color:#0066cc;stop-opacity:1.0000000;"
+         offset="0.39887601" />
+      <stop
+         id="stop344-5"
+         style="stop-color:#00008d;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </radialGradient>
+    <linearGradient
+       y2="75.628906"
+       y1="75.628906"
+       x2="190.76367"
+       x1="61.221191"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_52_-4">
+      <stop
+         id="stop325-8"
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0056179999" />
+      <stop
+         id="stop327-1"
+         style="stop-color:#494949;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       y2="121.52731"
+       y1="19.987305"
+       x2="135.62952"
+       x1="117.05518"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_51_-2">
+      <stop
+         id="stop310-8"
+         style="stop-color:#9a9ab1;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop312-9"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       y2="75.348633"
+       y1="75.348633"
+       x2="204.31836"
+       x1="45.217773"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_50_-3">
+      <stop
+         id="stop293-6"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop295-8"
+         style="stop-color:#cecedb;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       y2="4.1227713"
+       y1="139.66699"
+       x2="50.743862"
+       x1="186.28809"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_49_-0">
+      <stop
+         id="stop278-2"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop280-1"
+         style="stop-color:#9a9ab1;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       y2="4.1137614"
+       y1="139.66113"
+       gradientTransform="matrix(1.158233,-0.08160287,0.05119299,1.1715514,-36.462915,48.248828)"
+       x2="50.734852"
+       x1="186.28223"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_48_-5">
+      <stop
+         id="stop253-1"
+         style="stop-color:#5f5f5f;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop255-1"
+         style="stop-color:#7a7a95;stop-opacity:1.0000000;"
+         offset="0.18601960" />
+      <stop
+         id="stop257-0"
+         style="stop-color:#717188;stop-opacity:1.0000000;"
+         offset="0.37826309" />
+      <stop
+         id="stop259-8"
+         style="stop-color:#616174;stop-opacity:1.0000000;"
+         offset="0.57334977" />
+      <stop
+         id="stop261-9-5"
+         style="stop-color:#4c4c57;stop-opacity:1.0000000;"
+         offset="0.77042061" />
+      <stop
+         id="stop263-0"
+         style="stop-color:#303032;stop-opacity:1.0000000;"
+         offset="0.96729457" />
+      <stop
+         id="stop265-6"
+         style="stop-color:#2b2b2b;stop-opacity:1.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_48_-5"
+       id="linearGradient7337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.18539,857.48723)"
+       x1="186.28223"
+       y1="139.66113"
+       x2="50.734852"
+       y2="4.1137614" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_49_-0"
+       id="linearGradient7339"
+       gradientUnits="userSpaceOnUse"
+       x1="186.28809"
+       y1="139.66699"
+       x2="50.743862"
+       y2="4.1227713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_50_-3"
+       id="linearGradient7341"
+       gradientUnits="userSpaceOnUse"
+       x1="45.217773"
+       y1="75.348633"
+       x2="204.31836"
+       y2="75.348633" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_51_-2"
+       id="linearGradient7343"
+       gradientUnits="userSpaceOnUse"
+       x1="117.05518"
+       y1="19.987305"
+       x2="135.62952"
+       y2="121.52731" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_52_-4"
+       id="linearGradient7345"
+       gradientUnits="userSpaceOnUse"
+       x1="61.221191"
+       y1="75.628906"
+       x2="190.76367"
+       y2="75.628906" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_53_-4"
+       id="radialGradient7347"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.18539,857.48723)"
+       cx="138.72363"
+       cy="128.80811"
+       fx="138.72363"
+       fy="128.80811"
+       r="103.00073" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_54_-4"
+       id="radialGradient7349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.18539,857.48723)"
+       cx="138.71191"
+       cy="128.80225"
+       fx="138.71191"
+       fy="128.80225"
+       r="103.02309" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_55_-5"
+       id="radialGradient7351"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.18539,857.48723)"
+       cx="134.13086"
+       cy="81.594727"
+       fx="134.13086"
+       fy="81.594727"
+       r="95.281982" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4565-8"
+       id="radialGradient7353"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.333333,0,25.71429)"
+       cx="24.714285"
+       cy="38.57143"
+       fx="24.714285"
+       fy="38.57143"
+       r="19.714285" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3290-6"
+       id="radialGradient7355"
+       gradientUnits="userSpaceOnUse"
+       cx="29.288071"
+       cy="15.720984"
+       fx="29.158466"
+       fy="15.755712"
+       r="8.9020796" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd2-2-3"
+       id="radialGradient7357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.40606226,0,0,0.40578271,456.0797,858.75606)"
+       cx="25.0527"
+       cy="39.5928"
+       fx="25.0527"
+       fy="39.5928"
+       r="15.7572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467-1"
+       id="radialGradient7359"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2593281,0,0,1.0930299,452.99056,845.80836)"
+       cx="15.414371"
+       cy="13.078408"
+       fx="15.414371"
+       fy="13.078408"
+       r="6.65625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467-1"
+       id="radialGradient7361"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2593281,0,0,1.0930299,436.84706,845.80836)"
+       cx="15.414371"
+       cy="13.078408"
+       fx="15.414371"
+       fy="13.078408"
+       r="6.65625" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-23.245674"
+     inkscape:cy="86.26557"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1047"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata3219">
+    <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(-6.3597048e-7,-924.36218)">
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0565168"
+       inkscape:original="M 289.5 431.40625 C 287.23603 431.40625 285.40625 433.20529 285.40625 435.4375 L 285.40625 482.09375 C 285.40625 484.32596 287.23603 486.125 289.5 486.125 L 347.5 486.125 C 349.76397 486.125 351.59375 484.32596 351.59375 482.09375 L 351.59375 435.4375 C 351.59375 433.20529 349.76397 431.40625 347.5 431.40625 L 289.5 431.40625 z "
+       xlink:href="#rect4873"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.47647059;fill:none;stroke:url(#linearGradient5820);stroke-width:1.00000083;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6230"
+       inkscape:href="#rect4873"
+       d="m 289.5,432.46289 c -1.70427,0 -3.03711,1.31976 -3.03711,2.97461 l 0,46.65625 c 0,1.65485 1.33284,2.97461 3.03711,2.97461 l 58,0 c 1.70427,0 3.03711,-1.31976 3.03711,-2.97461 l 0,-46.65625 c 0,-1.65485 -1.33284,-2.97461 -3.03711,-2.97461 l -58,0 z"
+       transform="matrix(2.1348662,0,0,2.1049142,269.388,407.19722)" />
+    <path
+       d="m 289.5,432.46289 c -1.70427,0 -3.03711,1.31976 -3.03711,2.97461 l 0,46.65625 c 0,1.65485 1.33284,2.97461 3.03711,2.97461 l 58,0 c 1.70427,0 3.03711,-1.31976 3.03711,-2.97461 l 0,-46.65625 c 0,-1.65485 -1.33284,-2.97461 -3.03711,-2.97461 l -58,0 z"
+       inkscape:href="#rect4873"
+       id="path4017"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.47647059;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;filter:url(#filter5737);enable-background:accumulate"
+       xlink:href="#rect4873"
+       inkscape:original="M 289.5 431.40625 C 287.23603 431.40625 285.40625 433.20529 285.40625 435.4375 L 285.40625 482.09375 C 285.40625 484.32596 287.23603 486.125 289.5 486.125 L 347.5 486.125 C 349.76397 486.125 351.59375 484.32596 351.59375 482.09375 L 351.59375 435.4375 C 351.59375 433.20529 349.76397 431.40625 347.5 431.40625 L 289.5 431.40625 z "
+       inkscape:radius="-1.0565168"
+       sodipodi:type="inkscape:offset"
+       transform="matrix(2.6066103,0,0,2.6459651,271.58446,433.14775)" />
+    <path
+       d="m 286.33008,432.28125 -3.83203,17.0625 72.04883,0 -3.63672,-17.00195 -64.58008,-0.0605 z"
+       inkscape:href="#path4885"
+       id="path4021"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.25882353;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;filter:url(#filter5729);enable-background:accumulate"
+       xlink:href="#path4885"
+       inkscape:original="M 285.53125 431.28125 L 281.25 450.34375 L 355.78125 450.34375 L 351.71875 431.34375 L 285.53125 431.28125 z "
+       inkscape:radius="-0.99911743"
+       sodipodi:type="inkscape:offset"
+       transform="matrix(2.6066103,0,0,2.6459651,271.58446,433.14775)" />
+    <g
+       id="g76565"
+       transform="translate(1072.4101,216.95544)">
+      <path
+         inkscape:connector-curvature="0"
+         style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';opacity:0.09090899;fill:#000000;fill-opacity:1;stroke:none"
+         d=""
+         id="text76617" />
+    </g>
+    <g
+       id="g7305"
+       transform="matrix(1.1697057,0,0,1.1697057,-508.8862,-58.795809)">
+      <path
+         sodipodi:nodetypes="czcccczcc"
+         d="m 524.35949,853.68722 c 0,0 -77.60659,7.48791 -78.83969,7.67698 -1.24018,0.19017 -4.15931,1.73655 -5.69537,3.22877 -0.3638,0.5061 -0.23268,1.00596 -0.0936,1.60451 l 16.54452,71.17535 c 0.25326,1.09074 0.99121,2.10979 2.40847,1.5295 18.00324,-7.39684 80.95112,-10.85632 80.90492,-21.09632 -0.0462,-10.06742 -13.05017,-62.50574 -13.05017,-62.50574 -0.21357,-1.02311 -1.1439,-1.71149 -2.1791,-1.61305 z"
+         id="path274-4"
+         style="fill:url(#linearGradient7337)"
+         inkscape:connector-curvature="0" />
+      <polygon
+         points="39.503906,16.282227 39.371094,16.286133 39.381836,16.34375 39.249023,16.34668 39.260254,16.404785 39.127441,16.407715 39.138184,16.465332 39.005371,16.468262 39.016602,16.525879 38.883789,16.529297 38.894531,16.587402 38.762207,16.59082 38.772949,16.647949 38.640137,16.651367 38.650879,16.708984 38.518555,16.711914 38.529297,16.77002 38.396484,16.773438 38.407715,16.831055 38.274902,16.833984 38.285156,16.891602 38.152832,16.894531 38.164062,16.952148 38.03125,16.955566 38.041992,17.013672 37.909668,17.01709 37.92041,17.074219 37.787598,17.077637 61.716309,144.46582 196.88867,125.35107 196.88184,125.30811 197.01074,125.29004 197.00195,125.24707 197.13281,125.22949 197.12598,125.18652 197.25391,125.16846 197.24609,125.12451 197.37598,125.10645 197.36914,125.06445 197.49609,125.0459 197.48926,125.00342 197.62012,124.98486 197.61133,124.94287 197.74121,124.9248 197.73438,124.88184 197.86328,124.86377 197.85645,124.8208 197.98535,124.80322 197.97852,124.75977 198.10645,124.74121 198.09863,124.69824 198.22852,124.68018 198.22168,124.63818 198.35059,124.61963 198.34375,124.57715 198.47266,124.55859 198.46387,124.5166 198.59375,124.49854 198.58691,124.45557 198.71582,124.4375 198.70898,124.39453 198.83789,124.37695 198.83105,124.3335 198.95898,124.31494 198.95117,124.27246 199.08105,124.25391 199.07422,124.21191 199.20312,124.19336 199.19629,124.15088 199.3252,124.13232 199.31641,124.08984 199.44629,124.07227 199.43945,124.0293 199.56836,124.01123 199.56152,123.96729 199.69043,123.94971 199.68359,123.90723 199.81152,123.88867 199.80371,123.84619 199.93359,123.82764 199.92676,123.78564 200.05566,123.76758 200.04883,123.72461 200.17773,123.70605 200.16895,123.66357 200.29883,123.646 200.29102,123.60205 200.4209,123.58398 200.41406,123.54102 200.54297,123.52295 200.53613,123.48096 200.66309,123.4624 200.65625,123.41992 200.78613,123.40137 200.7793,123.35938 200.9082,123.34131 200.90137,123.29834 201.03027,123.27979 201.02344,123.2373 201.15137,123.21973 201.14355,123.17578 201.27344,123.15771 201.2666,123.11475 201.39551,123.09668 201.38867,123.05469 201.51562,123.03613 201.50879,122.99365 201.63965,122.9751 201.63184,122.93311 201.76074,122.91504 201.75391,122.87207 201.88281,122.85352 201.87598,122.81006 202.00391,122.79248 201.99609,122.75 202.12598,122.73145 202.11914,122.68848 202.24805,122.67041 202.24121,122.62842 202.36816,122.60986 202.36133,122.56738 202.49219,122.54883 202.4834,122.50586 202.61328,122.48877 202.60645,122.4458 202.73535,122.42725 202.72852,122.38379 202.85547,122.36621 202.84863,122.32373 202.97852,122.30518 202.97168,122.26221 203.10059,122.24414 203.09375,122.20215 203.22266,122.18359 203.21387,122.14111 203.34473,122.12256 203.33594,122.08008 203.46582,122.0625 203.45898,122.01855 203.58789,122.00049 203.58105,121.95752 203.70996,121.93896 203.70312,121.89746 203.83105,121.87891 203.82422,121.83594 203.95312,121.81787 203.94629,121.77588 204.0752,121.75732 204.06641,121.71484 204.19727,121.69629 204.19043,121.65381 204.19043,121.65381 204.31836,121.63623 185.93848,9.9467773 175.01367,10.211914 45.217773,13.362305 45.228516,13.419922 45.095703,13.42334 45.106445,13.480957 44.973633,13.484863 44.984863,13.54248 44.852051,13.54541 44.862793,13.603027 44.730469,13.605957 44.741699,13.663574 44.608887,13.666992 44.619141,13.725098 44.486328,13.728027 44.497559,13.785645 44.365234,13.788574 44.375977,13.846191 44.243164,13.849609 44.253906,13.907227 44.121582,13.911133 44.132324,13.96875 43.999512,13.97168 44.010254,14.029297 43.87793,14.032227 43.88916,14.090332 43.755859,14.093262 43.766602,14.151367 43.633789,14.154297 43.645019,14.211914 43.512695,14.215332 43.523438,14.272461 43.390137,14.275879 43.401367,14.333984 43.269043,14.337402 43.279785,14.39502 43.146973,14.397949 43.157715,14.455566 43.025391,14.458496 43.035644,14.516602 42.90332,14.519531 42.914062,14.577148 42.78125,14.580566 42.792481,14.638184 42.660156,14.641602 42.670898,14.69873 42.537598,14.702148 42.548828,14.760254 42.416016,14.763672 42.426758,14.821289 42.294434,14.824219 42.305664,14.881836 42.172363,14.884766 42.183106,14.942871 42.050781,14.945801 42.061523,15.003418 41.929199,15.007324 41.939941,15.064453 41.806641,15.067871 41.817383,15.125977 41.685059,15.128906 41.696289,15.186523 41.563477,15.189453 41.574219,15.247559 41.441894,15.250488 41.452637,15.308105 41.319824,15.311035 41.330566,15.369141 41.198242,15.37207 41.209473,15.429688 41.07666,15.433594 41.087402,15.490723 40.954102,15.494141 40.965332,15.552246 40.833008,15.555176 40.84375,15.612793 40.710938,15.615723 40.72168,15.673828 40.588867,15.676758 40.600098,15.734863 40.467285,15.737793 40.478027,15.79541 40.345215,15.798828 40.356445,15.855957 40.223633,15.859863 40.234375,15.91748 40.101562,15.92041 40.112793,15.978516 39.980469,15.981445 39.991211,16.039062 39.858398,16.041992 39.869141,16.099609 39.736328,16.103027 39.74707,16.161133 39.614746,16.164062 39.625488,16.22168 39.492676,16.225098 "
+         transform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.1854,857.48723)"
+         style="fill:url(#linearGradient7339)"
+         id="polygon289-6" />
+      <polygon
+         points="204.31836,121.63623 185.93848,9.9467773 175.01367,10.211914 175.01367,10.211914 45.217773,13.362305 69.146484,140.75 "
+         transform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.1854,857.48723)"
+         style="fill:url(#linearGradient7341)"
+         id="polygon304-2" />
+      <polygon
+         points="193.04688,112.42627 177.67383,18.998535 175.24902,19.057617 175.24902,19.057617 56.949707,21.928711 77.030273,128.83252 "
+         transform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.1854,857.48723)"
+         style="fill:#ffffff"
+         id="polygon306-5" />
+      <polygon
+         points="193.04688,113.35498 177.67383,19.927246 175.24902,19.986328 175.24902,19.986328 56.949707,22.85791 77.030273,129.76074 "
+         transform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.1854,857.48723)"
+         style="fill:url(#linearGradient7343)"
+         id="polygon321-8" />
+      <polygon
+         points="80.206055,127.55811 80.206055,127.55811 190.76367,111.92334 176.24707,23.700195 61.221191,26.492188 "
+         transform="matrix(0.55969937,-0.03943341,0.02473827,0.56613529,420.1854,857.48723)"
+         style="fill:url(#linearGradient7345)"
+         id="polygon336-6" />
+      <path
+         d="m 514.97113,865.43394 -53.68905,5.10639 c -1.2181,0.11605 -2.33775,0.76643 -3.06351,1.77973 -0.72524,1.01272 -0.98319,2.28616 -0.70502,3.48301 l 10.59879,45.59634 c 0.50707,2.18145 2.62962,3.52895 4.81723,3.05928 l 51.37173,-11.03673 c 1.10154,-0.23649 2.07375,-0.91085 2.69634,-1.86975 0.62205,-0.95887 0.84318,-2.12185 0.61345,-3.22617 l -8.28175,-39.66627 c -0.42716,-2.04649 -2.28671,-3.42279 -4.35821,-3.22583 z"
+         id="path357-2"
+         style="fill:url(#radialGradient7347)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 515.11384,867.53291 0,0 -53.68931,5.1067 c -0.61016,0.0579 -1.16866,0.38208 -1.5319,0.88986 -0.36326,0.50724 -0.49206,1.14187 -0.35239,1.74094 l 10.59854,45.59693 c 0.25443,1.0926 1.31236,1.76505 2.40871,1.52892 l 51.37094,-11.0361 c 0.54805,-0.11792 1.03922,-0.45837 1.349,-0.93495 0.30868,-0.47649 0.42061,-1.06445 0.30616,-1.61317 l -8.28066,-39.66636 c -0.21221,-1.0171 -1.14991,-1.71079 -2.17909,-1.61277 z"
+         id="path378-8"
+         style="fill:url(#radialGradient7349)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 517.29293,869.14568 c -0.21221,-1.0171 -1.14991,-1.71079 -2.17909,-1.61277 l -53.68931,5.1067 c -0.61016,0.0579 -1.16866,0.38208 -1.5319,0.88986 -0.36326,0.50724 -0.49206,1.14187 -0.35239,1.74094 l 4.10484,17.6597 c 7.81824,3.9334 19.1093,5.17815 31.1196,2.71292 10.44013,-2.14334 19.42701,-6.679 25.49884,-12.26677 l -2.97059,-14.23058 z"
+         id="path399-4"
+         style="fill:url(#radialGradient7351)"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g78698-7"
+         transform="matrix(0.48323555,0,0,0.48323555,437.80557,834.17168)">
+        <path
+           inkscape:transform-center-x="1.2636495"
+           inkscape:transform-center-y="-0.14665398"
+           transform="matrix(1.1645808,0,0,1.1687526,-22.635297,-74.413789)"
+           d="m 145.2759,159.60495 c -0.40124,-4.84971 -0.80252,-9.69942 -1.20376,-14.54916 -1.07121,0.60511 -2.14246,1.21021 -3.21368,1.81531 0.36445,3.19749 0.72891,6.39499 1.09336,9.59251 -1.72209,-2.43063 -3.44415,-4.86126 -5.16625,-7.29188 -0.97079,0.54836 -1.94159,1.09673 -2.91238,1.64511 0.35701,3.20169 0.71402,6.40341 1.07103,9.60511 -1.86343,-2.3508 -3.72684,-4.70159 -5.59029,-7.05237 -0.94847,0.53577 -1.89695,1.07153 -2.84544,1.60728 2.86359,3.45885 5.72719,6.91769 8.59077,10.3765 0.98938,-0.55885 1.97879,-1.11774 2.96819,-1.67661 -0.30275,-3.06028 -0.6055,-6.12055 -0.90825,-9.18081 1.70127,2.27027 3.40259,4.54058 5.10387,6.81084 1.00428,-0.56726 2.00857,-1.13455 3.01283,-1.70183 z m -20.39806,2.67433 c -1.67008,0.94336 -3.34016,1.88673 -5.01021,2.8301 -0.26703,-0.69099 -0.44076,-1.43229 -0.36258,-2.17028 0.1039,-1.31629 1.23513,-2.54899 2.67339,-2.60464 1.26487,-0.0502 2.17799,0.96937 2.6994,1.94482 z m 3.87143,0.32267 c -0.45621,-1.28934 -1.17264,-2.52218 -2.15423,-3.52261 -1.24365,-1.30695 -3.26635,-1.92185 -5.06138,-1.40785 -1.71779,0.49821 -3.25507,1.57586 -4.25622,2.98573 -1.55563,2.27509 -1.39824,5.33842 -0.01,7.65502 0.87338,1.55449 2.3583,2.88885 4.22018,3.26469 2.23828,0.51906 4.6066,-0.42466 6.16579,-1.93714 1.40501,-1.3463 1.9987,-3.31077 1.77803,-5.1719 -0.89084,0.32911 -1.78168,0.65823 -2.67252,0.98736 -0.47726,0.066 -0.56427,0.3617 -0.49381,0.79598 -0.047,1.29845 -1.10862,2.51644 -2.49279,2.68595 -1.31744,0.16545 -2.52662,-0.70395 -3.05745,-1.797 2.67806,-1.51275 5.35612,-3.0255 8.03418,-4.53823 z m -19.54776,2.15101 c 1.54313,4.20468 3.08629,8.40941 4.62944,12.61409 1.06751,-0.60301 2.13503,-1.20599 3.20253,-1.80898 -1.54317,-4.2047 -3.08631,-8.40942 -4.62947,-12.61409 -1.0675,0.60299 -2.13499,1.20598 -3.2025,1.80898 z m -1.76616,-4.79575 c 0.37912,1.02868 0.75821,2.05734 1.13729,3.086 1.06751,-0.60299 2.13502,-1.20599 3.20254,-1.80899 -0.37911,-1.02866 -0.75819,-2.05733 -1.13731,-3.08599 -1.06751,0.60299 -2.13501,1.20601 -3.20252,1.80898 z m -0.66779,21.3997 c -0.26467,-6.85799 -0.52933,-13.71599 -0.79398,-20.57398 -1.11215,0.62819 -2.22429,1.25641 -3.33643,1.88461 0.21598,5.17904 0.43195,10.35807 0.64791,15.53713 -3.16556,-3.51294 -6.331123,-7.02586 -9.496673,-10.53876 -1.11958,0.63239 -2.23917,1.2648 -3.35875,1.89722 4.24829,4.60779 8.49657,9.21558 12.744853,13.82336 1.19769,-0.67653 2.39538,-1.35305 3.59307,-2.02958 z m -23.322703,8.91515 0,0 0.09579,0.0821 c 1.41442,1.25032 3.53795,1.68095 5.371,1.10543 1.6239,-0.49157 3.16048,-1.30492 4.39351,-2.423 1.45309,-1.31032 2.1799,-3.48561 1.30605,-5.27092 -0.4567,-1.06027 -1.56409,-1.78202 -2.75621,-1.8964 -1.8127,-0.12954 -3.54897,0.49843 -5.29832,0.83737 -0.64887,0.2146 -1.63877,0.11327 -1.7491,-0.67521 -0.09892,-0.93229 0.84319,-1.52534 1.5992,-1.91295 0.92961,-0.48388 2.21599,-0.66076 3.06977,0.0641 0.88306,-0.71869 1.76614,-1.4374 2.6492,-2.15608 -1.11334,-1.18284 -2.96896,-1.60861 -4.54637,-1.11491 -1.65013,0.50341 -3.18938,1.38095 -4.40075,2.55623 -1.1832,1.15593 -1.90103,2.93101 -1.25157,4.49951 0.43886,1.15609 1.57383,2.07277 2.89287,2.14943 1.84732,0.0267 3.62597,-0.52872 5.43584,-0.78889 0.68276,-0.19116 1.45672,0.33347 1.34794,1.03357 -0.21328,1.15494 -1.38333,1.87689 -2.46232,2.27051 -0.98914,0.38704 -2.08764,0.0188 -2.88887,-0.57674 -0.93589,0.73896 -1.87178,1.47794 -2.80766,2.2169 z"
+           id="path78352-2"
+           style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';opacity:0.8495575;fill:#ff4300;fill-opacity:1;stroke:#000000;stroke-width:0.14506666;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter78486-7)"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:transform-center-x="1.1367486"
+           inkscape:transform-center-y="-0.19942563"
+           transform="matrix(1.1645808,0,0,1.1687526,-22.635297,-74.413789)"
+           d="m 139.83617,162.31302 c 0.17679,-4.30711 0.35352,-8.61423 0.53031,-12.92136 -1.03188,0.40989 -2.06378,0.81977 -3.09566,1.22965 -0.0266,2.8511 -0.0531,5.70222 -0.0797,8.55335 -1.2812,-2.33166 -2.56237,-4.66331 -3.84358,-6.99497 -0.93513,0.37145 -1.87029,0.7429 -2.80543,1.11436 -0.0337,2.85395 -0.0675,5.70793 -0.10123,8.5619 -1.41735,-2.2776 -2.83467,-4.55517 -4.25205,-6.83274 -0.91364,0.36292 -1.82728,0.72583 -2.74094,1.08873 2.19514,3.36498 4.39029,6.72996 6.58541,10.09491 0.95305,-0.37856 1.90613,-0.75713 2.85919,-1.13569 0.0669,-2.72353 0.13383,-5.44704 0.20075,-8.17055 1.28025,2.18838 2.56053,4.37681 3.84078,6.56518 0.9674,-0.38424 1.9348,-0.76851 2.90218,-1.15277 z m -18.66715,0.0302 c -1.60875,0.639 -3.21749,1.27802 -4.82621,1.91704 -0.16381,-0.63755 -0.23802,-1.30869 -0.0857,-1.94828 0.23963,-1.14482 1.3952,-2.09935 2.69665,-1.98469 1.14471,0.0998 1.85393,1.09949 2.21528,2.01593 z m 3.45078,0.72381 c -0.26779,-1.18483 -0.7762,-2.34962 -1.5492,-3.34034 -0.97502,-1.28986 -2.72842,-2.06021 -4.40205,-1.8127 -1.60231,0.24243 -3.10637,1.01454 -4.16444,2.13954 -1.65344,1.82223 -1.85161,4.53191 -0.85822,6.72542 0.61407,1.46527 1.80333,2.80665 3.43842,3.34865 1.95819,0.71065 4.19581,0.15074 5.76784,-1.00097 1.41473,-1.02322 2.16738,-2.68189 2.17516,-4.34238 -0.8388,0.18788 -1.67761,0.37578 -2.51641,0.56367 -0.43715,0.004 -0.54832,0.25365 -0.53305,0.64327 -0.18642,1.13562 -1.27765,2.08514 -2.54303,2.07668 -1.20485,-0.004 -2.19736,-0.90591 -2.55414,-1.92676 2.57972,-1.02469 5.15942,-2.04939 7.73912,-3.07408 z m -17.84331,-0.33298 c 0.92318,3.87018 1.84638,7.74041 2.76958,11.61059 1.0283,-0.40847 2.05662,-0.8169 3.08491,-1.22535 -0.92321,-3.87021 -1.84639,-7.74042 -2.7696,-11.6106 -1.0283,0.40845 -2.05658,0.8169 -3.08489,1.22536 z m -1.05845,-4.41492 c 0.22729,0.94702 0.45456,1.89403 0.68182,2.84103 1.0283,-0.40845 2.05661,-0.8169 3.08492,-1.22536 -0.22729,-0.94701 -0.45454,-1.89402 -0.68184,-2.84103 -1.0283,0.40845 -2.0566,0.81693 -3.0849,1.22536 z m -2.97596,18.72814 c 0.52261,-6.05627 1.04524,-12.11254 1.56787,-18.16882 -1.0713,0.42552 -2.14259,0.85106 -3.21389,1.27658 -0.38017,4.57544 -0.76034,9.15085 -1.140523,13.7263 -2.4611,-3.44687 -4.92219,-6.8937 -7.38327,-10.34052 -1.07846,0.42836 -2.15693,0.85674 -3.23539,1.28513 3.3147,4.53204 6.6294,9.06409 9.9441,13.59611 1.153703,-0.45826 2.307403,-0.91652 3.461103,-1.37478 z m -21.993573,5.18142 0,0 0.07716,0.083 c 1.13508,1.25952 2.99974,1.87942 4.71444,1.58217 1.51702,-0.24727 2.99112,-0.78722 4.22564,-1.62946 1.45404,-0.98613 2.34998,-2.81491 1.76109,-4.48306 -0.29364,-0.9836 -1.21088,-1.74375 -2.2718,-1.97983 -1.61813,-0.31999 -3.25149,0.0344 -4.86456,0.13324 -0.60818,0.11478 -1.48844,-0.0868 -1.50031,-0.79223 0.01436,-0.83046 0.92863,-1.24443 1.6525,-1.49905 0.89089,-0.31947 2.06903,-0.3286 2.75751,0.40543 0.87502,-0.53109 1.75008,-1.0622 2.6251,-1.59328 -0.87142,-1.16599 -2.49533,-1.75114 -3.97073,-1.49672 -1.54196,0.25468 -3.02557,0.85074 -4.24694,1.7457 -1.19385,0.88116 -2.0373,2.3593 -1.62643,3.81141 0.26694,1.06578 1.18738,2.00034 2.3668,2.21772 1.66073,0.23352 3.3242,-0.0522 4.98303,-0.075 0.63611,-0.0903 1.27492,0.45869 1.09926,1.0615 -0.32023,0.9906 -1.45408,1.49193 -2.46949,1.71509 -0.93376,0.22761 -1.88221,-0.22091 -2.53771,-0.83533 -0.92485,0.5429 -1.84972,1.08581 -2.77456,1.62871 z"
+           id="path78354-4"
+           style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';opacity:0.79646014;fill:#ff4300;fill-opacity:1;stroke:#000000;stroke-width:0.14506666;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter78694-4)"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:transform-center-x="0.85115577"
+           inkscape:transform-center-y="-0.25241573"
+           transform="matrix(1.1645808,0,0,1.1687526,-22.635297,-74.413789)"
+           d="m 134.95062,164.31066 c 0.92413,-3.80682 1.84822,-7.61367 2.77236,-11.42051 -1.00191,0.18387 -2.00383,0.36773 -3.00574,0.5516 -0.53028,2.53583 -1.06059,5.07168 -1.59088,7.60754 -0.73949,-2.30283 -1.47896,-4.60565 -2.21846,-6.90849 -0.90796,0.16663 -1.81596,0.33325 -2.72393,0.49988 -0.53724,2.53712 -1.07451,5.07425 -1.61177,7.61139 -0.87168,-2.2786 -1.74333,-4.55715 -2.61505,-6.83572 -0.8871,0.1628 -1.7742,0.32559 -2.66131,0.48837 1.37889,3.38421 2.75777,6.76844 4.13665,10.15263 0.92536,-0.16982 1.85075,-0.33963 2.77613,-0.50944 0.54396,-2.41507 1.08791,-4.83012 1.63186,-7.24518 0.76408,2.17499 1.52819,4.35004 2.29227,6.52504 0.93929,-0.17236 1.87859,-0.34474 2.81787,-0.51711 z m -16.81335,-3.25405 c -1.56202,0.28664 -3.12402,0.57329 -4.68601,0.85995 -0.0343,-0.59689 0.0181,-1.20795 0.26884,-1.7511 0.41908,-0.97799 1.62909,-1.62543 2.78056,-1.29452 1.01298,0.2901 1.47401,1.30556 1.63661,2.18567 z m 2.97855,1.25147 c -0.0307,-1.10282 -0.28159,-2.23008 -0.80166,-3.24873 -0.64882,-1.32072 -2.09078,-2.31532 -3.64168,-2.38894 -1.48579,-0.0656 -2.97717,0.35805 -4.12967,1.17453 -1.8124,1.33311 -2.47208,3.71277 -1.96719,5.84192 0.29267,1.41357 1.12525,2.81785 2.50123,3.58819 1.63695,0.97741 3.75116,0.87177 5.37117,0.12183 1.45556,-0.6631 2.42783,-2.00879 2.72974,-3.48703 -0.78863,0.02 -1.57727,0.04 -2.36589,0.06 -0.39428,-0.0735 -0.53876,0.12965 -0.59421,0.47951 -0.36955,0.97915 -1.52073,1.63343 -2.65858,1.40349 -1.08407,-0.21573 -1.81762,-1.19343 -1.95757,-2.16577 2.50478,-0.45966 5.00955,-0.91932 7.51431,-1.37898 z m -16.00706,-3.43284 c 0.14388,3.61084 0.28777,7.2217 0.43168,10.83254 0.99843,-0.18324 1.99687,-0.36644 2.99529,-0.54966 -0.14391,-3.61086 -0.28778,-7.22171 -0.4317,-10.83255 -0.99842,0.18322 -1.99683,0.36645 -2.99527,0.54967 z m -0.16894,-4.11999 c 0.0365,0.8838 0.0729,1.76759 0.10934,2.65137 0.99844,-0.18322 1.99687,-0.36645 2.99531,-0.54967 -0.0365,-0.88379 -0.0729,-1.76757 -0.10936,-2.65136 -0.99843,0.18321 -1.99686,0.36646 -2.99529,0.54966 z m -6.005723,16.16487 c 1.546173,-5.30466 3.092353,-10.60931 4.638543,-15.91397 -1.04018,0.19088 -2.08035,0.38177 -3.12053,0.57264 -1.154913,4.01018 -2.309823,8.02033 -3.464753,12.03052 -1.60381,-3.50393 -3.20762,-7.00783 -4.81143,-10.51172 -1.04713,0.19215 -2.09427,0.38431 -3.1414,0.57648 2.17967,4.62092 4.35934,9.24184 6.53901,13.86275 1.12019,-0.20557 2.24037,-0.41113 3.36056,-0.6167 z m -20.72335,0.75139 0,0 0.05474,0.0875 c 0.79833,1.32182 2.36719,2.20192 3.9639,2.23843 1.40985,0.0463 2.83303,-0.17575 4.09418,-0.70926 1.48437,-0.62314 2.61588,-2.09523 2.3819,-3.68515 -0.08971,-0.92806 -0.78059,-1.76662 -1.69391,-2.16344 -1.40015,-0.56953 -2.93377,-0.54087 -4.40374,-0.73627 -0.568,-0.005 -1.32478,-0.33898 -1.21019,-0.96962 0.16043,-0.73747 1.05716,-0.94565 1.75416,-1.0453 0.8589,-0.12809 1.92132,0.0709 2.41086,0.84592 0.8822,-0.31944 1.76443,-0.63889 2.64663,-0.95833 -0.57755,-1.19213 -1.9358,-1.99895 -3.30945,-2.03156 -1.43362,-0.0441 -2.87533,0.22629 -4.134,0.80909 -1.23145,0.57533 -2.25341,1.74421 -2.14136,3.11034 0.05107,0.99659 0.71385,1.99111 1.7372,2.39211 1.45386,0.49997 3.00241,0.53773 4.50007,0.80897 0.5888,0.0313 1.06648,0.6328 0.80125,1.13907 -0.46426,0.82641 -1.57423,1.07384 -2.52814,1.09422 -0.88118,0.0387 -1.65552,-0.52767 -2.1366,-1.19036 -0.92917,0.32121 -1.85834,0.64242 -2.7875,0.96363 z"
+           id="path78356-0"
+           style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';opacity:0.53982299;fill:#ff4300;fill-opacity:1;stroke:#000000;stroke-width:0.14506666;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter78638-0)"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:transform-center-x="1.1896032"
+           inkscape:transform-center-y="-0.040916555"
+           transform="matrix(1.1645808,0,0,1.1687526,-22.635297,-74.413789)"
+           d="m 145.71273,160.19173 c -1.17675,-5.00695 -2.35352,-10.0139 -3.53028,-15.02089 -0.98962,0.79738 -1.97927,1.59476 -2.9689,2.39214 0.8771,3.28579 1.75422,6.57158 2.63132,9.85738 -2.13134,-2.27523 -4.26266,-4.55047 -6.394,-6.8257 -0.89686,0.72262 -1.79371,1.44524 -2.69057,2.16787 0.87023,3.29132 1.74047,6.58266 2.6107,9.87399 -2.26191,-2.17003 -4.52382,-4.34006 -6.78575,-6.51007 -0.87623,0.70601 -1.75247,1.41202 -2.62872,2.11802 3.45156,3.17411 6.90311,6.34823 10.35466,9.52232 0.91402,-0.73645 1.82808,-1.47293 2.74212,-2.20938 -0.79278,-3.15188 -1.58557,-6.30375 -2.37834,-9.4556 2.08478,2.11084 4.16961,4.2217 6.2544,6.33254 0.9278,-0.74753 1.85559,-1.49508 2.78336,-2.24262 z m -20.24938,5.93605 c -1.54288,1.24313 -3.08575,2.48626 -4.62861,3.7294 -0.38036,-0.68108 -0.67415,-1.42911 -0.71209,-2.21247 -0.10371,-1.39173 0.84708,-2.8543 2.29597,-3.13393 1.27402,-0.24718 2.36137,0.67779 3.04473,1.617 z m 3.97505,-0.25889 c -0.66712,-1.27732 -1.58901,-2.45553 -2.74272,-3.34999 -1.46801,-1.17448 -3.61571,-1.50569 -5.35342,-0.69208 -1.66191,0.78523 -3.04887,2.14827 -3.8397,3.77597 -1.21542,2.61738 -0.56948,5.79483 1.20561,8.00225 1.13204,1.49021 2.84893,2.65618 4.79567,2.76231 2.35099,0.19784 4.60149,-1.15318 5.94162,-2.97406 1.21024,-1.62345 1.50003,-3.76806 0.98084,-5.67927 -0.85063,0.48116 -1.70126,0.96232 -2.55189,1.44348 -0.47323,0.14248 -0.51447,0.46492 -0.3741,0.90796 0.15854,1.36434 -0.72404,2.80081 -2.10002,3.19112 -1.30899,0.37577 -2.67259,-0.3467 -3.38416,-1.40738 2.47409,-1.99344 4.94818,-3.98688 7.42227,-5.98031 z m -19.47068,5.25816 c 2.23167,4.15697 4.46336,8.31397 6.69504,12.47094 0.98621,-0.79462 1.97242,-1.58921 2.95861,-2.38381 -2.23169,-4.15698 -4.46338,-8.31398 -6.69506,-12.47094 -0.9862,0.7946 -1.97239,1.5892 -2.95859,2.38381 z m -2.55156,-4.74038 c 0.54758,1.01675 1.09514,2.0335 1.6427,3.05025 0.9862,-0.7946 1.97241,-1.58922 2.95861,-2.38382 -0.54757,-1.01675 -1.09512,-2.0335 -1.64271,-3.05025 -0.9862,0.79461 -1.9724,1.58923 -2.9586,2.38382 z m 2.72119,22.46901 c -1.35721,-7.12697 -2.71442,-14.25394 -4.07162,-21.38092 -1.02745,0.82782 -2.05488,1.65566 -3.08232,2.48348 1.04127,5.37969 2.08253,10.75937 3.12379,16.13908 -3.76621,-3.18416 -7.532403,-6.3683 -11.298593,-9.55242 -1.0343,0.83335 -2.06862,1.66672 -3.10293,2.50009 5.03742,4.16174 10.074853,8.32348 15.112263,12.4852 1.10647,-0.89151 2.21294,-1.783 3.31941,-2.67451 z m -22.222633,12.90907 0,0 0.11013,0.071 c 1.63208,1.089 3.85273,1.21209 5.61919,0.32833 1.56781,-0.76383 2.99603,-1.85052 4.06821,-3.20897 1.26469,-1.59324 1.65591,-3.97869 0.48676,-5.71008 -0.63124,-1.03783 -1.86822,-1.62165 -3.09463,-1.55764 -1.8578,0.14374 -3.51784,1.06742 -5.23703,1.69103 -0.62358,0.32422 -1.64296,0.37074 -1.87999,-0.43637 -0.24829,-0.95916 0.61239,-1.72406 1.31709,-2.24559 0.86535,-0.64887 2.14105,-1.03182 3.12148,-0.4057 0.78089,-0.88713 1.56179,-1.77427 2.34268,-2.66139 -1.31623,-1.06483 -3.26455,-1.22409 -4.78491,-0.4652 -1.59253,0.78023 -3.01326,1.93442 -4.05439,3.34931 -1.01566,1.39033 -1.46134,3.35611 -0.55404,4.89544 0.62837,1.14073 1.92425,1.92404 3.27331,1.80106 1.87655,-0.25658 3.59107,-1.11094 5.38411,-1.66154 0.66165,-0.30492 1.52939,0.12422 1.53031,0.87269 -0.03278,1.23994 -1.10403,2.17467 -2.13511,2.75221 -0.94107,0.55683 -2.1129,0.3411 -3.01954,-0.15795 -0.83121,0.91644 -1.66242,1.83291 -2.49363,2.74935 z"
+           id="path77381-6"
+           style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';opacity:0.8053097;fill:#ff4300;fill-opacity:1;stroke:#000000;stroke-width:0.14506666;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter78450-0)"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:transform-center-x="1.268782"
+           d="m 158.66511,106.3675 c -1.88115,-6.740483 -3.76231,-13.480953 -5.64347,-20.221453 -1.21568,1.15128 -2.4314,2.30255 -3.6471,3.45384 1.36949,4.41645 2.739,8.83292 4.1085,13.249403 -2.91024,-2.957403 -5.82047,-5.914803 -8.73072,-8.872193 -1.10174,1.04335 -2.20346,2.0867 -3.30519,3.13004 1.36103,4.424443 2.7221,8.848923 4.08316,13.273383 -3.07064,-2.80549 -6.14129,-5.61098 -9.21195,-8.41646 -1.07639,1.01936 -2.1528,2.0387 -3.22921,3.05806 4.6756,4.09414 9.35118,8.18832 14.02677,12.28246 1.12283,-1.06332 2.24569,-2.12665 3.36853,-3.18999 -1.25115,-4.23968 -2.5023,-8.47934 -3.75343,-12.71899 2.8383,2.73661 5.67663,5.47323 8.51493,8.20985 1.13973,-1.07932 2.27946,-2.15865 3.41918,-3.23795 z m -25.63428,9.42242 c -1.89532,1.79488 -3.79064,3.58973 -5.68596,5.38461 -0.53947,-0.90232 -0.97239,-1.90152 -1.07854,-2.96577 -0.23531,-1.88834 0.88174,-3.94288 2.72654,-4.41948 1.62205,-0.42085 3.08954,0.76685 4.03796,2.00064 z m 5.09843,-0.61538 c -0.95226,-1.69529 -2.22527,-3.23879 -3.77592,-4.38053 -1.97579,-1.5023 -4.7649,-1.81131 -6.94247,-0.58847 -2.08205,1.17918 -3.76788,3.12702 -4.66693,5.39586 -1.37324,3.64463 -0.30927,7.92884 2.13739,10.81745 1.56636,1.95444 3.86191,3.4287 6.37586,3.4445 3.04106,0.11396 5.83946,-1.87463 7.43154,-4.44285 1.43927,-2.29077 1.65547,-5.23039 0.84728,-7.79865 -1.05989,0.71145 -2.11975,1.42293 -3.17963,2.1344 -0.59881,0.22532 -0.62832,0.66713 -0.41521,1.26116 0.30391,1.84743 -0.72724,3.86191 -2.47009,4.48441 -1.65766,0.59826 -3.46598,-0.2954 -4.4596,-1.69275 3.03925,-2.87818 6.07852,-5.75636 9.11778,-8.63453 z m -24.68138,8.44781 c 3.17706,5.51325 6.35412,11.0265 9.53118,16.53975 1.21149,-1.14728 2.42299,-2.29454 3.63446,-3.44182 -3.17705,-5.51324 -6.35413,-11.0265 -9.53119,-16.53974 -1.21149,1.14727 -2.42296,2.29453 -3.63445,3.44181 z m -3.63153,-6.28654 c 0.7793,1.34836 1.55859,2.69672 2.33787,4.04507 1.21149,-1.14726 2.42298,-2.29454 3.63447,-3.44181 -0.7793,-1.34837 -1.55858,-2.69672 -2.33788,-4.04509 -1.21148,1.14727 -2.42297,2.29455 -3.63446,3.44183 z m 5.14665,30.41749 c -2.26852,-9.61549 -4.53705,-19.23099 -6.80556,-28.84649 -1.26215,1.19523 -2.5243,2.39049 -3.78644,3.58574 1.73398,7.25699 3.46796,14.51399 5.20194,21.771 -5.08139,-4.08702 -10.162803,-8.17403 -15.244163,-12.26101 -1.2706,1.20322 -2.54118,2.40646 -3.811763,3.6097 6.789443,5.3342 13.578876,10.66841 20.368306,16.00261 1.35924,-1.28718 2.71845,-2.57436 4.07768,-3.86155 z m -27.664556,19.04852 0,0 0.14699,0.0894 c 2.18074,1.37505 5.048543,1.39583 7.257993,0.0756 1.9625,-1.14383 3.72165,-2.71809 5.00258,-4.63888 1.511593,-2.25323 1.840743,-5.5275 0.20898,-7.80795 -0.88855,-1.37154 -2.52372,-2.08475 -4.09787,-1.9165 -2.38117,0.31857 -4.450683,1.68619 -6.618333,2.64908 -0.77904,0.48274 -2.08796,0.61349 -2.45215,-0.46993 -0.3898,-1.28974 0.66229,-2.38827 1.53134,-3.14507 1.06656,-0.94083 2.68084,-1.54664 3.988813,-0.75885 0.94042,-1.25969 1.88085,-2.5194 2.82125,-3.77909 -1.77236,-1.363 -4.292223,-1.45106 -6.193993,-0.3171 -1.9931,1.16779 -3.73768,2.83347 -4.97452,4.82906 -1.205833,1.96045 -1.635803,4.66685 -0.35519,6.70306 0.89239,1.51184 2.61798,2.49284 4.34572,2.23615 2.39704,-0.47346 4.541783,-1.75028 6.809823,-2.61862 0.82947,-0.45896 1.97798,0.068 2.03389,1.0872 0.04849,1.69068 -1.26222,3.03439 -2.54736,3.88905 -1.17078,0.8205 -2.69513,0.6042 -3.898843,-0.0154 -1.00303,1.30294 -2.00607,2.60591 -3.00912,3.90886 z"
+           id="text75582-2"
+           style="font-style:normal;font-weight:normal;font-size:12px;font-family:'Bitstream Vera Sans';fill:#ff2a2a;fill-opacity:1;stroke:#000000;stroke-width:1.16666484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <ellipse
+         transform="matrix(0.65810333,0,0,0.65765029,450.12071,853.51489)"
+         id="path2640-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.53164559;fill:url(#radialGradient7353);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.40487173;marker:none"
+         cx="24.714285"
+         cy="38.57143"
+         rx="19.714285"
+         ry="6.5714288" />
+      <circle
+         transform="matrix(1.3709227,0,0,1.3699789,423.4365,842.66876)"
+         id="path2642-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient7355);fill-opacity:1;fill-rule:evenodd;stroke:#9c8c0a;stroke-width:0.48004404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="31.112698"
+         cy="19.008621"
+         r="8.6620579" />
+      <g
+         id="g2644-0"
+         transform="matrix(0.65810333,0,0,0.65765029,450.12071,853.51489)">
+        <ellipse
+           transform="translate(-2.875,-0.625)"
+           id="path2646-8"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999946;marker:none"
+           cx="36"
+           cy="19.1875"
+           rx="2.375"
+           ry="0.5625" />
+        <ellipse
+           transform="translate(-20.25,-0.625)"
+           id="path2648-1"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999946;marker:none"
+           cx="36"
+           cy="19.1875"
+           rx="2.375"
+           ry="0.5625" />
+      </g>
+      <circle
+         transform="matrix(1.3029011,0,0,1.3020042,425.55287,843.9609)"
+         id="path2650-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.67721522;fill:none;stroke:#ffffff;stroke-width:0.50510627;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="31.112698"
+         cy="19.008621"
+         r="8.6620579" />
+      <path
+         d="m 470.29647,871.12176 c -0.97991,1.69606 -2.12566,2.9184 -4.16528,2.9184 -1.98159,0 -3.43221,-1.40878 -4.33755,-2.97579 0.82818,0.99203 2.04101,2.1316 4.25142,2.1316 2.64109,0 3.10289,-0.94364 4.25141,-2.07421 z"
+         sodipodi:nodetypes="czczc"
+         id="path2652-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36000001;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 470.29647,870.89221 c -0.97991,1.69607 -2.12566,2.91841 -4.16528,2.91841 -1.98159,0 -3.43221,-1.40879 -4.33755,-2.97579 0.82818,0.99203 2.04101,2.1316 4.25142,2.1316 2.64109,0 3.10289,-0.94365 4.25141,-2.07422 z"
+         sodipodi:nodetypes="czczc"
+         id="path2654-1"
+         style="fill:url(#radialGradient7357);fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+      <circle
+         transform="matrix(0.65810333,0,0,0.65765029,450.3675,855.32343)"
+         id="path2656-0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#414141;stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="11.490486"
+         cy="12.467883"
+         r="9.5459423" />
+      <circle
+         transform="matrix(0.65810333,0,0,0.65765029,466.53839,855.32343)"
+         id="path2658-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#414141;stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="11.490486"
+         cy="12.467883"
+         r="9.5459423" />
+      <path
+         sodipodi:ry="6.5936913"
+         sodipodi:rx="6.1559095"
+         transform="matrix(-0.26439301,-0.31536435,0.31558162,-0.26421102,464.96555,871.02982)"
+         sodipodi:end="1.3891474"
+         sodipodi:start="0"
+         d="m 17.646396,12.467883 a 6.1559095,6.5936913 0 0 1 -5.043835,6.485206"
+         sodipodi:open="true"
+         sodipodi:cy="12.467883"
+         sodipodi:cx="11.490486"
+         id="path2660-4"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#414141;stroke-width:1.59850872;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         sodipodi:type="arc" />
+      <circle
+         transform="matrix(0.67926663,0,0,0.678799,462.13838,850.97333)"
+         id="path2662-0"
+         style="color:#000000;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#3063a3;stroke-width:0.968844;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="17.589281"
+         cy="18.478292"
+         r="8.3085051" />
+      <path
+         d="m 473.97966,858.59102 c -2.52918,0 -4.57723,2.04664 -4.57723,4.57408 0,0.72993 0.20413,1.40155 0.50858,2.0141 0.60825,0.22404 1.25437,0.37646 1.94015,0.37646 2.99705,0 5.3906,-2.35953 5.57555,-5.30819 -0.84068,-0.99276 -2.04469,-1.65645 -3.44705,-1.65645 z"
+         id="path2664-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.83422457;fill:url(#radialGradient7359);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+      <circle
+         transform="matrix(0.67926663,0,0,0.678799,445.99489,850.97333)"
+         id="path2666-9"
+         style="color:#000000;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#3063a3;stroke-width:0.968844;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         cx="17.589281"
+         cy="18.478292"
+         r="8.3085051" />
+      <path
+         d="m 457.83617,858.59102 c -2.52918,0 -4.57724,2.04664 -4.57724,4.57408 0,0.72993 0.20414,1.40155 0.50859,2.0141 0.60824,0.22404 1.25437,0.37646 1.94014,0.37646 2.99706,0 5.39061,-2.35953 5.57556,-5.30819 -0.84067,-0.99276 -2.04469,-1.65645 -3.44705,-1.65645 z"
+         id="path2668-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.83422457;fill:url(#radialGradient7361);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

sview-15_10.tar.gz/include/StAV/StAVVideoMuxer.h Added

@@ -0,0 +1,102 @@
+/**
+ * Copyright © 2015 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 __StAVVideoMuxer_h_
+#define __StAVVideoMuxer_h_
+
+#include <StGLStereo/StFormatEnum.h>
+#include <StSlots/StSignal.h>
+#include <StTemplates/StArrayList.h>
+
+struct AVFormatContext;
+struct AVCodecContext;
+struct AVCodec;
+struct AVFrame;
+struct AVStream;
+
+/**
+ * This class implements video re-muxing operation using libav* libraries.
+ */
+class StAVVideoMuxer {
+
+        protected:
+
+    struct StRemuxContext {
+        AVFormatContext*          Context;
+        bool                      State;
+        StArrayList<unsigned int> Streams;
+
+        StRemuxContext() : Context(NULL), State(true) {}
+    };
+
+        public:
+
+    /**
+     * Initialize empty image.
+     */
+    ST_CPPEXPORT StAVVideoMuxer();
+
+    /**
+     * Destructor.
+     */
+    ST_CPPEXPORT virtual ~StAVVideoMuxer();
+
+    /**
+     * Close currently opened files.
+     */
+    ST_CPPEXPORT void close();
+
+    /**
+     * Return stereo format.
+     */
+    ST_LOCAL StFormat getStereoFormat() const { return myStereoFormat; }
+
+    /**
+     * Set stereo format.
+     */
+    ST_LOCAL void setStereoFormat(const StFormat theStereoFormat) { myStereoFormat = theStereoFormat; }
+
+    /**
+     * Add input file.
+     */
+    ST_CPPEXPORT bool addFile(const StString& theFileToLoad);
+
+    /**
+     * Save to the file.
+     */
+    ST_CPPEXPORT virtual bool save(const StString& theFile);
+
+        public: //! @name signals
+
+    /**
+     * All callback handlers should be thread-safe.
+     */
+    struct {
+        /**
+         * Emit callback Slot on error.
+         * @param theUserData (const StString& ) - error description.
+         */
+        StSignal<void (const StCString& )> onError;
+    } signals;
+
+        protected:
+
+    /**
+     * Create output stream from input stream.
+     */
+    ST_CPPEXPORT bool addStream(AVFormatContext* theContext,
+                                const AVStream*  theStream);
+
+        private:
+
+    StArrayList<AVFormatContext*> myCtxListSrc;
+    StFormat                      myStereoFormat;
+
+};
+
+#endif // __StAVVideoMuxer_h_

sview-15_08.tar.gz/include/StAV/stAV.h -> sview-15_10.tar.gz/include/StAV/stAV.h Changed

sview-15_08.tar.gz/include/StCore/StAndroidGlue.h -> sview-15_10.tar.gz/include/StCore/StAndroidGlue.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * StCore library is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -25,6 +25,7 @@
 #include <StStrings/StString.h>
 #include <StThreads/StMutex.h>
 #include <StThreads/StThread.h>
+#include <StTemplates/StQuaternion.h>
 
 #include <android/configuration.h>
 #include <android/native_activity.h>
@@ -80,6 +81,7 @@
         CommandId_Pause,         //!< activity has been paused
         CommandId_Stop,          //!< activity has been stopped
         CommandId_Destroy,       //!< activity is being destroyed, and waiting for the application thread to clean up and exit before proceeding
+        CommandId_BackPressed,   //!< pressed special back button
     };
 
     /**
@@ -152,9 +154,28 @@
     }
 
     /**
-     * Pop onNewIntent() open file event.
+     * Return true if device has orientation sensor.
      */
-    ST_CPPEXPORT bool popOpenNewFile(StString& theNewFile);
+    ST_LOCAL bool hasOrientationSensor() const { return myHasOrientSensor; }
+
+    /**
+     * Return true if orientation sensor has poor quality.
+     */
+    ST_LOCAL bool isPoorOrientationSensor() const { return myIsPoorOrient; }
+
+    /**
+     * Turn orientation sensor on/off.
+     * Has no effect in case if sensor is unavailable.
+     */
+    ST_CPPEXPORT void setTrackOrientation(const bool theToTrack);
+
+    /**
+     * Fetch current state:
+     * @param theNewFile pop onNewIntent() open file event
+     * @param theQuaternion device orientation
+     */
+    ST_CPPEXPORT void fetchState(StString&             theNewFile,
+                                 StQuaternion<double>& theQuaternion);
 
     /**
      * Return device memory class.
@@ -178,6 +199,11 @@
      */
     ST_CPPEXPORT void postExit();
 
+    /**
+     * Low-level method to write command into queue.
+     */
+    ST_CPPEXPORT bool writeCommand(const int8_t theCmd);
+
         public:  //! @name Signals
 
     struct {
@@ -200,7 +226,6 @@
 
     ST_CPPEXPORT void readOpenPath();
 
-    ST_CPPEXPORT bool writeCommand(const int8_t theCmd);
     ST_CPPEXPORT void printConfig();
     ST_CPPEXPORT void freeSavedState();
 
@@ -227,6 +252,29 @@
 
     ST_CPPEXPORT void threadEntry();
 
+        public: //! @name StActivity callbacks
+
+    /**
+     * Define device orientation sensor.
+     * @param theHasSensor flag indicating that device has orientation sensors
+     * @param theIsPoor    flag indicating that available orientation sensor provides imprecise values
+     */
+    ST_LOCAL void defineOrientationSensor(bool theHasSensor,
+                                          bool theIsPoor) {
+        myHasOrientSensor = theHasSensor;
+        myIsPoorOrient    = theIsPoor;
+    }
+
+    /**
+     * Define device orientation by quaternion.
+     */
+    ST_LOCAL void setQuaternion(const StQuaternion<float>& theQ, const float theScreenRotDeg);
+
+    /**
+     * Define device orientation using deprecated Android API.
+     */
+    ST_LOCAL void setOrientation(float theAzimuthDeg, float thePitchDeg, float theRollDeg, float theScreenRotDeg);
+
         private: //! @name ANativeActivity callbacks
 
     ST_LOCAL static void processInputWrapper(StAndroidGlue*       theApp,
@@ -335,8 +383,13 @@
     StAndroidPollSource     myCmdPollSource;
     StAndroidPollSource     myInputPollSource;
 
-    StMutex                 myDndLock;           //!< Drag & Drop data lock
+    StMutex                 myFetchLock;         //!< fetch data lock
     StString                myDndPath;           //!< intent data string
+    StString                myCreatePath;        //!< intent data string used to open this activity
+    StQuaternion<double>    myQuaternion;        //!< device orientation
+    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                    myIsRunning;
     bool                    myIsStateSaved;

sview-15_08.tar.gz/include/StCore/StApplication.h -> sview-15_10.tar.gz/include/StCore/StApplication.h Changed

sview-15_08.tar.gz/include/StCore/StEvent.h -> sview-15_10.tar.gz/include/StCore/StEvent.h Changed

@@ -27,6 +27,7 @@
 enum StEventType {
     stEvent_None,       //!< StAnyEvent,    undefined event
     stEvent_Close,      //!< StCloseEvent,  window close requested
+    stEvent_Pause,      //!< StPauseEvent,  window can be closed at any moment
     stEvent_Size,       //!< StSizeEvent,   window resized
     stEvent_NewMonitor, //!< StSizeEvent,   window moved to another monitor
     stEvent_KeyDown,    //!< StKeyEvent,    keyboard key pressed
@@ -60,6 +61,16 @@
 };
 
 /**
+ * Pause window request.
+ */
+struct StPauseEvent {
+
+    StEventType   Type;   //!< event type
+    double        Time;   //!< time in seconds when event was registered
+
+};
+
+/**
  * Window resize event.
  */
 struct StSizeEvent {
@@ -150,6 +161,7 @@
     StEventType   Type;     //!< event type
     StAnyEvent    Base;     //!< fields shared between all event
     StCloseEvent  Close;    //!< window close  event
+    StPauseEvent  Pause;    //!< window pause  event
     StSizeEvent   Size;     //!< window resize event
     StKeyEvent    Key;      //!< keyboard key down/up event
     StClickEvent  Button;   //!< mouse button down/up event

sview-15_08.tar.gz/include/StCore/StOpenInfo.h -> sview-15_10.tar.gz/include/StCore/StOpenInfo.h Changed

sview-15_08.tar.gz/include/StCore/StWindow.h -> sview-15_10.tar.gz/include/StCore/StWindow.h Changed

@@ -195,6 +195,12 @@
     ST_CPPEXPORT bool isActive() const;
 
     /**
+     * Return true if window is in paused state (e.g. it is hidden and can be closed by system at any moment).
+     * Similar to !isActive() but more aggressive - application should consider destroying itself.
+     */
+    ST_CPPEXPORT bool isPaused() const;
+
+    /**
      * Show up the window.
      */
     ST_CPPEXPORT virtual void show();
@@ -227,6 +233,11 @@
     ST_CPPEXPORT StRectI_t getPlacement() const;
 
     /**
+     * Return GUI GL window placement in windowed state (ignores active full-screen placement).
+     */
+    ST_CPPEXPORT StRectI_t getWindowedPlacement() const;
+
+    /**
      * Return false if window position or dimensions can not be changes
      * (systems supports only full-screen mode, or window is embedded).
      */
@@ -408,6 +419,40 @@
     ST_CPPEXPORT void setTargetFps(const double theFPS);
 
     /**
+     * Return optional statistics for verbose output.
+     */
+    ST_CPPEXPORT const StString& getStatistics() const;
+
+    /**
+     * Return true if device has orientation sensor.
+     */
+    ST_CPPEXPORT virtual bool hasOrientationSensor() const;
+
+    /**
+     * Return true if orientation sensor has poor quality.
+     */
+    ST_CPPEXPORT virtual bool isPoorOrientationSensor() const;
+
+    /**
+     * Return true if orientation sensor has been enabled.
+     */
+    ST_CPPEXPORT virtual bool toTrackOrientation() const;
+
+    /**
+     * Turn orientation sensor on/off.
+     * Has no effect in case if sensor is unavailable.
+     */
+    ST_CPPEXPORT virtual void setTrackOrientation(const bool theToTrack);
+
+    /**
+     * 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).
+     * - Z is positive heading backwards (tangential to the ground).
+     */
+    ST_CPPEXPORT virtual StQuaternion<double> getDeviceOrientation() const;
+
+    /**
      * Retrieve options list.
      */
     ST_CPPEXPORT virtual void getOptions(StParamsList& theList) const;
@@ -446,6 +491,7 @@
         StSignal<void (const unsigned int   )> onRedraw;
 
         StSignal<void (const StCloseEvent&  )> onClose;
+        StSignal<void (const StPauseEvent&  )> onPause;
         StSignal<void (const StSizeEvent&   )> onResize;
         StSignal<void (const StSizeEvent&   )> onAnotherMonitor;
         StSignal<void (const StKeyEvent&    )> onKeyUp;

sview-15_08.tar.gz/include/StFile/StNode.h -> sview-15_10.tar.gz/include/StFile/StNode.h Changed

sview-15_08.tar.gz/include/StGL/StGLContext.h -> sview-15_10.tar.gz/include/StGL/StGLContext.h Changed

sview-15_08.tar.gz/include/StGL/StGLFunctions.h -> sview-15_10.tar.gz/include/StGL/StGLFunctions.h Changed

@@ -44,6 +44,14 @@
     #include <GLES2/gl2.h>
     ///#include <GLES3/gl3.h>
 
+    // in core since OpenGL ES 3.0
+    #define GL_UNPACK_ROW_LENGTH  0x0CF2
+    #define GL_UNPACK_SKIP_ROWS   0x0CF3
+    #define GL_UNPACK_SKIP_PIXELS 0x0CF4
+    #define GL_PACK_ROW_LENGTH    0x0D02
+    #define GL_PACK_SKIP_ROWS     0x0D03
+    #define GL_PACK_SKIP_PIXELS   0x0D04
+
     // in core since OpenGL ES 3.0, extension GL_EXT_texture_rg
     #define GL_RED   0x1903
     #define GL_R8    0x8229
@@ -1454,7 +1462,7 @@
         public: //! @name CGL extensions
 
 #else
-        public: //! @name glX extensions
+        public: //! @name GLX extensions
 
     // GLX_EXT_swap_control
     //typedef int         (*glXSwapIntervalEXT_t)(Display* theDisplay, GLXDrawable theDrawable, int theInterval);
@@ -1463,6 +1471,41 @@
 
     typedef int         (*glXSwapIntervalSGI_t)(int theInterval);
     glXSwapIntervalSGI_t glXSwapIntervalSGI;
+
+        // GLX_MESA_query_renderer
+
+#ifndef GLX_RENDERER_VENDOR_ID_MESA
+    // for glXQueryRendererIntegerMESA() and glXQueryCurrentRendererIntegerMESA()
+    #define GLX_RENDERER_VENDOR_ID_MESA                      0x8183
+    #define GLX_RENDERER_DEVICE_ID_MESA                      0x8184
+    #define GLX_RENDERER_VERSION_MESA                        0x8185
+    #define GLX_RENDERER_ACCELERATED_MESA                    0x8186
+    #define GLX_RENDERER_VIDEO_MEMORY_MESA                   0x8187
+    #define GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA    0x8188
+    #define GLX_RENDERER_PREFERRED_PROFILE_MESA              0x8189
+    #define GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA    0x818A
+    #define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B
+    #define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA      0x818C
+    #define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA     0x818D
+
+    #define GLX_RENDERER_ID_MESA                             0x818E
+#endif // GLX_RENDERER_VENDOR_ID_MESA
+
+    typedef void* stglxDisplay_t; // Display*
+    typedef int   stglxBool;      // Bool
+    typedef stglxBool (*glXQueryRendererIntegerMESA_t)(stglxDisplay_t dpy, int screen,
+                                                       int renderer, int attribute,
+                                                       unsigned int *value);
+    typedef stglxBool (*glXQueryCurrentRendererIntegerMESA_t)(int attribute, unsigned int *value);
+    typedef const char* (*glXQueryRendererStringMESA_t)(stglxDisplay_t dpy, int screen,
+                                                        int renderer, int attribute);
+    typedef const char* (*glXQueryCurrentRendererStringMESA_t)(int attribute);
+
+    glXQueryRendererIntegerMESA_t        glXQueryRendererIntegerMESA;
+    glXQueryCurrentRendererIntegerMESA_t glXQueryCurrentRendererIntegerMESA;
+    glXQueryRendererStringMESA_t         glXQueryRendererStringMESA;
+    glXQueryCurrentRendererStringMESA_t  glXQueryCurrentRendererStringMESA;
+
 #endif
 
 #endif // OpenGL desktop or ES

sview-15_08.tar.gz/include/StGL/StGLMatrix.h -> sview-15_10.tar.gz/include/StGL/StGLMatrix.h Changed

sview-15_08.tar.gz/include/StGL/StGLTexture.h -> sview-15_10.tar.gz/include/StGL/StGLTexture.h Changed

sview-15_08.tar.gz/include/StGL/StGLVec.h -> sview-15_10.tar.gz/include/StGL/StGLVec.h Changed

sview-15_08.tar.gz/include/StGL/StParams.h -> sview-15_10.tar.gz/include/StGL/StParams.h Changed

@@ -54,8 +54,12 @@
     /**
      * Main constructor - default parameters.
      */
-    StStereoParams(ViewMode theViewMode = FLAT_IMAGE)
-    : ViewingMode(theViewMode),
+    StStereoParams()
+    : Src1SizeX(0),
+      Src1SizeY(0),
+      Src2SizeX(0),
+      Src2SizeY(0),
+      ViewingMode(FLAT_IMAGE),
       Timestamp(0.0f),
       StereoFormat(StFormat_Mono),
       ToSwapLR(false),
@@ -241,7 +245,7 @@
 
     void moveSphere(const StGLVec2& theMoveVec) {
         PanPhi   += theMoveVec.x();
-        PanTheta += theMoveVec.y();
+        PanTheta = clipPitch(PanTheta + theMoveVec.y());
     }
 
     void moveToRight(const GLfloat theDuration = 0.02f) {
@@ -262,21 +266,41 @@
         }
     }
 
+    /**
+     * Clip pitch angle to the range [-90, 90] degrees.
+     */
+    static float clipPitch(const float thePitchDeg) {
+        if(thePitchDeg <= -90.0f) {
+            return -90.0f;
+        } else if(thePitchDeg >= 90.0f) {
+            return  90.0f;
+        }
+        return thePitchDeg;
+    }
+
     void moveToDown(const GLfloat theDuration = 0.02f) {
         switch(ViewingMode) {
             case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP: PanTheta -= 100.0f * theDuration; break;
+            case PANORAMA_CUBEMAP:
+                PanTheta = clipPitch(PanTheta - 100.0f * theDuration);
+                break;
             case FLAT_IMAGE:
-            default: PanCenter.y() -= 0.5f * theDuration / ScaleFactor;
+            default:
+                PanCenter.y() -= 0.5f * theDuration / ScaleFactor;
+                break;
         }
     }
 
     void moveToUp(const GLfloat theDuration = 0.02f) {
         switch(ViewingMode) {
             case PANORAMA_SPHERE:
-            case PANORAMA_CUBEMAP: PanTheta += 100.0f * theDuration; break;
+            case PANORAMA_CUBEMAP:
+                PanTheta = clipPitch(PanTheta + 100.0f * theDuration);
+                break;
             case FLAT_IMAGE:
-            default: PanCenter.y() += 0.5f * theDuration / ScaleFactor;
+            default:
+                PanCenter.y() += 0.5f * theDuration / ScaleFactor;
+                break;
         }
     }
 
@@ -315,6 +339,11 @@
 
         public:
 
+    size_t       Src1SizeX;        //!< width  of the 1st original image
+    size_t       Src1SizeY;        //!< height of the 1st original image
+    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
     GLfloat      Timestamp;        //!< playback timestamp

sview-15_08.tar.gz/include/StGL/StPlayList.h -> sview-15_10.tar.gz/include/StGL/StPlayList.h Changed

sview-15_08.tar.gz/include/StGLStereo/StFormatEnum.h -> sview-15_10.tar.gz/include/StGLStereo/StFormatEnum.h Changed

@@ -44,6 +44,13 @@
     StCubemap_Packed     //!< cubemap data packed into single image frame - 6 horizontally stacked planes
 };
 
+enum StPanorama {
+    StPanorama_OFF  =  0,  //!< no cubemap data
+    StPanorama_Sphere,     //!< spherical panorama
+    StPanorama_Cubemap6_1, //!< cubemap data packed into single image frame - 6:1
+    StPanorama_Cubemap3_2  //!< cubemap data packed into single image frame - 3:2
+};
+
 namespace st {
 
     /**
@@ -115,6 +122,38 @@
         }
     }
 
+    /**
+     * Probe panorama mode from image dimensions.
+     */
+    ST_LOCAL inline StPanorama probePanorama(StFormat theFormat,
+                                             size_t   theSrc1SizeX,
+                                             size_t   theSrc1SizeY,
+                                             size_t   theSrc2SizeX,
+                                             size_t   theSrc2SizeY) {
+        StPairRatio aPairRatio = st::formatToPairRatio(theFormat);
+        if(aPairRatio == StPairRatio_HalfWidth) {
+            theSrc1SizeX /= 2;
+        } else if(aPairRatio == StPairRatio_HalfHeight) {
+            theSrc1SizeY /= 2;
+        }
+        if(theSrc1SizeX < 8
+        || theSrc1SizeY < 8) {
+            return StPanorama_OFF;
+        }
+
+        if(theSrc1SizeX / 2 == theSrc1SizeY
+        && theSrc2SizeX / 2 == theSrc2SizeY) {
+            return StPanorama_Sphere;
+        } else if(theSrc1SizeX / 6 == theSrc1SizeY
+               && theSrc2SizeX / 6 == theSrc2SizeY) {
+            return StPanorama_Cubemap6_1;
+        } else if(theSrc1SizeX / 3 == theSrc1SizeY / 2
+               && theSrc2SizeX / 3 == theSrc2SizeY / 2) {
+            return StPanorama_Cubemap3_2;
+        }
+        return StPanorama_OFF;
+    }
+
 };
 
 #endif // __StFormatEnum_h_

sview-15_08.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLFpsLabel.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLFpsLabel.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2015 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,8 @@
 #include <StGLWidgets/StGLMenuProgram.h>
 
 /**
- * FPS widget.
+ * Widget for displaying diagnostic information
+ * (frame rate, buffers state, etc.).
  */
 class StGLFpsLabel : public StGLTextArea {
 
@@ -24,32 +25,25 @@
 
         public:
 
-    ST_CPPEXPORT void update(const bool   theIsStereo,
-                             const double theTargetFps);
+    ST_CPPEXPORT void update(const bool      theIsStereo,
+                             const double    theTargetFps,
+                             const StString& theExtraInfo);
 
-    ST_LOCAL inline double& changePlayFps() {
-        return myPlayFps;
-    }
-
-    ST_LOCAL inline int& changePlayQueued() {
-        return myPlayQueued;
-    }
-
-    ST_LOCAL inline int& changePlayQueueLength() {
-        return myPlayQueueLen;
-    }
+    ST_LOCAL double& changePlayFps()         { return myPlayFps; }
+    ST_LOCAL int&    changePlayQueued()      { return myPlayQueued; }
+    ST_LOCAL int&    changePlayQueueLength() { return myPlayQueueLen; }
 
         public:  //! @name Signals
 
     struct {
         /**
          * Emit callback Slot on button click.
-         * @param theUserData (const size_t ) - user predefined data.
+         * @param theUserData user predefined data
          */
         StSignal<void (const size_t )> onBtnClick;
     } signals;
 
-        private: //!< callback Slots (private overriders)
+        private: //! @name callback Slots (private overriders)
 
     ST_LOCAL void doMouseUnclick(const int theBtnId);

sview-15_08.tar.gz/include/StGLWidgets/StGLImageProgram.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLImageProgram.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLImageRegion.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLImageRegion.h Changed

@@ -13,8 +13,7 @@
 #include <StGLMesh/StGLQuads.h>
 
 #include <StGLWidgets/StGLWidget.h>
-#include <StGLWidgets/StGLImageFlatProgram.h>
-#include <StGLWidgets/StGLImageSphereProgram.h>
+#include <StGLWidgets/StGLImageProgram.h>
 #include <StGLStereo/StGLTextureQueue.h>
 
 #include <StGL/StParams.h>
@@ -87,6 +86,11 @@
                                  const bool  theUsePanningKeys);
 
     /**
+     * Setup device orientation.
+     */
+    ST_LOCAL void setDeviceOrientation(const StGLQuaternion& theQ) { myDeviceQuat = theQ; }
+
+    /**
      * Dragging delay in milliseconds, 0.0 by default.
      */
     ST_LOCAL inline double getDragDelayMs() const {
@@ -106,6 +110,11 @@
 
     ST_CPPEXPORT StHandle<StStereoParams> getSource();
 
+    /**
+     * Return true if there is any video stream.
+     */
+    ST_LOCAL bool hasVideoStream() { return myHasVideoStream; }
+
     const StArrayList< StHandle<StAction> >& getActions() const {
         return myActions;
     }
@@ -134,6 +143,7 @@
 
         StHandle<StEnumParam>    displayMode;   //!< StGLImageRegion::DisplayMode    - display mode
         StHandle<StInt32Param>   displayRatio;  //!< StGLImageRegion::DisplayRatio   - display ratio
+        StHandle<StBoolParam>    ToHealAnamorphicRatio; //!< correct aspect ratio for 1080p/720p anamorphic pairs
         StHandle<StInt32Param>   textureFilter; //!< StGLImageProgram::TextureFilter - texture filter;
         StHandle<StFloat32Param> gamma;         //!< gamma correction coefficient
         StHandle<StFloat32Param> brightness;    //!< brightness level
@@ -204,7 +214,7 @@
         const int aMode = params.ViewMode->getValue();
         switch(aMode) {
             case StStereoParams::FLAT_IMAGE: {
-                params.ViewMode->setValue(StStereoParams::PANORAMA_CUBEMAP);
+                params.ViewMode->setValue(StStereoParams::PANORAMA_SPHERE);
                 return;
             }
             case StStereoParams::PANORAMA_CUBEMAP: {
@@ -212,7 +222,7 @@
                 return;
             }
             case StStereoParams::PANORAMA_SPHERE: {
-                params.ViewMode->setValue(StStereoParams::FLAT_IMAGE);
+                params.ViewMode->setValue(StStereoParams::PANORAMA_CUBEMAP);
                 return;
             }
         }
@@ -267,11 +277,11 @@
 
     StGLQuads                  myQuad;           //!< flat quad
     StGLUVSphere               myUVSphere;       //!< sphere output helper class
-    StGLImageFlatProgram       myProgramFlat;    //!< GL program to draw flat image
-    StGLImageSphereProgram     myProgramSphere;  //!< GL program to draw spheric panorama
+    StGLImageProgram           myProgram;        //!< GL program to draw flat image
     StHandle<StGLTextureQueue> myTextureQueue;   //!< shared texture queue
     StPointD_t                 myClickPntZo;     //!< remembered mouse click position
     StTimer                    myClickTimer;     //!< timer to delay dragging action
+    StGLQuaternion             myDeviceQuat;     //!< device orientation
     StVirtFlags                myKeyFlags;       //!< active key flags
     double                     myDragDelayMs;    //!< dragging delay in milliseconds
     bool                       myIsClickAborted;

sview-15_08.tar.gz/include/StGLWidgets/StGLMenu.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLMenu.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLMenuItem.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLMenuItem.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLMessageBox.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLMessageBox.h Changed

@@ -22,14 +22,25 @@
 
         public:
 
+    /**
+     * Main constructor creating message box of size 384 x 200 (clipped by root widget size).
+     */
     ST_CPPEXPORT StGLMessageBox(StGLWidget*     theParent,
                                 const StString& theTitle,
                                 const StString& theText);
+
+    /**
+     * Main constructor creating message box of specified size (clipped by root widget size).
+     */
     ST_CPPEXPORT StGLMessageBox(StGLWidget*     theParent,
                                 const StString& theTitle,
                                 const StString& theText,
                                 const int       theWidth,
                                 const int       theHeight);
+
+    /**
+     * Destructor.
+     */
     ST_CPPEXPORT virtual ~StGLMessageBox();
     ST_CPPEXPORT virtual bool stglInit();
     ST_CPPEXPORT virtual void stglResize();
@@ -66,7 +77,7 @@
     ST_CPPEXPORT void setTitle(const StString& theTitle);
 
     /**
-     * Set content to the plain text.
+     * Set content to the plain text (previous content will be discarded).
      */
     ST_CPPEXPORT void setText(const StString& theText);
 
@@ -84,6 +95,22 @@
     ST_LOCAL int getMarginTop()    const { return myMarginTop; }
     ST_LOCAL int getMarginBottom() const { return myMarginBottom; }
 
+        protected:
+
+    /**
+     * Protected empty constructor (does not call create()).
+     */
+    ST_CPPEXPORT StGLMessageBox(StGLWidget* theParent);
+
+    /**
+     * Initializes the layout of the widget.
+     * Should be called once, in constructor.
+     */
+    ST_CPPEXPORT void create(const StString& theTitle,
+                             const StString& theText,
+                             const int       theWidth,
+                             const int       theHeight);
+
         private:   //! @name callback Slots (private overriders)
 
     ST_LOCAL void doMouseUnclick(const int theBtnId);
@@ -95,11 +122,6 @@
      */
     ST_LOCAL bool doNextButton(const int theDir);
 
-    ST_LOCAL void create(const StString& theTitle,
-                         const StString& theText,
-                         const int       theWidth,
-                         const int       theHeight);
-
         public:    //! @name Signals
 
     struct {

sview-15_10.tar.gz/include/StGLWidgets/StGLOpenFile.h Added

@@ -0,0 +1,119 @@
+/**
+ * Copyright © 2015 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 __StGLOpenFile_h_
+#define __StGLOpenFile_h_
+
+#include <StGLWidgets/StGLMessageBox.h>
+#include <StGLWidgets/StGLRootWidget.h>
+#include <StFile/StMIMEList.h>
+
+class StGLMenu;
+class StGLMenuItem;
+
+/**
+ * Widget for file system navigation.
+ */
+class StGLOpenFile : public StGLMessageBox {
+
+        public:
+
+    /**
+     * Main constructor.
+     */
+    ST_CPPEXPORT StGLOpenFile(StGLWidget*     theParent,
+                              const StString& theTitle,
+                              const StString& theCloseText);
+
+    /**
+     * Destructor.
+     */
+    ST_CPPEXPORT virtual ~StGLOpenFile();
+
+    /**
+     * Define file filter.
+     */
+    ST_CPPEXPORT void setMimeList(const StMIMEList& theFilter);
+
+    /**
+     * Open new folder.
+     */
+    ST_CPPEXPORT void addHotItem(const StString& theTarget,
+                                 const StString& theName = "");
+
+    /**
+     * Open new folder.
+     */
+    ST_CPPEXPORT void openFolder(const StString& theFolder);
+
+        public:    //! @name Signals
+
+    struct {
+        /**
+         * @param path to selected file
+         */
+        StSignal<void (StHandle<StString> )> onFileSelected;
+    } signals;
+
+        protected:
+
+    /**
+     * Assign icon to the item.
+     */
+    ST_CPPEXPORT void setItemIcon(StGLMenuItem*   theItem,
+                                  const StGLVec4& theColor,
+                                  const bool      theisFolder);
+
+    /**
+     * Handle hot-item click event - just remember item id.
+     */
+    ST_CPPEXPORT void doHotItemClick(const size_t theItemId);
+
+    /**
+     * Handle item click event - just remember item id.
+     */
+    ST_CPPEXPORT void doFileItemClick(const size_t theItemId);
+
+    /**
+     * Handle folder-up event.
+     */
+    ST_CPPEXPORT void doFolderUpClick(const size_t );
+
+    /**
+     * Override unclick to open new folder.
+     */
+    ST_CPPEXPORT virtual bool tryUnClick(const StPointD_t& theCursorZo,
+                                         const int&        theMouseBtn,
+                                         bool&             isItemUnclicked);
+
+        protected: //! @name class fields
+
+    StHandle<StGLTextureArray> myTextureFolder;
+    StHandle<StGLTextureArray> myTextureFile;
+    StGLTextArea*              myCurrentPath;
+    StGLMenu*                  myHotList;       //!< widget containing the list of predefined libraries
+    StGLMenu*                  myList;          //!< widget containing the file list of currently opened folder
+    StArrayList<StString>      myHotPaths;      //!< array of hot-links
+    StHandle<StFolder>         myFolder;        //!< currently opened folder
+    StMIMEList                 myFilter;        //!< file filter
+    StArrayList<StString>      myExtensions;    //!< extensions filter
+    StString                   myItemToLoad;    //!< new item to open
+
+        protected: //! @name main file list settings
+
+    StGLVec4                   myHighlightColor;//!< item highlighting
+    StGLVec4                   myItemColor;     //!< color of icons and text labels for the list
+    StGLVec4                   myFileColor;     //!< color of icons and text labels for the list
+    StGLVec4                   myHotColor;      //!< color of icons and text labels for the hot-list
+    int                        myHotSizeX;
+    int                        myMarginX;
+    int                        myIconSizeX;
+
+};
+
+#endif // __StGLOpenFile_h_

sview-15_08.tar.gz/include/StGLWidgets/StGLRootWidget.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLRootWidget.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLScrollArea.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLScrollArea.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLSubtitles.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLSubtitles.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -62,6 +62,9 @@
 
     ST_CPPEXPORT StGLSubtitles(StGLWidget*                     theParent,
                                const StHandle<StSubQueue>&     theSubQueue,
+                               const StHandle<StInt32Param>&   thePlace,
+                               const StHandle<StFloat32Param>& theTopDY,
+                               const StHandle<StFloat32Param>& theBottomDY,
                                const StHandle<StFloat32Param>& theFontSize,
                                const StHandle<StFloat32Param>& theParallax,
                                const StHandle<StEnumParam>&    theParser);
@@ -83,6 +86,9 @@
 
         private:
 
+    StHandle<StInt32Param>   myPlace;     //!< placement
+    StHandle<StFloat32Param> myTopDY;     //!< displacement
+    StHandle<StFloat32Param> myBottomDY;  //!< displacement
     StHandle<StFloat32Param> myFontSize;  //!< font size parameter
     StHandle<StFloat32Param> myParallax;  //!< text parallax
     StHandle<StEnumParam>    myParser;    //!< text parser option

sview-15_08.tar.gz/include/StGLWidgets/StGLTextArea.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLTextArea.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLTextureButton.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLTextureButton.h Changed

sview-15_08.tar.gz/include/StGLWidgets/StGLWidget.h -> sview-15_10.tar.gz/include/StGLWidgets/StGLWidget.h Changed

@@ -182,9 +182,9 @@
     /**
      * Assign new area rectangle for modification and set IsResized flag on.
      */
-    ST_LOCAL void setRectPx(const StRectI_t& rectPx) {
+    ST_LOCAL void setRectPx(const StRectI_t& theRectPx) {
         myIsResized = true;
-        this->rectPx = rectPx;
+        this->rectPx = theRectPx;
     }
 
     /**
@@ -197,6 +197,11 @@
     }
 
     /**
+     * Return true if widget has been marked resized, but not yet updated.
+     */
+    ST_LOCAL bool wasResized() const { return myIsResized; }
+
+    /**
      * Function returns <i>global</i> area rectangle (in pixels).
      * @return rectangle
      */
@@ -238,6 +243,14 @@
     }
 
     /**
+     * Check visibility of this widget taking into account visibility of parents.
+     */
+    ST_LOCAL bool isVisibleWithParents() const {
+        return myOpacity > 0.0f
+            && (myParent == NULL || myParent->isVisibleWithParents());
+    }
+
+    /**
      * Return opacity value.
      */
     ST_LOCAL float getOpacity() const {
@@ -347,8 +360,8 @@
     /**
      * @param userData user-defined data
      */
-    inline void setUserData(const size_t userData) {
-        this->userData = userData;
+    inline void setUserData(const size_t theUserData) {
+        this->userData = theUserData;
     }
 
     /**

sview-15_08.tar.gz/include/StSettings/StFloat32Param.h -> sview-15_10.tar.gz/include/StSettings/StFloat32Param.h Changed

sview-15_08.tar.gz/include/StSettings/StSettings.h -> sview-15_10.tar.gz/include/StSettings/StSettings.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov
+ * Copyright © 2007-2015 Kirill Gavrilov
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -52,6 +52,18 @@
      */
     ST_CPPEXPORT virtual ~StSettings();
 
+    /**
+     * Immediately write settings into external storage (e.g. file).
+     * Has no effect on implementations storing data on saving each individual parameter.
+     *
+     * Usually settings will be stored automatically within class destruction.
+     * This method can be used to perform this more frequently in environments
+     * where application can be destroyed in unsafe way.
+     *
+     * @return true if settings have been saved
+     */
+    ST_CPPEXPORT bool flush();
+
         public: //! @name persistence implementation
 
     /**
@@ -219,10 +231,11 @@
 
         private:
 
-#ifndef _WIN32
+    /**
+     * Read settings from external storage.
+     * Called within main constructor.
+     */
     ST_LOCAL bool load();
-    ST_LOCAL bool save();
-#endif
 
         private:
 
@@ -233,10 +246,11 @@
     StString             myFilePath;
     NSMutableDictionary* myDict;
 #else
-    StString             myFullFileName;
-    libconfig::Config*   myConfig;
-    bool                 myIsLoaded;
+    StString             myFullFileName;  //!< path to the file
+    libconfig::Config*   myConfig;        //!< config instance
+    bool                 myIsLoaded;      //!< flag indicating last parsing state
 #endif
+    bool                 myToFlush;       //!< settings have been changed but not yet saved
 
 };

sview-15_08.tar.gz/include/StTemplates/StHandle.h -> sview-15_10.tar.gz/include/StTemplates/StHandle.h Changed

sview-15_10.tar.gz/include/StTemplates/StQuaternion.h Added

@@ -0,0 +1,94 @@
+/**
+ * Copyright © 2015 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 __StQuaternion_h_
+#define __StQuaternion_h_
+
+#include <StTemplates/StVec4.h>
+
+template<typename Element_t>
+class StQuaternion {
+
+        public:
+
+    /**
+     * Construct identity quaternion.
+     */
+    StQuaternion() : myV((Element_t )0, (Element_t )0, (Element_t )0, (Element_t )1) {}
+
+    /**
+     * Construct quaternion from component values.
+     */
+    StQuaternion(const Element_t theX, const Element_t theY, const Element_t theZ, const Element_t theW)
+    : myV(theX, theY, theZ, theW) {}
+
+    /**
+     * Construct orientation as rotation around axis.
+     */
+    StQuaternion(const StVec3<Element_t>& theAxis,
+                 const Element_t          theAngle) {
+        setVectorAndAngle(theAxis, theAngle);
+    }
+
+    /**
+     * Setup orientation as rotation around axis.
+     */
+    void setVectorAndAngle(const StVec3<Element_t>& theAxis,
+                           const Element_t          theAngle) {
+        StVec3<Element_t> anAxis = theAxis.normalized();
+        Element_t anAngleHalf = Element_t(0.5) * theAngle;
+        Element_t aSin        = std::sin(anAngleHalf);
+        myV.x() = anAxis.x() * aSin;
+        myV.y() = anAxis.y() * aSin;
+        myV.z() = anAxis.z() * aSin;
+        myV.w() = std::cos(anAngleHalf);
+    }
+
+    /**
+     * Return quaternion components.
+     */
+    const StVec4<Element_t>& vec4() const { return myV; }
+
+    /**
+     * Get x component.
+     */
+    Element_t x() const { return myV.x(); }
+
+    /**
+     * Get y component.
+     */
+    Element_t y() const { return myV.y(); }
+
+    /**
+     * Get z component.
+     */
+    Element_t z() const { return myV.z(); }
+
+    /**
+     * Get w component.
+     */
+    Element_t w() const { return myV.w(); }
+
+    /**
+     * Multiply two quaternions (e.g. rotate object by theQ2 and then by theQ1 - order is important!).
+     */
+    static StQuaternion multiply(const StQuaternion& theQ1,
+                                 const StQuaternion& theQ2) {
+        return StQuaternion(theQ1.w() * theQ2.x() + theQ1.x() * theQ2.w() + theQ1.y() * theQ2.z() - theQ1.z() * theQ2.y(),
+                            theQ1.w() * theQ2.y() + theQ1.y() * theQ2.w() + theQ1.z() * theQ2.x() - theQ1.x() * theQ2.z(),
+                            theQ1.w() * theQ2.z() + theQ1.z() * theQ2.w() + theQ1.x() * theQ2.y() - theQ1.y() * theQ2.x(),
+                            theQ1.w() * theQ2.w() - theQ1.x() * theQ2.x() - theQ1.y() * theQ2.y() - theQ1.z() * theQ2.z());
+    }
+
+        private:
+
+    StVec4<Element_t> myV;
+
+};
+
+#endif //__StQuaternion_h_

sview-15_08.tar.gz/include/StTemplates/StVec4.h -> sview-15_10.tar.gz/include/StTemplates/StVec4.h Changed

sview-15_08.tar.gz/include/StThreads/StResourceManager.h -> sview-15_10.tar.gz/include/StThreads/StResourceManager.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See accompanying file license-boost.txt or copy at
@@ -89,6 +89,19 @@
         public:
 
     /**
+     * The list of standard folders.
+     */
+    enum FolderId {
+        FolderId_Downloads,
+        FolderId_Pictures,
+        FolderId_Music,
+        FolderId_Videos,
+        FolderId_NB
+    };
+
+        public:
+
+    /**
      * Main constructor.
      */
     ST_CPPEXPORT StResourceManager(const StString& theAppName = "sview");
@@ -107,6 +120,13 @@
     ST_CPPEXPORT virtual ~StResourceManager();
 
     /**
+     * Return folder for specified task.
+     */
+    ST_LOCAL const StString& getFolder(const FolderId theId) const {
+        return myFolders[theId];
+    }
+
+    /**
      * Folder containing user-specific application data.
      */
     ST_LOCAL const StString& getUserDataFolder() const {
@@ -152,6 +172,7 @@
 
         protected:
 
+    StString       myFolders[FolderId_NB];
     StString       myAppName;        //!< application name - "sview" by default
     StString       myUserHomeFolder; //!< user home folder
     StString       myUserDataFolder; //!< folder for saving user-specific application data

sview-15_08.tar.gz/include/stTypes.h -> sview-15_10.tar.gz/include/stTypes.h Changed

sview-15_08.tar.gz/share/sView/demo/demo.jps -> sview-15_10.tar.gz/share/sView/demo/demo.jps Changed

sview-15_10.tar.gz/share/sView/demo/demo_robot.jps Added

sview-15_08.tar.gz/sview/AndroidManifest.xml -> sview-15_10.tar.gz/sview/AndroidManifest.xml Changed

sview-15_08.tar.gz/sview/jni/main.cpp -> sview-15_10.tar.gz/sview/jni/main.cpp Changed

@@ -1,7 +1,7 @@
 /**
  * This is source code for sView
  *
- * Copyright © Kirill Gavrilov, 2014
+ * Copyright © Kirill Gavrilov, 2014-2015
  */
 
 #if defined(__ANDROID__)
@@ -35,8 +35,8 @@
      * Choose and instantiate StApplication.
      */
     ST_LOCAL virtual void createApplication() override {
-        StMutexAuto aLock(myDndLock);
-        const StString aFileExtension = StFileNode::getExtension(myDndPath);
+        StMutexAuto aLock(myFetchLock);
+        const StString aFileExtension = StFileNode::getExtension(myCreatePath);
 
         StHandle<StOpenInfo> anInfo = new StOpenInfo();
         anInfo->setPath(myDndPath);
@@ -47,6 +47,12 @@
         const StMIMEList aMimeImg(ST_IMAGE_PLUGIN_MIME_CHAR);
         for(size_t aMimeIter = 0; aMimeIter < aMimeImg.size(); ++aMimeIter) {
             if(aFileExtension.isEqualsIgnoreCase(aMimeImg[aMimeIter].getExtension())) {
+                StArgumentsMap anArgs = anInfo->getArgumentsMap();
+                if(anInfo->isEmpty()) {
+                    anArgs.set(StDictEntry("last",    "true"));
+                }
+                anArgs.set(StDictEntry("toSaveRecent","true"));
+                anInfo->setArgumentsMap(anArgs);
                 myApp = new StImageViewer(aResMgr, this, anInfo);
                 return;
             }

sview-15_08.tar.gz/sview/sViewMake.cbp -> sview-15_10.tar.gz/sview/sViewMake.cbp Changed

@@ -3,8 +3,9 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="sViewMakefile" />
+		<Option makefile="$(PROJECT_DIRECTORY)../Makefile" />
 		<Option makefile_is_custom="1" />
-		<Option execution_dir="/home/kirill/develop/sview" />
+		<Option execution_dir="$(PROJECT_DIRECTORY).." />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
@@ -15,12 +16,12 @@
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<MakeCommands>
-					<Build command="$make -f $makefile all" />
-					<CompileFile command="$make -f $makefile $file" />
-					<Clean command="$make -f $makefile clean" />
-					<DistClean command="$make -f $makefile distclean$target" />
-					<AskRebuildNeeded command="$make -q -f $makefile all" />
-					<SilentBuild command="$make -f $makefile all &gt; $(CMD_NULL)" />
+					<Build command="$make -j6 --directory=$(PROJECT_DIRECTORY).. -f $makefile all" />
+					<CompileFile command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile $file" />
+					<Clean command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile clean" />
+					<DistClean command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile distclean$target" />
+					<AskRebuildNeeded command="$make -j6 --directory=$(PROJECT_DIRECTORY).. -q -f $makefile all" />
+					<SilentBuild command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile all &gt; $(CMD_NULL)" />
 				</MakeCommands>
 			</Target>
 			<Target title="make_android">
@@ -28,12 +29,12 @@
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<MakeCommands>
-					<Build command="$make -f $makefile android" />
-					<CompileFile command="$make -f $makefile $file" />
-					<Clean command="$make -f $makefile clean" />
-					<DistClean command="$make -f $makefile distclean$target" />
-					<AskRebuildNeeded command="$make -q -f $makefile android" />
-					<SilentBuild command="$make -f $makefile android &gt; $(CMD_NULL)" />
+					<Build command="$make -j6 --directory=$(PROJECT_DIRECTORY).. -f $makefile android" />
+					<CompileFile command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile $file" />
+					<Clean command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile clean" />
+					<DistClean command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile distclean$target" />
+					<AskRebuildNeeded command="$make -j6 --directory=$(PROJECT_DIRECTORY).. -q -f $makefile android" />
+					<SilentBuild command="$make --directory=$(PROJECT_DIRECTORY).. -f $makefile android &gt; $(CMD_NULL)" />
 				</MakeCommands>
 			</Target>
 		</Build>

sview-15_08.tar.gz/sview/src/com/sview/StActivity.java -> sview-15_10.tar.gz/sview/src/com/sview/StActivity.java Changed

@@ -12,13 +12,19 @@
 import android.content.ContextWrapper;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.widget.Toast;
 
 /**
  * Customize NativeActivity
  */
-public class StActivity extends NativeActivity {
+public class StActivity extends NativeActivity implements SensorEventListener {
+
+//region Native libraries loading routines
 
     /**
      * Auxiliary method to close activity on critical error
@@ -50,17 +56,17 @@
             theErrors.append(theLibName);
             theErrors.append("\" has been loaded\n");
             return true;
-	    } catch(java.lang.UnsatisfiedLinkError theError) {
+        } catch(java.lang.UnsatisfiedLinkError theError) {
             theErrors.append("Error: native library \"");
             theErrors.append(theLibName);
             theErrors.append("\" is unavailable:\n  " + theError.getMessage());
             return false;
-	    } catch(SecurityException theError) {
+        } catch(SecurityException theError) {
             theErrors.append("Error: native library \"");
             theErrors.append(theLibName);
             theErrors.append("\" can not be loaded for security reasons:\n  " + theError.getMessage());
             return false;
-	    }
+        }
     }
 
     private static boolean wasNativesLoadCalled = false;
@@ -105,6 +111,10 @@
         return true;
     }
 
+//endregion
+
+//region Overridden methods of NativeActivity class
+
     /**
      * Create activity.
      */
@@ -117,6 +127,14 @@
         myContext = new ContextWrapper(this);
         myContext.getExternalFilesDir(null);
 
+        mySensorMgr = (SensorManager )getSystemService(Context.SENSOR_SERVICE);
+        mySensorOri = mySensorMgr.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
+        if(mySensorOri == null) {
+            myIsPoorOri = true;
+            mySensorOri = mySensorMgr.getDefaultSensor(Sensor.TYPE_ORIENTATION);
+        } else {
+            myIsPoorOri = mySensorMgr.getDefaultSensor(Sensor.TYPE_GYROSCOPE) == null;
+        }
         super.onCreate(theSavedInstanceState);
     }
 
@@ -130,14 +148,139 @@
     }
 
     /**
+     * Handle resume event.
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if(myToTrackOrient) {
+            updateTrackOrientation(true);
+        }
+    }
+
+    /**
+     * Handle pause event.
+     */
+    @Override
+    protected void onPause() {
+       super.onPause();
+       updateTrackOrientation(false);
+    }
+
+    /**
+     * Redirect back button to C++ level.
+     */
+    @Override
+    public void onBackPressed() {
+        if(myCppGlue != 0) {
+            cppOnBackPressed(myCppGlue);
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//endregion
+
+//region Implementation of SensorEventListener interface
+
+    @Override
+    public void onAccuracyChanged(Sensor theSensor, int theAccuracy) {}
+
+    /**
+     * Fetch new orientation quaternion.
+     */
+    @Override
+    public void onSensorChanged(SensorEvent theEvent) {
+        if(myCppGlue == 0) {
+            return;
+        }
+
+        float aScreenRot = 0.0f;
+        switch(getWindowManager().getDefaultDisplay().getRotation()) {
+            case android.view.Surface.ROTATION_0:   aScreenRot = 0.0f;   break;
+            case android.view.Surface.ROTATION_90:  aScreenRot = 90.0f;  break;
+            case android.view.Surface.ROTATION_180: aScreenRot = 180.0f; break;
+            case android.view.Surface.ROTATION_270: aScreenRot = 270.0f; break;
+        }
+
+        switch(theEvent.sensor.getType()) {
+            case Sensor.TYPE_ORIENTATION: {
+                cppSetOrientation(myCppGlue, theEvent.values[0], theEvent.values[1], theEvent.values[2], aScreenRot);
+                return;
+            }
+            case Sensor.TYPE_ROTATION_VECTOR: {
+                SensorManager.getQuaternionFromVector(myQuat, theEvent.values);
+                cppSetQuaternion(myCppGlue, myQuat[0], myQuat[1], myQuat[2], myQuat[3], aScreenRot);
+                return;
+            }
+        }
+    }
+
+//endregion
+
+//region Auxiliary methods
+
+    /**
+     * Wrapper to turn orientation sensor on/off (regardless off myToTrackOrient flag).
+     */
+    protected void updateTrackOrientation(boolean theToTrack) {
+        if(mySensorOri == null) {
+            return;
+        }
+
+        if(theToTrack) {
+            mySensorMgr.registerListener(this, mySensorOri, SensorManager.SENSOR_DELAY_FASTEST);
+        } else {
+            mySensorMgr.unregisterListener(this);
+        }
+    }
+
+//endregion
+
+//region Methods to be called from C++ level
+
+    /**
+     * Method is called when StAndroidGlue has been created (BEFORE starting application thread!)
+     * or during destruction.
+     */
+    public void setCppInstance(long theCppInstance) {
+        myCppGlue = theCppInstance;
+        if(myCppGlue != 0) {
+            cppDefineOrientationSensor(myCppGlue, mySensorOri != null, myIsPoorOri);
+            if(myToTrackOrient) {
+                updateTrackOrientation(true);
+            }
+        } else {
+            updateTrackOrientation(false);
+        }
+    }
+
+    /**
+     * Method to turn orientation sensor on/off.
+     */
+    public void setTrackOrientation(boolean theToTrack) {
+        final boolean toTrack = theToTrack;
+        this.runOnUiThread (new Runnable() { public void run() {
+            if(myToTrackOrient == toTrack
+            || mySensorOri     == null) {
+                myToTrackOrient = toTrack;
+                return;
+            }
+
+            myToTrackOrient = toTrack;
+            updateTrackOrientation(toTrack);
+        }});
+    }
+
+    /**
      * Auxiliary method to show temporary info message.
      */
     public void postToast(String theInfo) {
         final String aText = theInfo;
         this.runOnUiThread (new Runnable() { public void run() {
-			Context aCtx   = getApplicationContext();
-			Toast   aToast = Toast.makeText(aCtx, aText, Toast.LENGTH_SHORT);
-			aToast.show();
+            Context aCtx   = getApplicationContext();
+            Toast   aToast = Toast.makeText(aCtx, aText, Toast.LENGTH_SHORT);
+            aToast.show();
         }});
     }
 
@@ -165,6 +308,48 @@
         }});
     }
 
-    private ContextWrapper myContext;
+//endregion
+
+//region Methods to call C++ code
+
+    /**
+     * Redirect back button to C++ level.
+     */
+    private native void cppOnBackPressed(long theCppPtr);
+
+    /**
+     * Define device orientation sensor.
+     */
+    private native void cppDefineOrientationSensor(long theCppPtr,
+                                                   boolean theHasOri,
+                                                   boolean theIsPoorOri);
+
+    /**
+     * Define device orientation by quaternion.
+     */
+    private native void cppSetQuaternion(long theCppPtr,
+                                         float theX, float theY, float theZ, float theW,
+                                         float theScreenRotDeg);
+
+    /**
+     * Define device orientation using deprecated Android API.
+     */
+    private native void cppSetOrientation(long theCppPtr,
+                                          float theAzimuthDeg, float thePitchDeg, float theRollDeg,
+                                          float theScreenRotDeg);
+
+//endregion
+
+//region class fields
+
+    protected ContextWrapper myContext;
+    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 long           myCppGlue = 0; //!< pointer to c++ class StAndroidGlue instance
+
+//endregion
 
 }

sview-15_10.tar.gz/textures/actionFile128.png Added

sview-15_10.tar.gz/textures/actionFile144.png Added

sview-15_10.tar.gz/textures/actionFile16.png Added

sview-15_10.tar.gz/textures/actionFile192.png Added

sview-15_10.tar.gz/textures/actionFile24.png Added

sview-15_10.tar.gz/textures/actionFile256.png Added

sview-15_10.tar.gz/textures/actionFile32.png Added

sview-15_10.tar.gz/textures/actionFile48.png Added

sview-15_10.tar.gz/textures/actionFile64.png Added

sview-15_10.tar.gz/textures/actionFile72.png Added

sview-15_10.tar.gz/textures/actionFile96.png Added

sview-15_10.tar.gz/textures/actionPanorama128.png Added

sview-15_10.tar.gz/textures/actionPanorama144.png Added

sview-15_10.tar.gz/textures/actionPanorama16.png Added

sview-15_10.tar.gz/textures/actionPanorama192.png Added

sview-15_10.tar.gz/textures/actionPanorama24.png Added

sview-15_10.tar.gz/textures/actionPanorama256.png Added

sview-15_10.tar.gz/textures/actionPanorama32.png Added

sview-15_10.tar.gz/textures/actionPanorama48.png Added

sview-15_10.tar.gz/textures/actionPanorama64.png Added

sview-15_10.tar.gz/textures/actionPanorama72.png Added

sview-15_10.tar.gz/textures/actionPanorama96.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff128.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff144.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff16.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff192.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff24.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff256.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff32.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff48.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff64.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff72.png Added

sview-15_10.tar.gz/textures/actionPanoramaOff96.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff128.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff144.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff16.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff192.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff24.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff256.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff32.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff48.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff64.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff72.png Added

sview-15_10.tar.gz/textures/actionStreamAudioOff96.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff128.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff144.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff16.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff192.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff24.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff256.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff32.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff48.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff64.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff72.png Added

sview-15_10.tar.gz/textures/actionStreamSubtitlesOff96.png Added

sview-15_10.tar.gz/textures/menuDual128.png Added

sview-15_10.tar.gz/textures/menuDual144.png Added

sview-15_10.tar.gz/textures/menuDual16.png Added

sview-15_10.tar.gz/textures/menuDual192.png Added

sview-15_10.tar.gz/textures/menuDual24.png Added

sview-15_10.tar.gz/textures/menuDual256.png Added

sview-15_10.tar.gz/textures/menuDual32.png Added

sview-15_10.tar.gz/textures/menuDual48.png Added

sview-15_10.tar.gz/textures/menuDual64.png Added

sview-15_10.tar.gz/textures/menuDual72.png Added

sview-15_10.tar.gz/textures/menuDual96.png Added

sview-15_10.tar.gz/texturesSrc/actionFile.svg Added

@@ -0,0 +1,70 @@
+<?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.48.5 r10040"
+   sodipodi:docname="actionFile.svg"
+   inkscape:export-filename="actionFile.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="15.611319"
+     inkscape:cy="19.490394"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1364"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     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 8.0625,1023.034 c -1.4735,0 -2.71875,1.0482 -2.71875,2.6564 l 0,13.3437 0,8 c 0,1.4734 1.18265,2.6563 2.65625,2.6563 l 16,0 c 1.4733,0 2.65625,-1.183 2.65625,-2.6563 l 0,-18.375 -5.75,-5.6251 z m 12.28125,1.3595 4.96875,4.9063 c 0.131547,0.1315 0.05739,0.4375 -0.1875,0.4375 l -4.53125,0 c -0.506916,0.019 -0.65817,-0.2807 -0.6875,-0.7188 l 0,-4.4687 c 0,-0.2934 0.23552,-0.3583 0.4375,-0.1563 z"
+       id="path3006"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sscssssccsccccccc" />
+  </g>
+</svg>

sview-15_10.tar.gz/texturesSrc/actionPanorama.svg Added

@@ -0,0 +1,72 @@
+<?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.48.5 r10040"
+   sodipodi:docname="actionPanorama.svg"
+   inkscape:export-filename="actionPanorama.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="15.609629"
+     inkscape:cy="18.000209"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1004"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <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
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2984"
+       d="m 3.5063587,1046.9456 c 7.7876473,-4.5065 16.1588333,-4.5115 25.1131473,-0.018 l 0.0027,-21.0774 c -7.378842,3.4895 -17.670722,3.2974 -25.1157603,0 z m 15.1068073,-14.2561 5.950444,8.5923 c -5.687323,-1.7259 -11.408219,-2.3901 -16.860485,-0.1197 l 4.814396,-6.8289 2.404354,3.0736 z"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

sview-15_10.tar.gz/texturesSrc/actionPanoramaOff.svg Added

@@ -0,0 +1,76 @@
+<?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.48.5 r10040"
+   sodipodi:docname="actionPanoramaOff.svg"
+   inkscape:export-filename="actionPanoramaOff.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="15.609629"
+     inkscape:cy="18.000209"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1004"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <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 3.5 5.5 L 3.5 26.59375 C 10.211288 22.71011 17.359715 22.168001 24.9375 24.96875 L 22.125 22.15625 L 19.71875 19.75 C 15.645714 19.051532 11.595784 19.185036 7.6875 20.8125 L 12.53125 13.96875 L 14.9375 17.03125 L 15.84375 15.875 L 13.34375 13.375 L 7.15625 7.1875 L 6.65625 6.6875 L 6.6875 6.65625 C 5.5806328 6.323486 4.5155463 5.9497844 3.5 5.5 z M 28.625 5.5 C 23.507501 7.9200967 16.998384 8.5543072 11 7.625 L 17.34375 13.96875 L 18.625 12.3125 L 24.5625 20.90625 C 24.438001 20.868469 24.312028 20.849244 24.1875 20.8125 L 28.625 25.25 L 28.625 5.5 z "
+       transform="translate(0,1020.3622)"
+       id="path2984" />
+    <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-15_10.tar.gz/texturesSrc/actionStreamAudioOff.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.48.5 r10040"
+   sodipodi:docname="actionStreamAudioOff.svg"
+   inkscape:export-filename="actionStreamAudioOff.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="11.313709"
+     inkscape:cx="62.163495"
+     inkscape:cy="13.93474"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1364"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     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="path4"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="M 4 8 L 4 10.65625 L 10.625 10.65625 L 7.96875 8 L 4 8 z M 11.375 8 L 14.03125 10.65625 L 20 10.65625 L 20 8 L 11.375 8 z M 22.65625 8 L 22.65625 18.90625 C 22.478039 18.841203 22.311431 18.790898 22.125 18.75 L 25.34375 21.96875 L 25.34375 10.65625 L 29.34375 10.65625 L 29.34375 8 L 22.65625 8 z M 4 13.34375 L 4 16 L 15.96875 16 L 13.3125 13.34375 L 4 13.34375 z M 16.71875 13.34375 L 19.375 16 L 20 16 L 20 13.34375 L 16.71875 13.34375 z M 4 18.65625 L 4 21.34375 L 14.65625 21.34375 L 14.65625 18.65625 L 4 18.65625 z M 19.25 19.28125 C 18.108742 19.986285 17.34375 21.218205 17.34375 22.65625 C 17.34375 24.86285 19.137084 26.65625 21.34375 26.65625 C 22.781773 26.65625 24.013708 25.891259 24.71875 24.75 L 21.8125 21.84375 L 19.25 19.28125 z "
+       transform="translate(0,1020.3622)"
+       id="path6" />
+    <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-15_10.tar.gz/texturesSrc/actionStreamSubtitlesOff.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.48.5 r10040"
+   sodipodi:docname="actionStreamSubtitlesOff.svg"
+   inkscape:export-filename="actionStreamSubtitlesOff.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="20.649495"
+     inkscape:cy="6.3567748"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1364"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     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="path4"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="M 5.34375 5.34375 C 3.8704167 5.34375 2.65625 6.5267 2.65625 8 L 2.65625 24 C 2.65625 25.4733 3.8704167 26.65625 5.34375 26.65625 L 26.65625 26.65625 L 24 24 L 21.34375 24 L 21.34375 21.34375 L 18.65625 18.65625 L 13.34375 18.65625 L 13.34375 16 L 16 16 L 13.0625 13.0625 L 6.875 6.875 L 5.34375 5.34375 z M 8.75 5.34375 L 19.40625 16 L 26.65625 16 L 26.65625 18.65625 L 22.0625 18.65625 L 24.75 21.34375 L 26.65625 21.34375 L 26.65625 23.25 L 28.875 25.46875 C 29.153405 25.047558 29.34375 24.542929 29.34375 24 L 29.34375 8 C 29.34375 6.5267 28.129583 5.34375 26.65625 5.34375 L 8.75 5.34375 z M 5.34375 16 L 10.65625 16 L 10.65625 18.65625 L 5.34375 18.65625 L 5.34375 16 z M 5.34375 21.34375 L 18.65625 21.34375 L 18.65625 24 L 5.34375 24 L 5.34375 21.34375 z "
+       transform="translate(0,1020.3622)"
+       id="path6" />
+    <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-15_08.tar.gz/texturesSrc/menuSrcFormat.svg -> sview-15_10.tar.gz/texturesSrc/menuSrcFormat.svg Changed

@@ -14,7 +14,7 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="menuSrcFormat.svg"
    inkscape:export-filename="/home/menuSbsLR16.png"
    inkscape:export-xdpi="90"
@@ -210,16 +210,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="3.695895"
-     inkscape:cy="23.911929"
+     inkscape:zoom="31.999999"
+     inkscape:cx="8.3167614"
+     inkscape:cy="6.1548109"
      inkscape:document-units="px"
-     inkscape:current-layer="g4541"
+     inkscape:current-layer="layer8"
      showgrid="false"
      inkscape:window-width="1920"
-     inkscape:window-height="1109"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-height="1004"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
      inkscape:window-maximized="1"
      inkscape:snap-grids="true" />
   <metadata
@@ -230,7 +230,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -238,7 +238,8 @@
      inkscape:label="Rectangle"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1036.3622)">
+     transform="translate(0,-1036.3622)"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#c8c8c8;fill-opacity:1;stroke:#000000;stroke-width:0.99977112;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect2985"
@@ -979,9 +980,52 @@
   </g>
   <g
      inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="DualStream">
+    <rect
+       y="2"
+       x="2"
+       height="8"
+       width="8"
+       id="rect4448-1"
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       x="3.3710938"
+       y="8.8398438"
+       id="text3829-8"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3831-2"
+         x="3.3710938"
+         y="8.8398438"
+         style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
+    <rect
+       y="6"
+       x="6"
+       height="8"
+       width="8"
+       id="rect4448-2-9-0"
+       style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       x="6.8398438"
+       y="12.863281"
+       id="text3835-4"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3837-5"
+         x="6.8398438"
+         y="12.863281"
+         style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
      id="g4541"
      inkscape:label="Tiled720in1080"
-     style="display:inline">
+     style="display:none">
     <rect
        style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
        id="rect4545"
@@ -991,7 +1035,7 @@
        y="2.9835343" />
     <text
        xml:space="preserve"
-       style="font-size:7.10074090999999985px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4640);fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       style="font-size:7.10074091px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4640);fill-opacity:1;stroke:none;display:inline;font-family:Sans"
        x="9.524538"
        y="9.9912825"
        id="text4046-0"
@@ -1001,7 +1045,7 @@
          id="tspan4048-7"
          x="9.524538"
          y="9.9912825"
-         style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill-opacity:1;fill:url(#linearGradient4640)">R</tspan></text>
+         style="font-weight:bold;fill:url(#linearGradient4640);fill-opacity:1;-inkscape-font-specification:Sans Bold">R</tspan></text>
     <rect
        style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
        id="rect4545-2"

Overview

Request 2175 (accepted)

Request History