Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speckle Fork Diff #1

Draft
wants to merge 43 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c614dee
cpp cmake file now builds a shared library 'libweb-ifc.so'
r-wessel Nov 12, 2024
a2e09bd
Skip compiler flag when Windows detected
rwessel-cerulean Nov 13, 2024
d0665e1
add some c# gubbins
adamhathcock Nov 13, 2024
7353ce7
stuff works
adamhathcock Nov 13, 2024
9b2954a
add more stuff
adamhathcock Nov 13, 2024
e7d38a4
start adding some converters
adamhathcock Nov 13, 2024
79c20be
converter runs
adamhathcock Nov 13, 2024
7a08e24
Bump @webgpu/types from 0.1.49 to 0.1.51
dependabot[bot] Nov 14, 2024
7f7cdc5
Bump micromark-util-character from 2.1.0 to 2.1.1
dependabot[bot] Nov 14, 2024
14104a4
Bump micromark-util-symbol from 2.0.0 to 2.0.1
dependabot[bot] Nov 14, 2024
b9d1ce8
Bump @types/three from 0.169.0 to 0.170.0
dependabot[bot] Nov 14, 2024
34ada3d
Bump caniuse-lite from 1.0.30001677 to 1.0.30001680
dependabot[bot] Nov 14, 2024
3680b72
add version display
adamhathcock Nov 14, 2024
bde8272
parsing out lines
adamhathcock Nov 14, 2024
fb2b3d5
can parse props?
adamhathcock Nov 14, 2024
73fed56
Merge remote-tracking branch 'upstream/main' into speckle
adamhathcock Nov 14, 2024
79daf35
add file check
adamhathcock Nov 14, 2024
2130a44
rename solution
adamhathcock Nov 14, 2024
9595f86
build system start
adamhathcock Nov 15, 2024
715a535
add extra include for windows building
adamhathcock Nov 15, 2024
a8cbbe3
prep for windows and separate repo
adamhathcock Nov 15, 2024
7a4ec5d
linux build works
adamhathcock Nov 15, 2024
a595cad
windows works
adamhathcock Nov 15, 2024
f8700a6
nuget build works
adamhathcock Nov 15, 2024
fefe2c4
add github actions
adamhathcock Nov 15, 2024
c9f075d
modify build permissions
adamhathcock Nov 15, 2024
0a22362
build needs full path?
adamhathcock Nov 15, 2024
cbab433
use correct base path for GA
adamhathcock Nov 15, 2024
42addd6
correct output dir
adamhathcock Nov 15, 2024
fc34843
Merge pull request #1143 from ThatOpen/dependabot/npm_and_yarn/canius…
beachtom Nov 16, 2024
ddc34b7
Merge pull request #1142 from ThatOpen/dependabot/npm_and_yarn/types/…
beachtom Nov 16, 2024
f292416
Merge pull request #1141 from ThatOpen/dependabot/npm_and_yarn/microm…
beachtom Nov 16, 2024
e2a9396
Merge pull request #1140 from ThatOpen/dependabot/npm_and_yarn/microm…
beachtom Nov 16, 2024
72edd32
Merge pull request #1139 from ThatOpen/dependabot/npm_and_yarn/webgpu…
beachtom Nov 16, 2024
b714890
Fix Pathing
beachtom Nov 17, 2024
aa1346d
Update web-ifc-api.ts
beachtom Nov 17, 2024
3a6a7c0
Merge pull request #1145 from ThatOpen/Fix
beachtom Nov 17, 2024
5a2e081
Update publish.yml
beachtom Nov 17, 2024
d6934bb
Automated Version Number Setting
beachtom Nov 17, 2024
8b345d1
add missing export
adamhathcock Nov 19, 2024
05e8ea7
Merge remote-tracking branch 'upstream/main' into speckle
adamhathcock Nov 19, 2024
a650240
update csharpier and formatting
adamhathcock Nov 19, 2024
0ace8e5
bump number
adamhathcock Nov 19, 2024
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
84 changes: 0 additions & 84 deletions .github/workflows/build_test.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: .NET Build and Publish

on:
push:
branches: ["speckle"]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x.x

- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

- name: 🔫 Build and Pack
run: ./src/csharp/build.sh pack

- name: Push to nuget.org
run: dotnet nuget push src/csharp/output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.CONNECTORS_NUGET_TOKEN }} --skip-duplicate
26 changes: 0 additions & 26 deletions .github/workflows/publish.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@ examples/nodejs/*.ifc
tests/ifcfiles/private/*.ifc
tests/ifcfiles/private/*.stl
tests/ifcfiles/created.ifc

!src/csharp/build
!src/speckle/web-ifc.dll
!src/speckle/libweb-ifc.so
obj
bin
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@
"__node_handle": "cpp",
"__split_buffer": "cpp",
"__threading_support": "cpp",
"__verbose_abort": "cpp"
"__verbose_abort": "cpp",
"numbers": "cpp",
"semaphore": "cpp"
},
"cmake.configureOnOpen": true,
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
Expand Down
2 changes: 1 addition & 1 deletion examples/viewer/web-ifc-viewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as ts from "typescript";
import { exampleCode } from './example';

let ifcAPI = new IfcAPI();
ifcAPI.SetWasmPath("./",true)
ifcAPI.SetWasmPath("./")
let ifcThree = new IfcThree(ifcAPI);

let timeout = undefined;
Expand Down
36 changes: 18 additions & 18 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web-ifc",
"version": "0.0.64",
"version": "0.0.65",
"description": "ifc loading on the web",
"module": "./web-ifc-api.js",
"main": "./web-ifc-api-node.js",
Expand Down Expand Up @@ -62,7 +62,7 @@
],
"devDependencies": {
"@types/jest": "^27.5.2",
"@types/three": "^0.169.0",
"@types/three": "^0.170.0",
"adm-zip": "^0.5.10",
"cpy-cli": "^5.0.0",
"esbuild": "^0.24.0",
Expand Down
10 changes: 8 additions & 2 deletions src/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ enable_testing()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
IF (NOT WIN32)
add_compile_options(-Wno-narrowing)
ENDIF()

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# collect source files
Expand All @@ -29,7 +33,8 @@ file(GLOB WebIfcManager modelmanager/*.cpp)
file(GLOB WebIfcAPI web-ifc-wasm.cpp)
file(GLOB WebIfcUtility utility/*.cpp)
file(GLOB WebIfcTestSourceFiles test/*.cpp)
file(GLOB WebIfcTestingMain web-ifc-test.cpp)
file(GLOB WebIfcInterface Speckle.cpp)
#file(GLOB WebIfcTestingMain web-ifc-test.cpp)

# download the external projects and save their paths
Message("Downloading FastFloat")
Expand Down Expand Up @@ -141,7 +146,8 @@ if(NOT EMSCRIPTEN)
set_tests_properties(web-ifc-test PROPERTIES LABELS "web-ifc")

# build parameters for web-ifc in testing environment
add_executable(web-ifc ${WebIfcManager} ${WebIfcSchema} ${WebIfcParsing} ${WebIfcUtility} ${WebIfcGeometry} ${WebIfcTestingMain} "./test/io_helpers.cpp")
add_library(web-ifc SHARED ${WebIfcManager} ${WebIfcSchema} ${WebIfcParsing} ${WebIfcUtility} ${WebIfcGeometry} ${WebIfcInterface} "./test/io_helpers.cpp")
# add_executable(web-ifc ${WebIfcManager} ${WebIfcSchema} ${WebIfcParsing} ${WebIfcUtility} ${WebIfcGeometry} ${WebIfcTestingMain} "./test/io_helpers.cpp")
param_setter(web-ifc)
target_include_directories(web-ifc PUBLIC ${tinycpptest_SOURCE_DIR}/Sources)

Expand Down
Loading