Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf


#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store
4 changes: 0 additions & 4 deletions VrpnNet/AnalogServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,4 @@ AnalogServer::AnalogChannelCollection ^AnalogServer::AnalogChannels::get()
{
CHECK_DISPOSAL_STATUS();
return m_channels;
}
cli::array<AnalogServerChannel ^> ^AnalogServer::Channels::get()
{
return m_channels;
}
8 changes: 4 additions & 4 deletions VrpnNet/AnalogServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ namespace Vrpn {
virtual System::Boolean get();
}

property cli::array<AnalogServerChannel ^> ^Channels
{
cli::array<AnalogServerChannel ^> ^get();
}
//property cli::array<AnalogServerChannel ^> ^Channels
//{
// cli::array<AnalogServerChannel ^> ^get();
//}

void Report();
void Report(ServiceClass classOfService, System::DateTime time);
Expand Down
24 changes: 12 additions & 12 deletions VrpnNet/VrpnNet.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>D:\Desktop\VRPN Imager\VRPN %28Binaries%29\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN Imager\VRPN %28Binaries%29\lib;$(LibraryPath)</LibraryPath>
<IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\quat;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\vrpn_server;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\vrpn;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib;$(LibraryPath)</LibraryPath>
<SourcePath>$(SourcePath)</SourcePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10\vrpn-install\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10\vrpn-install\lib;$(LibraryPath)</LibraryPath>
<IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN v7.32 Builds\x86\Release\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\lib;$(LibraryPath)</LibraryPath>
<IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\vrpn;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\vrpn_server;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\quat;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\lib;$(LibraryPath)</LibraryPath>
<IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
<LibraryPath>D:\Desktop\VRPN v7.32 Builds\x64\Release\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -120,7 +120,7 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
</ClCompile>
<Link>
<AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
<AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
Expand All @@ -146,7 +146,7 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
</ClCompile>
<Link>
<AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
<AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
Expand All @@ -170,7 +170,7 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
</ClCompile>
<Link>
<AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
<AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
Expand All @@ -194,7 +194,7 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
</ClCompile>
<Link>
<AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
<AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
Expand Down
8 changes: 4 additions & 4 deletions VrpnNet/VrpnUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ void VrpnUtils::CreateTimeval(System::DateTime time, struct timeval *tm)

void VrpnUtils::CreateQuat(Quaternion quat, double qArray[])
{
qArray[0] = quat.W;
qArray[1] = quat.X;
qArray[2] = quat.Y;
qArray[3] = quat.Z;
qArray[0] = quat.X;
qArray[1] = quat.Y;
qArray[2] = quat.Z;
qArray[3] = quat.W;
}

void VrpnUtils::CreatePoint(Point3D point, double vArray[])
Expand Down
Binary file modified Win32/Debug/VrpnNet.dll
Binary file not shown.
Binary file modified Win32/Release/VrpnNet.dll
Binary file not shown.
Binary file modified x64/Debug/VrpnNet.dll
Binary file not shown.
Binary file modified x64/Release/VrpnNet.dll
Binary file not shown.