Build 33 - cleanup and bugfix (Null ptr for joystick devices if not mapped)

Doc updated for 2.7

OGL/FormJSCalCurve.Designer.cs

@@ -1154,7 +1154,7 @@
       this.btCopyToAllAxis.Name = "btCopyToAllAxis";
       this.btCopyToAllAxis.Size = new System.Drawing.Size(57, 44);
       this.btCopyToAllAxis.TabIndex = 38;
-      this.btCopyToAllAxis.Text = "Copy to all aixs";
+      this.btCopyToAllAxis.Text = "Copy to all axis";
       this.btCopyToAllAxis.UseVisualStyleBackColor = true;
       this.btCopyToAllAxis.Click += new System.EventHandler(this.btCopyToAllAxis_Click);
       // 

OGL/FormJSCalCurve.cs

@@ -683,14 +683,15 @@ namespace SCJMapper_V2
 
         m_ticks = newTick; // prep next run
 
-        int i_x,i_y,i_z = 0; // Joystick Input
+        int i_x = 0, i_y = 0, i_z = 0; // Joystick Input
+        int x = 0; int y = 0; int z = 0; // retain real input as i_xyz
         // query the Josticks for the 3 controls
-        m_Yjs.GetCmdData( m_liveYawCommand, out i_x ); // + = right
-        m_Pjs.GetCmdData( m_livePitchCommand, out i_y ); // + = up
-        m_Rjs.GetCmdData( m_liveRollCommand, out i_z ); // += twist right
+        if ( m_Yjs != null ) m_Yjs.GetCmdData( m_liveYawCommand, out i_x ); // + = right
+        if ( m_Pjs != null ) m_Pjs.GetCmdData( m_livePitchCommand, out i_y ); // + = up
+        if ( m_Rjs != null ) m_Rjs.GetCmdData( m_liveRollCommand, out i_z ); // += twist right
 
         // apply the modifications of the control (deadzone, shape, sensitivity)
-        int x = i_x; int y = i_y; int z = i_z; // retain real input as i_xyz
+        x = i_x; y = i_y; z = i_z; // retain real input as i_xyz
         m_flightModel.Velocity = Vector3d.Zero;
 
         // Yaw

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "2.7.0.32" )]
-[assembly: AssemblyFileVersion( "2.7.0.32" )]
+[assembly: AssemblyVersion( "2.7.0.33" )]
+[assembly: AssemblyFileVersion( "2.7.0.33" )]

README.md

@@ -1,14 +1,32 @@
-SCJMapper-V2
-============
-
-SC Joystick Mapper  (.Net 4; using sharpDX wrapper)<br>
-this should work with Win8.x out of the box
-
-
-using sharpDX 2.6.2 .net wrapper  (http://sharpdx.org/)
-
+SCJMapper-V2<br>
+============<br>
+<br>
+SC Joystick Mapper  (.Net 4; using sharpDX/OpenTK wrapper)<br>
+this should work with Win8.x out of the box<br>
+<br>
+<br>
+using sharpDX 2.6.2 .net wrapper  (http://sharpdx.org/)<br>
+<br>
 Use References to:<br>
 DirectX11-net40\SharpDX.dll<br>
 DirectX11-net40\SharpDX.DirectInput.dll<br>
-
+<br>
+using OpenTK.1.1.1589.5942 .net wrapper  (http://www.opentk.com/)<br>
+NET40\OpenTK.dll<br>
+NET40\OpenTK.GLControl.dll<br>
+<br>
+NET20\Ionic.Zip.Reduced.dll<br>
+net40-full\log4net.dll<br>
+<br>
+<br>
+DDS Skydome Images:<br>
+<br>
+Canyon, Highway, Shiodome, BigSight:<br>
+<br>
+http://www.hdrlabs.com/sibl/archive.html<br>
+sIBL Archive - Free HDRI sets for smart Image-Based Lighting<br>
+<br>
+OutThere1  made with Spacescape:<br>
+http://alexcpeterson.com/spacescape<br>
+<br>
 

SCJMapper-V2.csproj

@@ -26,7 +26,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>32</ApplicationRevision>
+    <ApplicationRevision>33</ApplicationRevision>
     <ApplicationVersion>2.7.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -87,7 +87,8 @@
     <Reference Include="OpenTK">
       <HintPath>packages\OpenTK.1.1.1589.5942\lib\NET40\OpenTK.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK.GLControl">
+    <Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>packages\OpenTK.GLControl.1.1.1589.5942\lib\NET40\OpenTK.GLControl.dll</HintPath>
     </Reference>
     <Reference Include="SharpDX">

graphics/Readme.txt

@@ -1,3 +1,9 @@
+Canyon, Highway, Shiodome, BigSight:
+
 http://www.hdrlabs.com/sibl/archive.html
+sIBL Archive - Free HDRI sets for smart Image-Based Lighting
+
+
+OutThere1  made with Spacescape:
+http://alexcpeterson.com/spacescape
 
-sIBL Archive - Free HDRI sets for smart Image-Based Lighting