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

Editor IPC and detachable node graph window #131

Merged
merged 15 commits into from
Feb 13, 2024
Merged
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
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ name: CI
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
workflow_dispatch:
push:
branches: [master,NewFastSIMD]
pull_request:
branches: [master]
pull_request:
branches: [master,NewFastSIMD]
release:
types: [published]

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@
/enc_temp_folder
/cpm-cache
/CMakeUserPresets.json

external/
2 changes: 1 addition & 1 deletion include/FastNoise/Generators/Generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ namespace FastNoise

assert( !gen.get() || GetActiveFeatureSet() == gen->GetActiveFeatureSet() ); // Ensure that all SIMD levels match

SetSourceSIMDPtr( dynamic_cast<const Generator*>( gen.get() ), &memberVariable.simdGeneratorPtr );
SetSourceSIMDPtr( static_cast<const Generator*>( gen.get() ), &memberVariable.simdGeneratorPtr );
memberVariable.base = gen;
}

Expand Down
2 changes: 1 addition & 1 deletion tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ find_package(ImGui REQUIRED SourcesMiscCpp)
CPMAddPackage(
NAME imnodes
GITHUB_REPOSITORY Auburn/imnodes
GIT_TAG 32e2136a0f79ab96537088b8a757618a90bf8785
GIT_TAG 4ccaf656b09fd6b69bdac36f2532756760bd0aa3
GIT_SUBMODULES ".github"
EXCLUDE_FROM_ALL YES
OPTIONS
Expand Down
Loading
Loading