Skip to content

Commit

Permalink
Fixing serialization of scientific notation on vectors by using float…
Browse files Browse the repository at this point in the history
… instead of decimal. Fixed build script to not include folders. Updated version. Removed unnecessary usings.
  • Loading branch information
RobJames-Texas committed Jun 17, 2018
1 parent 64a2b27 commit 1f369de
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
12 changes: 6 additions & 6 deletions OgreSkeletonUtil/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ $zip = '.zip'

# \bin\release\netcoreapp2.0\win10-x64
$win10x64Path = ($ReleasePath.ToString() + '\' + $win10x64)
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x64 + $rc + $zip) $win10x64Path -xr!publish
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x64 + $rc + $zip) ($win10x64Path + '\*') -xr!publish
# \bin\release\netcoreapp2.0\win10-x64\publish
$win10x64PathFull = ($win10x64Path + '\publish')
$win10x64PathFull = ($win10x64Path + '\publish\*')
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x64 + $full + $zip) $win10x64PathFull
# \bin\release\netcoreapp2.0\win10-x86
$win10x86Path = ($ReleasePath.ToString() + '\' + $win10x86)
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x86 + $rc + $zip) $win10x86Path -xr!publish
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x86 + $rc + $zip) ($win10x86Path + '\*') -xr!publish
# \bin\release\netcoreapp2.0\win10-x86\publish
$win10x86PathFull = ($win10x86Path + '\publish')
$win10x86PathFull = ($win10x86Path + '\publish\*')
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $win10x86 + $full + $zip) $win10x86PathFull
# \bin\release\netcoreapp2.0\osx.10.10-x64
$osx10x64Path = ($ReleasePath.ToString() + '\' + $osx)
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $osx + $rc + $zip) $osx10x64Path -xr!publish
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $osx + $rc + $zip) ($osx10x64Path + '\*') -xr!publish
# \bin\release\netcoreapp2.0\osx.10.10-x64\publish
$osx10x64PathFull = ($osx10x64Path + '\publish')
$osx10x64PathFull = ($osx10x64Path + '\publish\*')
&'E:\Program Files\7-Zip\7z.exe' a -tzip ($Destination + '\' + $NameAndVersion + '_' + $osx + $full + $zip) $osx10x64PathFull
2 changes: 0 additions & 2 deletions OgreSkeletonUtil/Components/Writer.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using OgreSkeletonUtil.Interfaces;
using OgreSkeletonUtil.Model;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Serialization;

namespace OgreSkeletonUtil.Components
Expand Down
6 changes: 3 additions & 3 deletions OgreSkeletonUtil/Model/Vector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ namespace OgreSkeletonUtil.Model
public class Vector
{
[XmlAttribute("x")]
public decimal X { get; set; }
public float X { get; set; }

[XmlAttribute("y")]
public decimal Y { get; set; }
public float Y { get; set; }

[XmlAttribute("z")]
public decimal Z { get; set; }
public float Z { get; set; }
}
}
4 changes: 3 additions & 1 deletion OgreSkeletonUtil/OgreSkeletonUtil.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<RepositoryUrl>https://github.com/RobJames-Texas/OgreSkeletonUtil</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<Description>Splits the xml from an Ogre3d skeleton with multiple animations in it into individual skeleton files. One for each animation.</Description>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
<PackageReleaseNotes>Scientific notion can now be parsed for vector.
Updated build script.</PackageReleaseNotes>
</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion OgreSkeletonUtil/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using OgreSkeletonUtil.Components;
using OgreSkeletonUtil.Model;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

Expand Down

0 comments on commit 1f369de

Please sign in to comment.