|
| From: | jsalmon3 |
| Subject: | [Pingus-CVS] r3064 - in trunk/pingus: . src/input |
| Date: | Sun, 2 Sep 2007 08:00:41 +0200 |
Author: jsalmon3
Date: 2007-09-02 08:00:36 +0200 (Sun, 02 Sep 2007)
New Revision: 3064
Modified:
trunk/pingus/pingus.vcproj
trunk/pingus/src/input/manager.cpp
trunk/pingus/src/input/sdl_driver.cpp
Log:
Use new input code, fixed compile errors/warnings
Modified: trunk/pingus/pingus.vcproj
===================================================================
--- trunk/pingus/pingus.vcproj 2007-09-02 04:38:25 UTC (rev 3063)
+++ trunk/pingus/pingus.vcproj 2007-09-02 06:00:36 UTC (rev 3064)
@@ -1410,35 +1410,35 @@
Name="input"
>
<File
- RelativePath=".\src\input\axis.hpp"
+ RelativePath=".\src\input\control.hpp"
>
</File>
<File
-
RelativePath=".\src\input\axis_factory.cpp"
+
RelativePath=".\src\input\controller.cpp"
>
</File>
<File
-
RelativePath=".\src\input\axis_factory.hpp"
+
RelativePath=".\src\input\controller.hpp"
>
</File>
<File
- RelativePath=".\src\input\button.hpp"
+
RelativePath=".\src\input\controller_description.cpp"
>
</File>
<File
-
RelativePath=".\src\input\button_factory.cpp"
+
RelativePath=".\src\input\controller_description.hpp"
>
</File>
<File
-
RelativePath=".\src\input\button_factory.hpp"
+
RelativePath=".\src\input\core_driver.cpp"
>
</File>
<File
-
RelativePath=".\src\input\controller.cpp"
+
RelativePath=".\src\input\core_driver.hpp"
>
</File>
<File
-
RelativePath=".\src\input\controller.hpp"
+ RelativePath=".\src\input\driver.hpp"
>
</File>
<File
@@ -1446,221 +1446,51 @@
>
</File>
<File
- RelativePath=".\src\input\event_fwd.hpp"
+ RelativePath=".\src\input\manager.cpp"
>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
</File>
<File
- RelativePath=".\src\input\pointer.hpp"
+ RelativePath=".\src\input\manager.hpp"
>
</File>
<File
-
RelativePath=".\src\input\pointer_factory.cpp"
+
RelativePath=".\src\input\sdl_driver.cpp"
>
</File>
<File
-
RelativePath=".\src\input\pointer_factory.hpp"
+
RelativePath=".\src\input\sdl_driver.hpp"
>
</File>
<File
- RelativePath=".\src\input\scroller.hpp"
+
RelativePath=".\src\input\usbmouse_driver.hpp"
>
</File>
<File
-
RelativePath=".\src\input\scroller_factory.cpp"
+ RelativePath=".\src\input\wiimote.hpp"
>
</File>
<File
-
RelativePath=".\src\input\scroller_factory.hpp"
+
RelativePath=".\src\input\wiimote_driver.hpp"
>
</File>
- <Filter
- Name="axes"
- >
- <File
-
RelativePath=".\src\input\axes\button_axis.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\button_axis.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\dummy_axis.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\inverted_axis.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\inverted_axis.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\joystick_axis.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\joystick_axis.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\mouse_axis.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\mouse_axis.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\multiple_axis.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\axes\multiple_axis.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="buttons"
- >
- <File
-
RelativePath=".\src\input\buttons\double_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\double_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\dummy_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\joystick_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\joystick_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\key_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\key_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\mouse_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\mouse_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\multiple_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\multiple_button.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\triple_button.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\buttons\triple_button.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="scrollers"
- >
- <File
-
RelativePath=".\src\input\scrollers\axis_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\axis_scroller.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\dummy_scroller.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\inverted_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\inverted_scroller.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\joystick_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\joystick_scroller.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\mouse_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\multiple_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\multiple_scroller.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\pointer_scroller.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\scrollers\pointer_scroller.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="pointers"
- >
- <File
-
RelativePath=".\src\input\pointers\axis_pointer.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\axis_pointer.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\dummy_pointer.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\mouse_pointer.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\mouse_pointer.hpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\multiple_pointer.cpp"
- >
- </File>
- <File
-
RelativePath=".\src\input\pointers\multiple_pointer.hpp"
- >
- </File>
- </Filter>
</Filter>
<Filter
Name="lisp"
Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp 2007-09-02 04:38:25 UTC (rev 3063)
+++ trunk/pingus/src/input/manager.cpp 2007-09-02 06:00:36 UTC (rev 3064)
@@ -212,8 +212,10 @@
driver = new SDLDriver();
} else if (name == "core") {
driver = new CoreDriver(this);
+#ifndef WIN32
} else if (name == "usbmouse") {
driver = new USBMouseDriver();
+#endif
#ifdef HAVE_CWIID
} else if (name == "wiimote") {
driver = new WiimoteDriver();
Modified: trunk/pingus/src/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.cpp 2007-09-02 04:38:25 UTC (rev
3063)
+++ trunk/pingus/src/input/sdl_driver.cpp 2007-09-02 06:00:36 UTC (rev
3064)
@@ -257,7 +257,7 @@
{
if (event.jaxis.which == i->device &&
event.jaxis.axis == i->axis)
- i->binding->set_state(event.jaxis.value / 32767.0);
+ i->binding->set_state(event.jaxis.value / 32767.0f);
}
break;
| [Prev in Thread] | Current Thread | [Next in Thread] |