Can update mouse mode from lua

CMakeLists.txt

@@ -12,25 +12,11 @@ if (LUA_ENABLED)
   find_package(Lua REQUIRED)
   include_directories(${LUA_INCLUDE_DIR})
 endif ()
-
-option(GUILE_ENABLED "Guile 2.0 scripting support" OFF)
-if (GUILE_ENABLED)
-  add_compile_definitions(GUILE_SCRIPTING)
-  ## Find pkg-config
-  find_package(PkgConfig REQUIRED)
-  ## Use pkg-config to find Guile 2.0
-  pkg_check_modules(GUILE REQUIRED guile-2.0)
-  include_directories(${GUILE_INCLUDE_DIRS})
-endif ()
-  
-
-
 add_executable(couch core/couch.cpp)
 
 add_subdirectory(core)
 target_link_libraries(couch couchlib)
 target_link_libraries(couch couchlib_luascripting)
-target_link_libraries(couch couchlib_guilescripting)
 
 add_subdirectory(scripting)
 if (LUA_ENABLED)

core/CMakeLists.txt

@@ -65,16 +65,12 @@ target_sources(couchlib PUBLIC
 
 
 add_library(couchlib_luascripting STATIC)
+
 target_sources(couchlib_luascripting PUBLIC
   Scripting/Lua.h
   Scripting/Lua.cpp)
 target_link_libraries(couchlib_luascripting couchlua)
 
-add_library(couchlib_guilescripting STATIC)
-target_sources(couchlib_guilescripting PUBLIC
-  Scripting/Guile.h
-  Scripting/Guile.cpp)
-target_link_libraries(couchlib_guilescripting couchguile)
 
 target_include_directories(couchlib
   PUBLIC
@@ -94,9 +90,6 @@ target_link_libraries(couchlib GLEW::GLEW)
 if (LUA_ENABLED)
   target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES})
 endif () 
-if (GUILE_ENABLED)
-  target_link_libraries(couchlib_guilescripting ${GUILE_LIBRARIES})
-endif ()
 target_link_libraries(couchlib ${BULLET_LIBRARIES})
 target_link_libraries(couchlib ${ASSIMP_LIBRARY})
 

core/Input.cpp

@@ -14,10 +14,26 @@ Input *Input::GetInstance() {
 }
 
 
-void Input::Use(Window window){
+void Input::Use(Window *window){
-  glfwSetInputMode(window.glfwWindow, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+	this->window = window;
-  glfwSetKeyCallback(window.glfwWindow, (GLFWkeyfun)HandleKeys);
+  glfwSetKeyCallback(window->glfwWindow, (GLFWkeyfun)HandleKeys);
-  glfwSetCursorPosCallback(window.glfwWindow, (GLFWcursorposfun)HandleMousePosition);
+  glfwSetCursorPosCallback(window->glfwWindow, (GLFWcursorposfun)HandleMousePosition);
+}
+
+void Input::SetMouseMode(MouseMode mouseMode) {
+	this->mouseMode = mouseMode;
+
+	switch(mouseMode) {
+	case MouseMode::VISIBLE:
+		glfwSetInputMode(window->glfwWindow, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+		break;
+	case MouseMode::CAPTURED:
+		glfwSetInputMode(window->glfwWindow, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+		break;
+	case MouseMode::HIDDEN:
+		glfwSetInputMode(window->glfwWindow, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+		break;
+	}
 }
 
 void Input::HandleKeys(GLFWwindow *_, int keys, int code, int action, int mods) {

core/Input.h

@@ -13,13 +13,20 @@ typedef void (*MousePositionHandler)(double xpos, double ypos, double xrel, doub
 
 class Input {
 public:
+	enum MouseMode {
+		VISIBLE, HIDDEN, CAPTURED
+	};
+	
   static Input *GetInstance();
-  void Use(Window window);
+  void Use(Window *window);
+	void SetMouseMode(MouseMode mouseMode);
   std::vector<KeyHandler> keyHandlers;
   std::vector<MousePositionHandler> mousePositionHandlers;
 private:
   bool firstMousePositionUpdate = true;
   double lastx, lasty;
+	MouseMode mouseMode;
+	Window *window;
   Input();
   static void HandleKeys(GLFWwindow *_, int key, int code, int action, int mods);
   static void HandleMousePosition(GLFWwindow *_, double xpos, double ypos);

core/Scripting/Guile.cpp

@@ -1,103 +0,0 @@
-#include "Guile.h"
-
-#include "../Util.h"
-
-void Guile::Initialize() {
-#ifdef GUILE_SCRIPTING
-  language = this;
-  // Initialize Guile
-  scm_with_guile(Guile::inner_init, NULL);
-
-  // Bind input functions
-  Input *input = Input::GetInstance();
-  if (HasHook("onkey")) {
-    input->keyHandlers.push_back(GuileKeyHandler);
-  }
-  if (HasHook("onmousemotion")) {
-    input->mousePositionHandlers.push_back(GuileMousePositionHandler);
-  }
-#else // GUILE_SCRIPTING
-  Util::Die("Guile is selected as the scripting language, but this binary was built without Guile support.");
-#endif // GUILE_SCRIPTING
-}
-
-void Guile::Update(double delta) {
-#ifdef GUILE_SCRIPTING
-  if (HasHook("update")) {
-    scm_with_guile(Guile::inner_update, &delta);
-  }
-#endif // GUILE_SCRIPTING
-}
-
-void Guile::Close() {
-  // Nothing to do
-}
-
-bool Guile::HasHook(const char *name) {
-  bool exists = false;
-#ifdef GUILE_SCRIPTING
-  exists = scm_with_guile(Guile::inner_has_hook, (void *) name);
-#endif // GUILE_SCRIPTING
-  return exists;
-}
-
-#ifdef GUILE_SCRIPTING
-
-void Guile::GuileKeyHandler(int key, int code, int action, int mods) {
-  Guile::key_event ev {key, code, action, mods};
-  scm_with_guile(Guile::inner_key_handler, &ev);
-}
-
-void Guile::GuileMousePositionHandler(double xpos, double ypos, double relx, double rely) {
-  Guile::mouse_position_event ev {xpos, ypos, relx, rely};
-  scm_with_guile(Guile::inner_mouse_position_handler, &ev);
-}
-
-void *Guile::inner_init(void* empty) {
-  // Init swig
-  SWIG_init();
-  // Load main file
-  scm_c_primitive_load("main.scm");
-  // Execute the init function if it exists
-  if (ScriptingLanguage::language->HasHook("init")) {
-    scm_call_0(scm_c_eval_string("init"));
-  }
-}
-
-void *Guile::inner_update(void *data) {
-  double delta = *(double*) data;
-  if (ScriptingLanguage::language->HasHook("update")) {
-    scm_call_1(scm_c_eval_string("update"), scm_from_double(delta));
-  }
-}
-
-void *Guile::inner_has_hook(void *data) {
-  const char *name = (const char *) data;
-  return (void *) scm_to_bool(scm_defined_p(scm_from_locale_symbol(name), SCM_UNDEFINED));
-}
-
-void *Guile::inner_key_handler(void *data) {
-  Guile::key_event *ev = (Guile::key_event*) data;
-  if (ScriptingLanguage::language->HasHook("onkey")) {
-    scm_call_4(scm_c_eval_string("onkey"),
-	       scm_from_int(ev->key),
-	       scm_from_int(ev->code),
-	       scm_from_int(ev->action),
-	       scm_from_int(ev->mods));
-  }
-}
-
-void *Guile::inner_mouse_position_handler(void *data) {
-  Guile::mouse_position_event *ev = (Guile::mouse_position_event *) data;
-  if (ScriptingLanguage::language->HasHook("onmousemotion")) {
-    scm_call_4(scm_c_eval_string("onmousemotion"),
-	       scm_from_double(ev->xpos),
-	       scm_from_double(ev->ypos),
-	       scm_from_double(ev->relx),
-	       scm_from_double(ev->rely));
-  }
-}
-
-
-#endif // GUILE_SCRIPTING
-

core/Scripting/Guile.h

@@ -1,46 +0,0 @@
-#ifndef GUILE_H
-#define GUILE_H
-
-#include "../Input.h"
-
-#ifdef GUILE_SCRIPTING
-#include <libguile.h>  
-
-
-extern "C" void SWIG_init();
-#endif // GUILE_SCRIPTING
-
-#include "ScriptingLanguage.h"
-
-class Guile : public ScriptingLanguage {
-public:
-  void Initialize();
-  void Update(double delta);
-  void Close();
-  bool HasHook(const char *name);
-private:
-#ifdef GUILE_SCRIPTING
-  struct key_event {
-    int key;
-    int code;
-    int action;
-    int mods;
-  };
-  struct mouse_position_event {
-    double xpos;
-    double ypos;
-    double relx;
-    double rely;
-  };
-  static void *inner_init(void *empty);
-  static void *inner_update(void *delta);
-  static void *inner_has_hook(void *name);
-  static void *inner_key_handler(void *ev);
-  static void *inner_mouse_position_handler(void *ev);
-  static void GuileKeyHandler(int key, int code, int action, int mods);
-  static void GuileMousePositionHandler(double xpos, double ypos, double relx, double rely);
-#endif // GUILE_SCRIPTING
-};
-
-
-#endif /* GUILE_H */

core/couch.cpp

@@ -30,14 +30,11 @@
 #include "Rigidbody.h"
 #include "World.h"
 
+
 #include "Scripting/Lua.h"
-#include "Scripting/Guile.h"
 
 Node *root;
 
-char script_type = 'l';
-ScriptingLanguage *sl;
-
 void render(Node *curr, Shader *shader, Matrix model) {
   Spatial *spatial = dynamic_cast<Spatial*>(curr);
   if (spatial) {
@@ -60,27 +57,11 @@ void render(Node *curr, Shader *shader, Matrix model) {
   }
 }
 
-void parse_args(int argc, char* argv[]) {
-  int curr = 1;
-  while (curr < argc) {
-    if (argv[curr][0] == '-') {
-      switch(argv[curr][1]) {
-      case 'l':
-	++curr;
-	script_type = argv[curr][0];
-	++curr;
-	break;
-      }
-    } else {
-      chdir(argv[curr]);
-      ++curr;
-    }
-  }
-}
-
 int main(int argc, char *argv[]) {
 
-  parse_args(argc, argv);
+  if (argc == 2) {
+    chdir(argv[1]);
+  }
   
   Window window;
   window.Init();
@@ -88,7 +69,7 @@ int main(int argc, char *argv[]) {
   root = Node::GetRoot();
 
   Input *input = Input::GetInstance();
-  input->Use(window);
+  input->Use(&window);
 
   Camera defaultCamera;
 
@@ -103,15 +84,9 @@ int main(int argc, char *argv[]) {
   
   Matrix projection = glm::perspective(glm::radians(45.0f), 800.0f/600.0f, 0.1f, 100.0f);
 
-  switch(script_type) {
+  // TODO Allow multiple scripting languages
-  case 'l':
+  Lua *lua = new Lua();
-    sl = new Lua();
+  lua->Initialize();
-    break;
-  case 'g':
-    sl = new Guile();
-    break;
-  }
-  sl->Initialize();
 
 
   double lastTime = glfwGetTime();
@@ -122,7 +97,7 @@ int main(int argc, char *argv[]) {
     world->Step(delta);
 
     // Script update
-    ScriptingLanguage::GetCurrentLanguage()->Update(delta);
+    lua->Update(delta);
     
     // Delete freed nodes
     root->DoFree();
@@ -183,7 +158,7 @@ int main(int argc, char *argv[]) {
     lastTime = curTime;
   }
   
-  ScriptingLanguage::GetCurrentLanguage()->Close();
+  lua->Close();
   window.Close();
   return 0;
 }

demo/exampleworld/main.lua

@@ -26,6 +26,8 @@ function init()
    local material
    local transform
 
+   couch.Input.GetInstance():SetMouseMode(couch.Input.CAPTURED)
+
    freecam.init_camera()
    freecam.camera:Translate(couch.Vector3(0.0, 0.0, 10.0))
 

demo/scm/exampleworld/main.scm

@@ -1,5 +0,0 @@
-(define (init)
-  (display "Hello from init!")
-  (newline))
-(display "Hello from main.scm!")
-(newline)

scripting/CMakeLists.txt

@@ -4,6 +4,7 @@ set_property(SOURCE couch.i PROPERTY CPLUSPLUS ON)
 set_property(SOURCE couch.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON)
 
 if (LUA_ENABLED)
+  ## Find Lua
   swig_add_library(couchlua
     TYPE STATIC
     LANGUAGE lua
@@ -16,17 +17,3 @@ if (LUA_ENABLED)
     couchlib
     ${LUA_LIBRARIES})
 endif ()
-
-if (GUILE_ENABLED)
-  swig_add_library(couchguile
-    TYPE STATIC
-    LANGUAGE guile
-    SOURCES couch.i)
-
-  target_include_directories(couchguile PRIVATE "${PROJECT_SOURCE_DIR}/core")
-
-  swig_link_libraries(couchguile
-    PRIVATE
-    couchlib
-    ${GUILE_LIBRARIES})
-endif ()

scripting/couch.i

@@ -18,6 +18,7 @@
 #include "Skybox.h"
 #include "Rigidbody.h"
 #include "CollisionShape.h"
+#include "Input.h"
 struct RaycastResult {
   bool hit;
   Vector3 position;
@@ -73,3 +74,4 @@ public:
 %include "Skybox.h"
 %include "Rigidbody.h"
 %include "CollisionShape.h"
+%include "Input.h"