@@ -1,4 +1,15 @@

 -------------------------------------------------------------------

+Wed Oct 21 17:46:52 UTC 2015 - avvissu@yandex.ru

+

+- Update to 15.10:

+  * adds support of cubemaps in format 3:2 (two rows per 3 quad 

+    sides)

+  * adds button to activate 360 panorama view on toolbar

+  * adds Czech translation files

+  * adds option to automatically workaround aspect ratio of 

+    anamorphic 1080p and 720p videos

+

+-------------------------------------------------------------------

 Sat May 19 00:00:00 UTC 2015 - avvissu@yandex.ru

 - Initial package

​

@@ -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

​

@@ -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);

-}

​

@@ -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);

-}

​

@@ -1,22 +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

- */

-

-#ifndef __StGLImageFlatProgram_h_

-#define __StGLImageFlatProgram_h_

-

-#include "StGLImageProgram.h"

-

-class StGLImageFlatProgram : public StGLImageProgram {

-

-        public:

-

-    ST_CPPEXPORT StGLImageFlatProgram();

-

-};

-

-#endif //__StGLImageFlatProgram_h_

​

@@ -1,22 +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

- */

-

-#ifndef __StGLImageSphereProgram_h_

-#define __StGLImageSphereProgram_h_

-

-#include "StGLImageProgram.h"

-

-class StGLImageSphereProgram : public StGLImageProgram {

-

-        public:

-

-    ST_CPPEXPORT StGLImageSphereProgram();

-

-};

-

-#endif //__StGLImageSphereProgram_h_

​

@@ -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);

​

@@ -65,8 +65,6 @@

   int  (*websocket_data)(struct mg_connection *);

   const char * (*open_file)(const struct mg_connection *,

                              const char *path, size_t *data_len);

-  void (*init_lua)(struct mg_connection *, void *lua_context);

-  void (*upload)(struct mg_connection *, const char *file_name);

 };

 // Start web server.

@@ -182,11 +180,6 @@

 // Send contents of the entire file together with HTTP headers.

 void mg_send_file(struct mg_connection *conn, const char *path);

-

-// Read data from the remote end, return number of bytes read.

-int mg_read(struct mg_connection *, void *buf, size_t len);

-

-

 // Get the value of particular HTTP header.

 //

 // This is a helper function. It traverses request_info->http_headers array,

​

@@ -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/русский/

​

@@ -260,7 +260,7 @@

     return open();

 }

-void StCADViewer::releaseDevice() {

+void StCADViewer::saveAllParams() {

     if(!myGUI.isNull()) {

         mySettings->saveParam(ST_PARAM_NORMALS,     params.toShowNormals);

         mySettings->saveParam(ST_PARAM_TRIHEDRON,   params.toShowTrihedron);

@@ -269,7 +269,11 @@

         mySettings->saveInt32(ST_SETTING_FPSTARGET, params.TargetFps);

         mySettings->saveParam(ST_SETTING_SHOW_FPS,  params.ToShowFps);

     }

+    mySettings->flush();

+}

+void StCADViewer::releaseDevice() {

+    saveAllParams();

     if(!myContext.isNull()) {

         if(myNormalsMesh != NULL) {

             myNormalsMesh->release(*myContext);

@@ -374,6 +378,11 @@

     return true;

 }

+void StCADViewer::doPause(const StPauseEvent& theEvent) {

+    StApplication::doPause(theEvent);

+    saveAllParams();

+}

+

 void StCADViewer::doResize(const StSizeEvent& ) {

     if(myGUI.isNull()) {

         return;

​

@@ -68,6 +68,7 @@

         private: //! @name window events slots

+    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);

@@ -137,6 +138,7 @@

      * Release GL resources.

      */

     ST_LOCAL void releaseDevice();

+    ST_LOCAL void saveAllParams();

         private: //!< private callback Slots

​

@@ -192,7 +192,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);

 }

​

+(directory)

​

@@ -0,0 +1,26 @@

+# Czech translation file for StCADViewer

+# @author Kirill Gavrilov

+# @translator Marek Audy

+--------

+1200=Zobrazení

+1201=Typ projekce

+1202=Celá obrazovka

+1203=Zobrazit normálně

+1204=Zobrazit trihedron (průsečík xyz)

+1205=Dvě světla

+1206=Projekce

+1207=Režim výplň

+1208=Přidat soubor

+1240=Ortogonální

+1241=Perspektivní

+1242=Stereo

+1250=Síť

+1251=Stínování

+1252=Stínování + Síť

+1500=Pomoc

+1501=O aplikaci...

+1503=Licence

+1504=Language

+3000=sView - Aplikace pro zobrazení CAD modelů

+3001=Verze

+3002=Aplikace podporuje CAD soubory ve formátu IGES, STEP, BREP s využitím OpenCASCADE Technology.\n © 2011-2014 Гаврилов Кирилл (kirill@sview.ru).\nOficiální stránky: www.sview.ru

​

@@ -0,0 +1,1 @@

+Čeština

\ No newline at end of file

​

@@ -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__

​

@@ -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;

         }

     }

​

@@ -1,5 +1,5 @@

 /**

- * Copyright © 2011-2013 Kirill Gavrilov <kirill@sview.ru>

+ * Copyright © 2011-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

@@ -63,6 +63,12 @@

          */

         - (void ) goToWindowed: (id ) theSender;

+        /**

+         * Update window caption.

+         * This method should be called from main thread!

+         */

+        - (void ) updateTitle: (id ) theSender;

+

     @end

 #else

     class StCocoaView;

​

@@ -25,6 +25,8 @@

 #include <StStrings/StLogger.h>

 #include <StTemplates/StRect.h>

+#include <StCocoa/StCocoaString.h>

+

 #if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)

 @interface NSOpenGLView (LionAPI)

     - (void )setWantsBestResolutionOpenGLSurface: (BOOL )theFlag;

@@ -449,6 +451,19 @@

         [aWin setLevel: NSNormalWindowLevel];

         [aWin setFrame: myRectWindowed display: YES];

         [aWin makeFirstResponder: self];

+

+        StCocoaString aTitle(myStWin->getTitle());

+        [aWin setTitle: aTitle.toStringNs()];

+    }

+

+    - (void ) updateTitle: (id ) theSender {

+        NSWindow* aWin = [self window];

+        if(aWin == NULL) {

+            return;

+        }

+

+        StCocoaString aTitle(myStWin->getTitle());

+        [aWin setTitle: aTitle.toStringNs()];

     }

     - (NSDragOperation ) draggingEntered: (id <NSDraggingInfo> ) theSender {

​

@@ -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>();

+}

​

@@ -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;

​

@@ -1,5 +1,5 @@

 /**

- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>

+ * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>