Marko Pintera 13 ani în urmă
părinte
comite
d71ac4d2a8

+ 1 - 1
CamelotOISInput/CamelotOISInput.vcxproj

@@ -54,7 +54,7 @@
     <Link>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>../lib/$(Configuration);../Dependencies/lib/Debug;./Dependencies/lib/Debug</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>../lib/$(Configuration);../Dependencies/lib/Debug;./Dependencies/lib/Debug</AdditionalLibraryDirectories>
-      <AdditionalDependencies>CamelotRenderer.lib;CamelotUtility.lib;OIS_d.lib;libboost_signals-vc110-mt-gd-1_49.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CamelotRenderer.lib;CamelotUtility.lib;OIS.lib;libboost_signals-vc110-mt-gd-1_49.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>..\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
       <ImportLibrary>..\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     </Link>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>

+ 9 - 2
CamelotOISInput/Source/CmInputHandlerOIS.cpp

@@ -1,5 +1,6 @@
 #include "CmInputHandlerOIS.h"
 #include "CmInputHandlerOIS.h"
 #include "CmPoint.h"
 #include "CmPoint.h"
+#include "OIS/OISException.h"
 
 
 namespace CamelotEngine
 namespace CamelotEngine
 {
 {
@@ -22,8 +23,14 @@ namespace CamelotEngine
 		pl.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
 		pl.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
 		pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
 		pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
 #endif
 #endif
-
-		mInputManager = OIS::InputManager::createInputSystem(pl);
+		try
+		{
+			mInputManager = OIS::InputManager::createInputSystem(pl);
+		}
+		catch(OIS::Exception &e)
+		{
+			std::cout << e.eText << std::endl;
+		} 
 
 
 		mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, true));
 		mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, true));
 		mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
 		mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));

+ 1 - 0
CamelotRenderer/TODO.txt

@@ -15,6 +15,7 @@ High-level TODO:
  - DX11 render system
  - DX11 render system
 
 
 HIGH PRIORITY TODO:
 HIGH PRIORITY TODO:
+ - OIS doesn't initialize properly!
  - GetRenderOperation doesn't consider sub-meshes
  - GetRenderOperation doesn't consider sub-meshes
  - HLSL & Cg don't handle include files yet
  - HLSL & Cg don't handle include files yet
 
 

+ 4 - 0
Dependencies.txt

@@ -28,6 +28,10 @@ Place plug-in specific dependency files in:
 
 
  ----------------------------------------------------------------------------------
  ----------------------------------------------------------------------------------
 
 
+Other notes:
+ - If possible all dependencies should be compiled without unicode or multi-character support, in case you experience any issues when passing strings between
+	module boundaries.
+
 Listed dependencies have not been provided with the engine source code. 
 Listed dependencies have not been provided with the engine source code. 
 You will need to grab them manually from the specified links, 
 You will need to grab them manually from the specified links, 
 (compile them, depending if library comes pre-compiled or not), 
 (compile them, depending if library comes pre-compiled or not),