HGamer3D-SFML-Binding 0.3.2 → 0.4.0

raw patch · 8 files changed

+52/−12 lines, 8 filesdep ~HGamer3D-Data

Dependency ranges changed: HGamer3D-Data

Files

• HGamer3D-SFML-Binding.cabal +6/−6
• include/MouseHG3D.h +18/−0
• include/SFMLDllDefines.h +6/−6
• include/hg3dstruct.h +4/−0
• include/vector2fstruct.h +4/−0
• include/vector2istruct.h +4/−0
• include/vector3fstruct.h +5/−0
• include/vector3istruct.h +5/−0

@@ -1,5 +1,5 @@ Name:                HGamer3D-SFML-Binding
-Version:             0.3.2
+Version:             0.4.0
 Synopsis:            SFML Binding for HGamer3D
 Description:         
    HGamer3D is a game engine for developing 3D games in the programming @@ -18,12 +18,12 @@ Cabal-Version:       >=1.4
 Homepage:            http://www.hgamer3d.org
 Category:            Game Engine, Audio, Graphics
-Extra-source-files:  Setup.hs, include/EnumMouseButton.h, include/StructHG3DClass.h, include/ClassMusic.h, include/ClassSoundStream.h, include/StructVec3.h, include/ClassSound.h, include/ClassSoundBuffer.h, include/EnumKey.h, include/ClassListener.h, include/ClassMouseHG3D.h, include/EnumJoystickAxis.h, include/ClassKeyboard.h, include/ClassSoundSource.h, include/ClassJoystick.h, include/SFMLDllDefines.h, include/ClassMouse.h, include/ClassPtr.h, include/EnumSoundSourceStatus.h
+Extra-source-files:  Setup.hs, include/ClassSoundSource.h, include/StructHG3DClass.h, include/hg3dstruct.h, include/StructVec3.h, include/vector3istruct.h, include/ClassKeyboard.h, include/EnumKey.h, include/vector3fstruct.h, include/SFMLDllDefines.h, include/ClassMouse.h, include/EnumMouseButton.h, include/ClassPtr.h, include/vector2istruct.h, include/ClassMouseHG3D.h, include/ClassSoundBuffer.h, include/vector2fstruct.h, include/ClassMusic.h, include/ClassJoystick.h, include/MouseHG3D.h, include/ClassSound.h, include/ClassSoundStream.h, include/ClassListener.h, include/EnumJoystickAxis.h, include/EnumSoundSourceStatus.h
 
 Library
-  Build-Depends:     base >= 3 && < 5, HGamer3D-Data >= 0.3.0
+  Build-Depends:     base >= 3 && < 5, HGamer3D-Data >= 0.4.0
 
-  Exposed-modules:   HGamer3D.Bindings.SFML.Utils, HGamer3D.Bindings.SFML.StructHG3DClass, HGamer3D.Bindings.SFML.ClassPtr, HGamer3D.Bindings.SFML.EnumJoystickAxis, HGamer3D.Bindings.SFML.EnumKey, HGamer3D.Bindings.SFML.EnumSoundSourceStatus, HGamer3D.Bindings.SFML.EnumMouseButton, HGamer3D.Bindings.SFML.StructVec3, HGamer3D.Bindings.SFML.ClassListener, HGamer3D.Bindings.SFML.ClassJoystick, HGamer3D.Bindings.SFML.ClassMouseHG3D, HGamer3D.Bindings.SFML.ClassSoundStream, HGamer3D.Bindings.SFML.ClassSoundBuffer, HGamer3D.Bindings.SFML.ClassSoundSource, HGamer3D.Bindings.SFML.ClassKeyboard, HGamer3D.Bindings.SFML.ClassMouse, HGamer3D.Bindings.SFML.ClassSound, HGamer3D.Bindings.SFML.ClassMusic
+  Exposed-modules:   HGamer3D.Bindings.SFML.Utils, HGamer3D.Bindings.SFML.StructHG3DClass, HGamer3D.Bindings.SFML.ClassPtr, HGamer3D.Bindings.SFML.EnumMouseButton, HGamer3D.Bindings.SFML.EnumJoystickAxis, HGamer3D.Bindings.SFML.EnumSoundSourceStatus, HGamer3D.Bindings.SFML.EnumKey, HGamer3D.Bindings.SFML.StructVec3, HGamer3D.Bindings.SFML.ClassJoystick, HGamer3D.Bindings.SFML.ClassSound, HGamer3D.Bindings.SFML.ClassMouseHG3D, HGamer3D.Bindings.SFML.ClassListener, HGamer3D.Bindings.SFML.ClassMusic, HGamer3D.Bindings.SFML.ClassSoundStream, HGamer3D.Bindings.SFML.ClassSoundBuffer, HGamer3D.Bindings.SFML.ClassKeyboard, HGamer3D.Bindings.SFML.ClassSoundSource, HGamer3D.Bindings.SFML.ClassMouse
   Other-modules:     
 
   ghc-options:       
@@ -33,6 +33,6 @@   Build-tools:       
   build-depends:     
   if os(windows)
-     extra-libraries:   hg3dsfml032
+     extra-libraries:   hg3dsfml040
   else
-     extra-libraries:   hg3dsfml032,sfml-audio,sfml-system,sfml-window,sfml-network
+     extra-libraries:   hg3dsfml040,sfml-audio,sfml-system,sfml-window,sfml-network

@@ -0,0 +1,18 @@+// MouseHG3D - special mouse class to get a specialized way to obtain
+// the mouse coordinates
+
+#include <SFML/System/Vector2.hpp>
+#include <SFML/Window/Mouse.hpp>
+
+class MouseHG3D : sf::Mouse {
+	
+	public:
+		static void getPosition(int &x, int &y) {
+			sf::Vector2i vi = sf::Vector2i();
+			vi = sf::Mouse::getPosition();
+			x = vi.x;
+			y = vi.y;
+		};
+	
+};
+

@@ -16,10 +16,10 @@ 
 // SFMLDllDefines.h
 
-#ifndef _HGamer3DSFML032_DLLDEFINES_H_
-#define _HGamer3DSFML032_DLLDEFINES_H_
+#ifndef _HGamer3DSFML040_DLLDEFINES_H_
+#define _HGamer3DSFML040_DLLDEFINES_H_
 
-/* Cmake will define HGamer3DSFML032_EXPORTS on Windows when it
+/* Cmake will define HGamer3DSFML040_EXPORTS on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
 projects by hand you need to define MyLibrary_EXPORTS when
@@ -29,13 +29,13 @@ // We are using the Visual Studio Compiler and building Shared libraries
 
 #if (defined (_WIN32)) && !(defined (__GNUC__)) 
-  #if defined(HGamer3DSFML032_EXPORTS)
+  #if defined(HGamer3DSFML040_EXPORTS)
     #define  SFML_LIB_EXPORT __declspec(dllexport)
   #else
     #define  SFML_LIB_EXPORT __declspec(dllimport)
-  #endif /* HGamer3DSFML032_EXPORTS */
+  #endif /* HGamer3DSFML040_EXPORTS */
 #else /* defined (_WIN32) */
  #define SFML_LIB_EXPORT
 #endif
 
-#endif /* _HGamer3DSFML032_DLLDEFINES_H_ */
+#endif /* _HGamer3DSFML040_DLLDEFINES_H_ */

@@ -0,0 +1,4 @@+typedef struct hg3dclass_struct {+	void *ptr;+	void *fptr;+} hg3dclass_struct;

@@ -0,0 +1,4 @@+typedef struct vector2f_struct {
+	float x;
+	float y;
+} vector2f_struct;

@@ -0,0 +1,4 @@+typedef struct vector2i_struct {
+	int x;
+	int y;
+} vector2i_struct;

@@ -0,0 +1,5 @@+typedef struct vector3f_struct {
+	float x;
+	float y;
+	float z;
+} vector3f_struct;

@@ -0,0 +1,5 @@+typedef struct vector3i_struct {
+	int x;
+	int y;
+	int z;
+} vector3i_struct;