Browse Source

fixed emsc build

dmuratshin 10 years ago
parent
commit
cc20124a7c

+ 2 - 2
.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: b1473041e24457bb59de960c4e4b90b93d87b47f
+node: 09ef2cef93f6d300de6116847a1e4552c241601e
 branch: default
 latesttag: oldrender
-latesttagdistance: 778
+latesttagdistance: 779

+ 6 - 5
oxygine/src/core/ThreadMessages.cpp

@@ -120,16 +120,18 @@ namespace oxygine
 
     bool ThreadMessages::peek(peekMessage& ev, bool del)
     {
-        if (ev.end)
+        if (!ev.num)
             return false;
 
         bool has = false;
 
         MutexPthreadLock lock(_mutex);
-        _replyLast(0);
+        if (ev.num == -1)
+            ev.num = _events.size();
 
+        _replyLast(0);
 
-        if (!_events.empty())
+        if (!_events.empty() && ev.num > 0)
         {
             static_cast<message&>(ev) = _events.front();
             if (del)
@@ -137,8 +139,7 @@ namespace oxygine
             has = true;
             _last = ev;
 
-            if (_events.empty())
-                ev.end = true;
+            ev.num--;
         }
 
         return has;

+ 2 - 2
oxygine/src/core/ThreadMessages.h

@@ -50,8 +50,8 @@ namespace oxygine
 
         struct peekMessage: public message
         {
-            peekMessage() : end(false) {}
-            bool end;
+            peekMessage() : num(-1) {}
+            int num;
         };
 
 

+ 1 - 1
oxygine/src/core/oxygine.cpp

@@ -589,7 +589,7 @@ namespace oxygine
                     KeyEvent ev(KeyEvent::KEY_UP, &event.key);
                     stage->dispatchEvent(&ev);
                 } break;
-#if SDL_VIDEO_OPENGL
+#if SDL_VIDEO_OPENGL || EMSCRIPTEN
                 case SDL_MOUSEMOTION:
                     input->sendPointerMotionEvent(stage, (float)event.motion.x, (float)event.motion.y, 1.0f, &input->_pointerMouse);
                     break;