# HG changeset patch
# User bastiena
# Date 1333703306 -7200
# Node ID 7372c4f249c7476c31711e7987c429d4b815448e
# Parent dc552dbfe4dc6af75305625b942285f0e0e94b3f
Front IDILL :
Updated sln 2008 express project to sln 2010 ultimate
diff -r dc552dbfe4dc -r 7372c4f249c7 .hgignore
--- a/.hgignore Fri Apr 06 10:46:51 2012 +0200
+++ b/.hgignore Fri Apr 06 11:08:26 2012 +0200
@@ -40,12 +40,11 @@
middleware/src/bin/Release/MainModule.vshost.exe.manifest
middleware/src/bin/Release/MainModule.vshost.exe
middleware/src/bin/Release/MainModule.exe
-front_idill/extern/fajran-npTuioClient/*/*.swp
-front_idill/extern/fajran-npTuioClient/nptuio.so
+front_idill/extern/fajran-npTuioClient/npTuioClient.sln.old
+front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj.user
+front_idill/extern/fajran-npTuioClient/UpgradeLog.XML
syntax: regexp
middleware/extern/.*/(bin|obj)
middleware/src/bin/Debug/*
middleware/src/bin/Release/*.dll
-front_idill/extern/fajran-npTuioClient/*/*.o
-front_idill/extern/fajran-npTuioClient/*/Debug
-front_idill/extern/fajran-npTuioClient/*/Release
+front_idill/extern/fajran-npTuioClient/_UpgradeReport_Files/*
diff -r dc552dbfe4dc -r 7372c4f249c7 front_idill/extern/fajran-npTuioClient/npTuioClient.opensdf
Binary file front_idill/extern/fajran-npTuioClient/npTuioClient.opensdf has changed
diff -r dc552dbfe4dc -r 7372c4f249c7 front_idill/extern/fajran-npTuioClient/npTuioClient.sdf
Binary file front_idill/extern/fajran-npTuioClient/npTuioClient.sdf has changed
diff -r dc552dbfe4dc -r 7372c4f249c7 front_idill/extern/fajran-npTuioClient/npTuioClient.sln
--- a/front_idill/extern/fajran-npTuioClient/npTuioClient.sln Fri Apr 06 10:46:51 2012 +0200
+++ b/front_idill/extern/fajran-npTuioClient/npTuioClient.sln Fri Apr 06 11:08:26 2012 +0200
@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npTuioClient", "npTuioClient.vcproj", "{E2668B4E-318C-4021-ADC8-A85D70234E63}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E2668B4E-318C-4021-ADC8-A85D70234E63}.Debug|Win32.ActiveCfg = Debug|Win32
- {E2668B4E-318C-4021-ADC8-A85D70234E63}.Debug|Win32.Build.0 = Debug|Win32
- {E2668B4E-318C-4021-ADC8-A85D70234E63}.Release|Win32.ActiveCfg = Release|Win32
- {E2668B4E-318C-4021-ADC8-A85D70234E63}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npTuioClient", "npTuioClient.vcxproj", "{E2668B4E-318C-4021-ADC8-A85D70234E63}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E2668B4E-318C-4021-ADC8-A85D70234E63}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E2668B4E-318C-4021-ADC8-A85D70234E63}.Debug|Win32.Build.0 = Debug|Win32
+ {E2668B4E-318C-4021-ADC8-A85D70234E63}.Release|Win32.ActiveCfg = Release|Win32
+ {E2668B4E-318C-4021-ADC8-A85D70234E63}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff -r dc552dbfe4dc -r 7372c4f249c7 front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj Fri Apr 06 11:08:26 2012 +0200
@@ -0,0 +1,147 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {E2668B4E-318C-4021-ADC8-A85D70234E63}
+ npTuioClient
+ Win32Proj
+
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+ DynamicLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+ true
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+ false
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ npapi;TuioClient;TuioClient\oscpack;%(AdditionalIncludeDirectories)
+ WIN32;_WINDOWS;XP_WIN32;MOZILLA_STRICT_API;XPCOM_GLUE;XP_WIN;_X86_;OSC_HOST_LITTLE_ENDIAN;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ ws2_32.lib;winmm.lib;%(AdditionalDependencies)
+ npTuioClient.def
+ true
+ Windows
+ MachineX86
+
+
+
+
+ MaxSpeed
+ true
+ npapi;TuioClient;TuioClient\oscpack;%(AdditionalIncludeDirectories)
+ WIN32;_WINDOWS;XP_WIN32;MOZILLA_STRICT_API;XPCOM_GLUE;XP_WIN;_X86_;OSC_HOST_LITTLE_ENDIAN;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+
+
+ ws2_32.lib;winmm.lib;%(AdditionalDependencies)
+ npTuioClient.def
+ true
+ Windows
+ true
+ true
+ MachineX86
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r dc552dbfe4dc -r 7372c4f249c7 front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj.filters Fri Apr 06 11:08:26 2012 +0200
@@ -0,0 +1,157 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+ {8f3f3524-d6ea-49ee-8987-e5cdd6811b2e}
+
+
+ {671f0f49-ca32-46b6-b6bf-d06ae95889fa}
+
+
+ {4dacaf2c-6883-439c-a93c-16a56737952e}
+
+
+ {19970ac0-1c1e-46ad-a7c3-64d94501de32}
+
+
+ {2990b422-02cd-4167-b7b2-62f1ed2e963e}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ TuioClient
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\ip
+
+
+ TuioClient\oscpack\ip\win32
+
+
+ TuioClient\oscpack\ip\win32
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ TuioClient
+
+
+ TuioClient
+
+
+ TuioClient
+
+
+ TuioClient
+
+
+ TuioClient
+
+
+ TuioClient
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\osc
+
+
+ TuioClient\oscpack\ip
+
+
+ TuioClient\oscpack\ip
+
+
+ TuioClient\oscpack\ip
+
+
+ TuioClient\oscpack\ip
+
+
+ TuioClient\oscpack\ip
+
+
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
\ No newline at end of file
diff -r dc552dbfe4dc -r 7372c4f249c7 middleware/Tracking/Postures/CrossDetector.cs
--- a/middleware/Tracking/Postures/CrossDetector.cs Fri Apr 06 10:46:51 2012 +0200
+++ b/middleware/Tracking/Postures/CrossDetector.cs Fri Apr 06 11:08:26 2012 +0200
@@ -45,7 +45,7 @@
//La distance de référence est ici la distance entre le milieu du dos et le milieu des épaules.
refDistance = Math.Abs(localState[(int)JointType.Spine].Position.Y - localState[(int)JointType.ShoulderCenter].Position.Y);
- if (localState[(int)JointType.HandLeft].Position.Y < localState[(int)JointType.ElbowLeft].Position.Y - refDistance / 2)
+ /*if (localState[(int)JointType.HandLeft].Position.Y < localState[(int)JointType.ElbowLeft].Position.Y - refDistance / 2)
debug.onR0(true);
else
debug.onR0(false);
@@ -60,7 +60,7 @@
if (localState[(int)JointType.HandLeft].Position.X + refDistance / 2 > localState[(int)JointType.HandRight].Position.X)
debug.onR3(true);
else
- debug.onR3(false);
+ debug.onR3(false);*/
//Si la position Y de la main gauche n'est pas plus haute de la distance de référence que le coude gauche
//OU si la position Y de la main droite n'est pas plus haute de la distance de référence que le coude droit
//OU si la position X du coude gauche n'est pas plus à gauche de la distance de référence/2 que le coude droit
diff -r dc552dbfe4dc -r 7372c4f249c7 middleware/src/MainModule/Events/UserPositionListener.cs
--- a/middleware/src/MainModule/Events/UserPositionListener.cs Fri Apr 06 10:46:51 2012 +0200
+++ b/middleware/src/MainModule/Events/UserPositionListener.cs Fri Apr 06 11:08:26 2012 +0200
@@ -34,7 +34,7 @@
*/
public void showAndSend(object o, UserPositionEventArgs e)
{
- //e.debug.showDistance(e.distance);
+ e.debug.showDistance(e.distance);
e.server.GesturePerformed("MOSSHOW-" + e.imagesToShow);
}
}