fixed pmouseX/Y, PVector uses include guard now,

dennisppaul · Oct 11, 2024 · 3f88cc1 · 3f88cc1
1 parent 909e597
commit 3f88cc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/include/PApplet.h b/include/PApplet.h
@@ -265,6 +265,7 @@ namespace umgebung {
         float      pmouseX;
         float      pmouseY;
         int        mouseButton;
+        bool       isMousePressed; // in processing this is `mousePressed` … however this does not work in C++ as it conflicts with the function name
         int        key;
         int        frameCount;
         float      frameRate;
@@ -329,6 +330,9 @@ namespace umgebung {
         virtual void draw() {}
 
         virtual void post_draw() {
+            pmouseX = mouseX;
+            pmouseY = mouseY;
+
 #ifndef DISABLE_GRAPHICS
             //        glFlush();
             //        glFinish();

diff --git a/include/PVector.h b/include/PVector.h
@@ -17,7 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef PVECTOR_H
+#define PVECTOR_H
 
 #include <cmath>
 #include <random>
@@ -244,4 +245,6 @@ namespace umgebung {
             return arr;
         }
     };
-} // namespace umgebung
+} // namespace umgebung
+
+#endif // PVECTOR_H
diff --git a/src/UmgebungGraphicsOpenGL.cpp b/src/UmgebungGraphicsOpenGL.cpp
@@ -258,10 +258,12 @@ namespace umgebung {
                 fApplet->mouseButton = event.button.button;
                 fMouseIsPressed      = true;
                 fApplet->mousePressed();
+                fApplet->isMousePressed = true;
                 break;
             case SDL_MOUSEBUTTONUP:
                 fMouseIsPressed = false;
                 fApplet->mouseReleased();
+                fApplet->isMousePressed = false;
                 break;
             case SDL_MOUSEMOTION:
                 fApplet->mouseX = static_cast<float>(event.motion.x);
@@ -271,8 +273,6 @@ namespace umgebung {
                 } else {
                     fApplet->mouseMoved();
                 }
-                fApplet->pmouseX = fApplet->mouseX;
-                fApplet->pmouseY = fApplet->mouseY;
                 break;
             case SDL_DROPFILE: {
                 char* dropped_filedir = event.drop.file;