diff --git a/.editorconfig b/.editorconfig index a52f493..aeff653 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,9 @@ indent_style = space # C# files [*.cs] +# Nullable reference types +csharp_nullable_reference_types = enable + # Naming conventions dotnet_naming_rule.async_methods_end_in_async.severity = suggestion dotnet_naming_rule.async_methods_end_in_async.symbols = async_methods @@ -24,16 +27,6 @@ dotnet_naming_symbols.async_methods.required_modifiers = async dotnet_naming_style.end_in_async.required_suffix = Async dotnet_naming_style.end_in_async.capitalization = pascal_case -# Constants are UPPERCASE -dotnet_naming_rule.constants_should_be_upper_case.severity = suggestion -dotnet_naming_rule.constants_should_be_upper_case.symbols = constants -dotnet_naming_rule.constants_should_be_upper_case.style = constant_style - -dotnet_naming_symbols.constants.applicable_kinds = field, local -dotnet_naming_symbols.constants.required_modifiers = const - -dotnet_naming_style.constant_style.capitalization = all_upper - # Formatting csharp_new_line_before_open_brace = all csharp_indent_case_contents = true diff --git a/.gitignore b/.gitignore index e1bad4a..9239ba5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,530 @@ -# .NET build outputs +# Created by https://www.toptal.com/developers/gitignore/api/godot,rider,dotnetcore,visualstudio,visualstudiocode,obsidian +# Edit at https://www.toptal.com/developers/gitignore?templates=godot,rider,dotnetcore,visualstudio,visualstudiocode,obsidian + +### DotnetCore ### +# .NET Core build folders bin/ obj/ -*.dll -*.exe -*.pdb -# User-specific files -*.user -*.suo -*.userprefs -.vs/ -.vscode/ -.idea/ +# Common node modules locations +/node_modules +/wwwroot/node_modules + +### Godot ### +# Godot 4+ specific ignores +.godot/ # Godot-specific ignores -**/.godot/ -**/.import/ -**/export_presets.cfg +.import/ +export.cfg +export_presets.cfg -# OS-specific -.DS_Store -Thumbs.db +# Imported translations (automatically generated from CSV files) +*.translation -# NuGet packages +# Mono-specific ignores +.mono/ +data_*/ +mono_crash.*.json + +### Obsidian ### +# config dir +.obsidian/ + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### VisualStudio ### +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microslop Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages *.nupkg -packages/ +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microslop Azure Build Output +csx/ +*.build.csdef + +# Microslop Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microslop Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +*.code-workspace + +# Local History for Visual Studio Code + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +### VisualStudio Patch ### +# Additional files built by Visual Studio + +# End of https://www.toptal.com/developers/gitignore/api/godot,rider,dotnetcore,visualstudio,visualstudiocode,obsidian + +**/*.toml +*.pck diff --git a/CyberBits.Common/Class1.cs b/CyberBits.Common/Class1.cs new file mode 100644 index 0000000..b58ee50 --- /dev/null +++ b/CyberBits.Common/Class1.cs @@ -0,0 +1,6 @@ +namespace CyberBits.Common; + +public class Class1 +{ + +} diff --git a/CyberBits.Common/CyberBits.Common.csproj b/CyberBits.Common/CyberBits.Common.csproj new file mode 100644 index 0000000..6ff2815 --- /dev/null +++ b/CyberBits.Common/CyberBits.Common.csproj @@ -0,0 +1,16 @@ + + + + net10.0 + enable + enable + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/CyberBits.Godot/CyberBits.Godot.csproj b/CyberBits.Godot/CyberBits.Godot.csproj new file mode 100644 index 0000000..70a73a3 --- /dev/null +++ b/CyberBits.Godot/CyberBits.Godot.csproj @@ -0,0 +1,6 @@ + + + net8.0 + true + + diff --git a/CyberBits.Godot/main.tscn b/CyberBits.Godot/main.tscn new file mode 100644 index 0000000..36e156c --- /dev/null +++ b/CyberBits.Godot/main.tscn @@ -0,0 +1,22 @@ +[gd_scene format=3] + +[node name="Main" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="CenterContainer" type="CenterContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Label" type="Label" parent="CenterContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +text = "Hello from 2dog!" diff --git a/CyberBits.Godot/project.godot b/CyberBits.Godot/project.godot new file mode 100644 index 0000000..8a4bcb0 --- /dev/null +++ b/CyberBits.Godot/project.godot @@ -0,0 +1,26 @@ +; Engine configuration file. +; It's best edited using the editor UI and not directly, +; since the parameters that go here are not all obvious. +; +; Format: +; [section] ; section goes between [] +; param=value ; assign values to parameters + +config_version=5 + +custom_features="dotnet" + +[application] + +config/name="CyberBits" +run/main_scene="res://main.tscn" +config/features=PackedStringArray("4.6", "C#") + +[dotnet] + +project/assembly_name="CyberBits.Godot" + +[display] + +window/size/viewport_width=1280 +window/size/viewport_height=720 diff --git a/CyberBits.Tests/BasicTests.cs b/CyberBits.Tests/BasicTests.cs new file mode 100644 index 0000000..5cf2862 --- /dev/null +++ b/CyberBits.Tests/BasicTests.cs @@ -0,0 +1,52 @@ +using Godot; +using twodog.xunit; + +namespace CyberBits.Tests; + +[Collection("GodotHeadless")] +public class BasicTests(GodotHeadlessFixture godot) +{ + [Fact] + public void LoadMainScene_Succeeds() + { + // Arrange + var scene = GD.Load("res://main.tscn"); + + // Act + var instance = scene.Instantiate(); + godot.Tree.Root.AddChild(instance); + + // Assert + Assert.NotNull(instance); + Assert.NotNull(instance.GetParent()); + } + + [Fact] + public void PhysicsIteration_Succeeds() + { + // Arrange & Act + godot.Tree.Root.PhysicsInterpolationMode = Node.PhysicsInterpolationModeEnum.Off; + godot.GodotInstance.Iteration(); + + // Assert - if we get here without crashing, test passes + Assert.True(true); + } + + [Fact] + public void CreateNode_AddsToTree() + { + // Arrange + var node = new Node(); + node.Name = "TestNode"; + + // Act + godot.Tree.Root.AddChild(node); + + // Assert + Assert.True(godot.Tree.Root.HasNode("TestNode")); + Assert.Equal("TestNode", (string)godot.Tree.Root.GetNode("TestNode").Name); + + // Cleanup + node.QueueFree(); + } +} diff --git a/CyberBits.Tests/CyberBits.Tests.csproj b/CyberBits.Tests/CyberBits.Tests.csproj new file mode 100644 index 0000000..4cc74d8 --- /dev/null +++ b/CyberBits.Tests/CyberBits.Tests.csproj @@ -0,0 +1,59 @@ + + + net8.0 + enable + enable + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ../CyberBits.Godot + + + + + + + + + diff --git a/CyberBits.Tests/GodotHeadlessCollection.cs b/CyberBits.Tests/GodotHeadlessCollection.cs new file mode 100644 index 0000000..b6ea7a6 --- /dev/null +++ b/CyberBits.Tests/GodotHeadlessCollection.cs @@ -0,0 +1,7 @@ +using twodog.xunit; +using Xunit; + +namespace CyberBits.Tests; + +[CollectionDefinition("GodotHeadless", DisableParallelization = true)] +public class GodotHeadlessCollection : ICollectionFixture; diff --git a/CyberBits.Tests/xunit.runner.json b/CyberBits.Tests/xunit.runner.json new file mode 100644 index 0000000..08c512b --- /dev/null +++ b/CyberBits.Tests/xunit.runner.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", + "parallelizeTestCollections": false +} diff --git a/CyberBits.slnx b/CyberBits.slnx index 0dc5250..a8fb23e 100644 --- a/CyberBits.slnx +++ b/CyberBits.slnx @@ -1,9 +1,6 @@ - - - - - - - + + + + diff --git a/CyberBits/CyberBits.csproj b/CyberBits/CyberBits.csproj index 306930d..806246e 100644 --- a/CyberBits/CyberBits.csproj +++ b/CyberBits/CyberBits.csproj @@ -1,19 +1,30 @@ - + + + net8.0 + Exe + enable + enable + false + - - Exe - net8.0 - enable - false - LatestMajor - + + + - - - + + + - - ./project - + + + ../CyberBits.Godot + + + + + + + diff --git a/CyberBits/Program.cs b/CyberBits/Program.cs index f4addae..d1f002d 100644 --- a/CyberBits/Program.cs +++ b/CyberBits/Program.cs @@ -1,45 +1,24 @@ -using Cyberbits; +using Godot; +using Engine = twodog.Engine; -using var engine = new Engine("Cyberbits", Engine.ResolveProjectDir()); +// Create and start the Godot engine with your project +using var engine = new Engine("CyberBits", Engine.ResolveProjectDir()); using var godot = engine.Start(); -// Load a scene +// Load your main scene var scene = GD.Load("res://main.tscn"); engine.Tree.Root.AddChild(scene.Instantiate()); -var load = engine.Tree.CurrentScene; -var bitsImage = load.GetNode("BitsImage"); -// var bitsSelection = curScene.GetNode("BitsSelection"); -var unlockedFeatLbl = load.GetNode