Browse Source

MV : NaCl mouse support

undefined
Benjamin ‘Touky’ Huet Sam Hocevar <sam@hocevar.net> 11 years ago
parent
commit
bf0a5ffde6
3 changed files with 5 additions and 2 deletions
  1. +2
    -0
      test/javascript/progressstatus.js
  2. +1
    -1
      test/meshviewer.cpp
  3. +2
    -1
      test/meshviewer.index.html

+ 2
- 0
test/javascript/progressstatus.js View File

@@ -99,6 +99,7 @@ function HideProgressStatus(should_hide)
if (should_hide == true) if (should_hide == true)
{ {
div_progress.style.visibility = "hidden"; div_progress.style.visibility = "hidden";
div_progress.style.zIndex = "-999";
g_status_text.splice(0, g_status_text.length); g_status_text.splice(0, g_status_text.length);
g_status_timer.splice(0, g_status_timer.length); g_status_timer.splice(0, g_status_timer.length);
progress_bar.value = -1; progress_bar.value = -1;
@@ -107,6 +108,7 @@ function HideProgressStatus(should_hide)
else else
{ {
div_progress.style.visibility = "visible"; div_progress.style.visibility = "visible";
div_progress.style.zIndex = "999";
progress_bar.value = -1; progress_bar.value = -1;
AddTextStatus('Please wait for module loading'); AddTextStatus('Please wait for module loading');
UpdateTextStatus(1.0); UpdateTextStatus(1.0);


+ 1
- 1
test/meshviewer.cpp View File

@@ -26,7 +26,7 @@ static int const TEXTURE_WIDTH = 256;


#define NO_NACL_EM (!__native_client__ && !EMSCRIPTEN) #define NO_NACL_EM (!__native_client__ && !EMSCRIPTEN)
#define NACL_EM (__native_client__ || EMSCRIPTEN) #define NACL_EM (__native_client__ || EMSCRIPTEN)
#define NO_NACL_EM_INPUT (1 && NO_NACL_EM)
#define NO_NACL_EM_INPUT (1 && !EMSCRIPTEN)


#define R_M 1.f #define R_M 1.f
#if NACL_EM #if NACL_EM


+ 2
- 1
test/meshviewer.index.html View File

@@ -37,6 +37,7 @@ textarea
background-color:white; background-color:white;
border:1px solid #000000; border:1px solid #000000;
visibility: hidden; visibility: hidden;
z-index: 1;
} }
progress progress
{ {
@@ -70,7 +71,7 @@ progress::-webkit-progress-value
position: absolute; position: absolute;
top: 2px; top: 2px;
left: 2px; left: 2px;
z-index: -1;
z-index: 0;
} }
#BGCanvas #BGCanvas
{ {


Loading…
Cancel
Save