Skip to content

Commit

Permalink
add speckle-sharp submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
cdriesler committed Oct 3, 2022
1 parent 0edf344 commit 9c14c68
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 34 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "apps/speckle-server"]
path = apps/speckle-server
url = https://github.com/specklesystems/speckle-server.git
[submodule "packages/speckle-sharp"]
path = packages/speckle-sharp
url = [email protected]:specklesystems/speckle-sharp.git
95 changes: 64 additions & 31 deletions apps/rhino-compute-server/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Topshelf;
using Microsoft.Owin.Hosting;
using Owin;
Expand Down Expand Up @@ -74,19 +75,8 @@ public void Configuration(IAppBuilder app)

public class Bootstrapper : Nancy.DefaultNancyBootstrapper
{
protected override async void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
private async Task<string> TryThis()
{
// Load Grasshopper
var pluginObject = Rhino.RhinoApp.GetPlugInObject("Grasshopper");
var runheadless = pluginObject?.GetType().GetMethod("RunHeadless");
if (runheadless != null)
{
runheadless.Invoke(pluginObject, null);
}

Class1.Test();

// var account = new Speckle.Core.Credentials.Account();
var account = new Account()
{
token = "8ac998dd805648be63a69a8e0480d07a1e06c6465e",
Expand All @@ -101,36 +91,79 @@ protected override async void ApplicationStartup(TinyIoCContainer container, IPi
}
};

// var streamUrl = "http://localhost:3000/streams/b0d3a3c122";
var streamId = "b0d3a3c122";

var client = new Client(account);

var transport = new ServerTransport(account, streamId);

// var ok = await Helpers.Receive("http://localhost:3000/streams/b0d3a3c122/branches/main");
// Console.WriteLine(Operations.Serialize(ok));

var data = new Base();
data["test"] = "Some Value 2";

var objectId = await Operations.Send(
data,
new List<ITransport> { transport },
useDefaultCache: true,
disposeTransports: true
);
var commitId = await Helpers.Send("http://localhost:3000/streams/b0d3a3c122/branches/main", data, "Test message");

// var objectId = await Operations.Send(
// data,
// new List<ITransport> { transport },
// useDefaultCache: false,
// disposeTransports: false,
// onErrorAction: new Action<string, Exception>((a, b) =>
// {
// Console.WriteLine("Error:");
// Console.WriteLine(a);
// Console.WriteLine(b.Message);
// }),
// onProgressAction: new Action<System.Collections.Concurrent.ConcurrentDictionary<string, int>>((a) =>
// {
// Console.WriteLine("Progress:");

// foreach (var key in a.Keys)
// {
// a.TryGetValue(key, out var val);

// Console.WriteLine(key);
// Console.WriteLine(val);
// }
// })
// );

// Console.WriteLine($"Successful object creation {objectId}");

// var commitId = await client.CommitCreate(
// new CommitCreateInput()
// {
// streamId = streamId,
// branchName = "main",
// objectId = objectId,
// message = "howdy!",
// sourceApplication = ".net",
// totalChildrenCount = 0
// }
// );

return commitId;
}
protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
{
// Load Grasshopper
var pluginObject = Rhino.RhinoApp.GetPlugInObject("Grasshopper");
var runheadless = pluginObject?.GetType().GetMethod("RunHeadless");
if (runheadless != null)
{
runheadless.Invoke(pluginObject, null);
}

Class1.Test();

Console.WriteLine($"Successful object creation {objectId}");
// var account = new Speckle.Core.Credentials.Account();

var commitId = await client.CommitCreate(
new CommitCreateInput()
{
streamId = streamId,
branchName = "main",
objectId = objectId,
message = "howdy!",
sourceApplication = "NodePen",
totalChildrenCount = 1
}
);

// var streamUrl = "http://localhost:3000/streams/b0d3a3c122";

var commitId = TryThis().Result;

// var commitId = client.CommitCreate(new CommitCreateInput()
// {
Expand Down
4 changes: 2 additions & 2 deletions apps/rhino-compute-server/Rhino.Compute.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
<PackageReference Include="Nancy" Version="1.4.4" />
<PackageReference Include="Nancy.Owin" Version="1.4.1" />
<PackageReference Include="Rhino.Inside" Version="7.0.0" />
<PackageReference Include="Speckle.Core" Version="2.8.0" />
<PackageReference Include="Speckle.Objects" Version="2.8.0" />
<!-- <PackageReference Include="Speckle.Objects.Converter.Rhino7" Version="2.8.0" /> -->
<PackageReference Include="Topshelf" Version="4.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\packages\converters\Nodepen.Converters.csproj" />
<ProjectReference Include="..\..\packages\speckle-sharp\Core\Core\Core.csproj" />
<ProjectReference Include="..\..\packages\speckle-sharp\Objects\Objects\Objects.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/speckle-server
Submodule speckle-server updated 23 files
+1 −1 packages/frontend/src/main/components/common/NoDataPlaceholder.vue
+38 −30 packages/frontend/src/main/components/common/SourceAppAvatar.vue
+12 −12 packages/frontend/src/main/pages/stream/CommitObjectViewer.vue
+10 −16 packages/frontend/src/main/toolbars/MultipleResourcesToolbar.vue
+131 −4 packages/viewer-sandbox/src/Sandbox.ts
+12 −2 packages/viewer-sandbox/src/main.ts
+49 −4 packages/viewer/src/modules/SpeckleRenderer.ts
+4 −6 packages/viewer/src/modules/Viewer.ts
+6 −0 packages/viewer/src/modules/batching/Batch.ts
+116 −116 packages/viewer/src/modules/batching/Batcher.ts
+31 −1 packages/viewer/src/modules/batching/LineBatch.ts
+39 −2 packages/viewer/src/modules/batching/MeshBatch.ts
+12 −1 packages/viewer/src/modules/batching/PointBatch.ts
+1 −4 packages/viewer/src/modules/context/CameraHanlder.js
+4 −0 packages/viewer/src/modules/materials/SpeckleDepthMaterial.ts
+95 −0 packages/viewer/src/modules/materials/SpeckleNormalMaterial.ts
+24 −0 packages/viewer/src/modules/materials/shaders/speckle-normal-frag.ts
+68 −0 packages/viewer/src/modules/materials/shaders/speckle-normal-vert.ts
+216 −0 packages/viewer/src/modules/materials/shaders/speckle-sao-frag.ts
+6 −0 packages/viewer/src/modules/materials/shaders/speckle-sao-vert.ts
+48 −0 packages/viewer/src/modules/pipeline/ApplySAOPass.ts
+97 −0 packages/viewer/src/modules/pipeline/Pipeline.ts
+306 −0 packages/viewer/src/modules/pipeline/SpeckleSAOPass.ts
1 change: 1 addition & 0 deletions packages/speckle-sharp
Submodule speckle-sharp added at b5ebe1

0 comments on commit 9c14c68

Please sign in to comment.