Skip to content

Commit

Permalink
Release version 1.1.3
Browse files Browse the repository at this point in the history
Release version 1.1.3
  • Loading branch information
hrntsm committed Nov 21, 2020
2 parents c23bae2 + c453228 commit 8b807f9
Show file tree
Hide file tree
Showing 25 changed files with 474 additions and 82 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: ['https://hiron.fanbox.cc/']
59 changes: 59 additions & 0 deletions .github/workflows/dotnet-grasshopper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Build Grasshopper Plugin

on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]

jobs:
build:
strategy:
matrix:
configuration: [Debug, Release]

runs-on: windows-latest # For a list of available runner types, refer to

env:
Solution_Name: HoaryFox.sln
Plugin_File_Name: HoaryFox
Debug_File_Path: '.\HoaryFox\bin\'
Release_File_Path: '.\HoaryFox\release\'

steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1

- name: Setup NuGet
uses: NuGet/setup-nuget@v1

- name: Restore the application
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
env:
Configuration: ${{ matrix.configuration }}

- name: Build the application
run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
env:
Configuration: ${{ matrix.configuration }}

- name: Copy karambaConnect to /HoaryFox/bin dir
shell: powershell
run: cp ./karambaConnect/bin/karambaConnect.gha ./HoaryFox/bin/karambaConnect.gha

- name: Upload release build of plugin as artefact
if: ${{ matrix.configuration == 'Release' }} # Only upload gha from a release build
uses: actions/upload-artifact@v2
with:
name: HoaryFox
path: |
./HoaryFox/bin/HoaryFox.gha
./HoaryFox/bin/STBReader.dll
./HoaryFox/bin/karambaConnect.gha
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

10 changes: 8 additions & 2 deletions HoaryFox.sln
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.705
# Visual Studio Version 16
VisualStudioVersion = 16.0.30711.63
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoaryFox", "HoaryFox\HoaryFox.csproj", "{9637855D-D144-4448-9F56-A391A3575DAC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "karambaConnect", "karambaConnect\karambaConnect.csproj", "{CD5D3228-2B3E-4112-9B42-C82615673DFE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,6 +17,10 @@ Global
{9637855D-D144-4448-9F56-A391A3575DAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9637855D-D144-4448-9F56-A391A3575DAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9637855D-D144-4448-9F56-A391A3575DAC}.Release|Any CPU.Build.0 = Release|Any CPU
{CD5D3228-2B3E-4112-9B42-C82615673DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD5D3228-2B3E-4112-9B42-C82615673DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD5D3228-2B3E-4112-9B42-C82615673DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD5D3228-2B3E-4112-9B42-C82615673DFE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
69 changes: 17 additions & 52 deletions HoaryFox/HoaryFox.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HoaryFox</RootNamespace>
<AssemblyName>HoaryFox</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -38,7 +38,6 @@
<Compile Include="Component\Base\NameTagBase.cs" />
<Compile Include="Component\Base\SecTagBase.cs" />
<Compile Include="Component\IO\StbLoader.cs" />
<Compile Include="Component\IO\Stb2KElem.cs" />
<Compile Include="Component\Bar\Stb2Bar.cs" />
<Compile Include="Component\Geometry\Stb2Line.cs" />
<Compile Include="Component\Geometry\Stb2Brep.cs" />
Expand All @@ -52,8 +51,6 @@
<Compile Include="Component\Tag\Section\ColumnSecTag.cs" />
<Compile Include="Component\Tag\Section\GirderSecTag.cs" />
<Compile Include="Component\Tag\Section\PostSecTag.cs" />
<Compile Include="KarambaConnect\CrossSection.cs" />
<Compile Include="KarambaConnect\Element.cs" />
<Compile Include="Member\CreateBreps.cs" />
<Compile Include="Member\FrameLines.cs" />
<Compile Include="Member\CreateBar.cs" />
Expand All @@ -62,17 +59,6 @@
<Compile Include="Member\FramePoints.cs" />
<Compile Include="Member\ShapeInfo.cs" />
<Compile Include="Member\SteelCroSecBrep.cs" />
<Compile Include="STBReader\STBReader\Member\Base.cs" />
<Compile Include="STBReader\STBReader\Member\Enum.cs" />
<Compile Include="STBReader\STBReader\Member\Members.cs" />
<Compile Include="STBReader\STBReader\Model\Base.cs" />
<Compile Include="STBReader\STBReader\Model\Enum.cs" />
<Compile Include="STBReader\STBReader\Model\Models.cs" />
<Compile Include="STBReader\STBReader\Section\Base.cs" />
<Compile Include="STBReader\STBReader\Section\Enum.cs" />
<Compile Include="STBReader\STBReader\Section\Sections.cs" />
<Compile Include="STBReader\STBReader\StbBase.cs" />
<Compile Include="STBReader\STBReader\StbData.cs" />
<Compile Include="HoaryFoxInfo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resource.Designer.cs">
Expand All @@ -82,40 +68,17 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Eto, Version=2.5.0.0, Culture=neutral, PublicKeyToken=552281e97c755530, processorArchitecture=MSIL">
<HintPath>..\packages\RhinoCommon.6.29.20238.11501\lib\net45\Eto.dll</HintPath>
</Reference>
<Reference Include="GH_IO, Version=6.29.20238.11500, Culture=neutral, PublicKeyToken=6a29997d2e6b4f97, processorArchitecture=MSIL">
<HintPath>..\packages\Grasshopper.6.29.20238.11501\lib\net45\GH_IO.dll</HintPath>
</Reference>
<Reference Include="GH_Util">
<HintPath>C:\Program Files\Rhino 6\Plug-ins\Grasshopper\GH_Util.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Grasshopper, Version=6.29.20238.11500, Culture=neutral, PublicKeyToken=dda4f5ec2cd80803, processorArchitecture=MSIL">
<HintPath>..\packages\Grasshopper.6.29.20238.11501\lib\net45\Grasshopper.dll</HintPath>
</Reference>
<Reference Include="karambaCommon">
<HintPath>..\..\..\..\AppData\Roaming\Grasshopper\Libraries\Karamba\karambaCommon.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="karambaGH, Version=1.15.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\..\AppData\Roaming\Grasshopper\Libraries\Karamba\karamba.gha</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rhino.UI, Version=6.29.20238.11500, Culture=neutral, PublicKeyToken=552281e97c755530, processorArchitecture=MSIL">
<HintPath>..\packages\RhinoCommon.6.29.20238.11501\lib\net45\Rhino.UI.dll</HintPath>
</Reference>
<Reference Include="RhinoCommon, Version=6.29.20238.11500, Culture=neutral, PublicKeyToken=552281e97c755530, processorArchitecture=MSIL">
<HintPath>..\packages\RhinoCommon.6.29.20238.11501\lib\net45\RhinoCommon.dll</HintPath>
<Reference Include="STBReader, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Library\STBReader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\Brep.afdesign" />
<None Include="Resources\Brep.png" />
<None Include="Resources\ColumnName.png" />
Expand Down Expand Up @@ -144,10 +107,22 @@
<None Include="Resources\InfoIcon.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Library\STBReader.dll" />
<Content Include="Resources\InfoIcon_Info.txt" />
<None Include="Resources\LoadStb.png" />
<None Include="Resources\ToKaramba.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grasshopper">
<Version>6.20.19322.20361</Version>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="RhinoCommon">
<Version>6.20.19322.20361</Version>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand All @@ -168,15 +143,5 @@ Erase "$(TargetPath)"</PostBuildEvent>
<StartArguments>
</StartArguments>
<StartAction>Program</StartAction>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<Import Project="..\packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets" Condition="Exists('..\packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\RhinoCommon.6.29.20238.11501\build\net45\RhinoCommon.targets'))" />
<Error Condition="!Exists('..\packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets'))" />
</Target>
<Import Project="..\packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets" Condition="Exists('..\packages\Grasshopper.6.29.20238.11501\build\net45\Grasshopper.targets')" />
</Project>
Binary file added HoaryFox/Library/STBReader.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion HoaryFox/Properties/Resource.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion HoaryFox/STBReader
Submodule STBReader deleted from 872ca1
5 changes: 0 additions & 5 deletions HoaryFox/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
using Grasshopper.Kernel;
using HoaryFox.KarambaConnect;
using STBReader;
using STBReader.Model;
using STBReader.Member;
using Karamba.CrossSections;
using Karamba.Elements;
using Karamba.Geometry;
using Karamba.GHopper.CrossSections;
using Karamba.GHopper.Elements;
using Karamba.Utilities;
using STBReader.Member;
using STBReader.Model;

namespace HoaryFox.Component.IO
{
Expand Down Expand Up @@ -59,7 +59,7 @@ protected override void SolveInstance(IGH_DataAccess DA)
DA.SetDataList(1, k3CroSec);
}

protected override Bitmap Icon => Properties.Resource.ToKaramba;
protected override Bitmap Icon => karambaConnect.Properties.Resource.ToKaramba;
public override Guid ComponentGuid => new Guid("C57461DA-E79B-49A0-B44B-71CF32057709");
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ public static class Element
{
public static List<BuilderBeam> BuilderBeams(StbData stbData, List<string>[] k3Ids)
{
var logger = new MessageLogger();
var k3d = new KarambaCommon.Toolkit();
var elems = new List<BuilderBeam>();
StbNodes nodes = stbData.Nodes;

var k3Elems = new List<Line3>[2];
k3Elems[0] = new List<Line3>();
k3Elems[1] = new List<Line3>();
var k3Elems = new[]{ new List<Line3>() , new List<Line3>() };

foreach (StbFrame frame in new List<StbFrame>{ stbData.Columns, stbData.Girders, stbData.Braces} )
{
Expand All @@ -31,19 +28,11 @@ public static List<BuilderBeam> BuilderBeams(StbData stbData, List<string>[] k3I
{
int idNodeStart = nodes.Id.IndexOf(frame.IdNodeStart[i]);
int idNodeEnd = nodes.Id.IndexOf(frame.IdNodeEnd[i]);
var p0 = new Karamba.Geometry.Point3(
nodes.Position[idNodeStart].X / 1000d,
nodes.Position[idNodeStart].Y / 1000d,
nodes.Position[idNodeStart].Z / 1000d
);
var p1 = new Karamba.Geometry.Point3(
nodes.Position[idNodeEnd].X / 1000d,
nodes.Position[idNodeEnd].Y / 1000d,
nodes.Position[idNodeEnd].Z / 1000d
);
var p0 = new Karamba.Geometry.Point3(nodes.Position[idNodeStart].X / 1000d, nodes.Position[idNodeStart].Y / 1000d, nodes.Position[idNodeStart].Z / 1000d);
var p1 = new Karamba.Geometry.Point3(nodes.Position[idNodeEnd].X / 1000d, nodes.Position[idNodeEnd].Y / 1000d, nodes.Position[idNodeEnd].Z / 1000d);
k3Elems[elemIndex].Add(new Line3(p0, p1));
}
elems.AddRange(k3d.Part.LineToBeam(k3Elems[elemIndex], k3Ids[elemIndex], new List<CroSec>(), logger, out _, bending));
elems.AddRange(k3d.Part.LineToBeam(k3Elems[elemIndex], k3Ids[elemIndex], new List<CroSec>(), new MessageLogger(), out _, bending));
}

return elems;
Expand Down
Binary file added karambaConnect/Library/STBReader.dll
Binary file not shown.
Binary file not shown.
Binary file added karambaConnect/Library/karamba132/karambaGH.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added karambaConnect/Library/karamba133/karambaGH.dll
Binary file not shown.
36 changes: 36 additions & 0 deletions karambaConnect/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("HoaryFox(karambaConnect)")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("hrntsm")]
[assembly: AssemblyProduct("HoaryFox(karambaConnect)")]
[assembly: AssemblyCopyright("Copyright ©hrntsm 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("cd5d3228-2b3e-4112-9b42-c82615673dfe")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Loading

0 comments on commit 8b807f9

Please sign in to comment.