Merge pull request #24 from lambda-sh/dev

lambda-cpp -> lambda-rs

Author: vmarcella

.github/workflows/compile_and_test.yml .github/workflows/compile_lambda_rs.yml.github/workflows/compile_and_test.yml renamed to .github/workflows/compile_lambda_rs.yml

@@ -1,11 +1,11 @@
-name: compile_and_test
+name: compile & test lambda-rs
 
 on:
   push:
-    branches: [ main, dev ]
+    branches: [ main, dev, vmarcella/lambda-rs ]
 
   pull_request:
-    branches: [ main, dev ]
+    branches: [ main, dev, vmarcella/lambda-rs ]
 
   workflow_dispatch:
 
@@ -15,25 +15,12 @@ defaults:
 
 jobs:
   build_and_test:
-    name: Build & test Lambda on ${{ matrix.os }} with ${{ matrix.cpp-compiler }}.
+    name: Build lambda-rs on ${{ matrix.os }} with ${{ matrix.rustup-toolchain }}.
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-          - os: ubuntu-latest
-            c-compiler: gcc-10
-            cpp-compiler: g++-10
-            target: Linux
-
-            #- os: macos-latest
-            #c-compiler: gcc-11
-            #cpp-compiler: g++-11
-            #target: Macos
-
-          - os: windows-latest
-            cpp-compiler: cl
-            c-compiler: cl
-            target: Windows
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        rustup-toolchain: ["stable"]
 
     steps:
       - name: Checkout Repository
@@ -42,29 +29,29 @@ jobs:
       - name: Run the projects setup.
         run: ./scripts/setup.sh --within-ci true
 
-      - name: Obtain Randr for glfw & Ninja for building on Ubuntu.
+      - name: Obtain Xorg for building on Ubuntu.
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get update && sudo apt-get install xorg-dev ninja-build
+        run: sudo apt-get update && sudo apt-get install xorg-dev
 
       - name: Add msbuild to PATH
         if: ${{ matrix.os == 'windows-latest' }}
         uses: microsoft/setup-msbuild@v1.0.2
 
-      - name: Obtain Ninja & gcc for building on MacOS.
-        if: ${{ matrix.os == 'macos-latest' }}
-        run: brew install ninja gcc
+      - name: Install ninja 1.10.2 on windows.
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: choco install ninja
+
+      - name: Obtain rust toolchain for ${{ matrix.rustup-toolchain }}
+        run: |
+          rustup toolchain install ${{ matrix.rustup-toolchain }}
+          rustup default ${{ matrix.rustup-toolchain }}
 
-      - name: Compile a release build of lambda
-        run: ./scripts/compile_and_test.sh \
-            --build Release \
-            --cpp-compiler ${{ matrix.cpp-compiler }} \
-            --c-compiler ${{ matrix.c-compiler }} \
-            --os ${{ matrix.target }} \
-            --cores 2
+      - name: Build Lambda & other default workspace members.
+        run: cargo build
 
       - uses: actions/setup-ruby@v1
       - name: Send Webhook Notification for build status.
-        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' }}
+        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/vmarcella/lambda-rs' }}
         env:
           JOB_STATUS: ${{ job.status }}
           WEBHOOK_URL: ${{ secrets.LAMBDA_BUILD_WEBHOOK }}

.gitignore

@@ -1,3 +1,6 @@
+# Rust output directories
+target
+
 # Visual studio build config
 .vs
 

.gitmodules

@@ -1,26 +1,26 @@
-[submodule "engine/vendor/glfw"]
-	path = lambda/vendor/glfw
+[submodule "archive/lambda_cpp/vendor/glfw"]
+	path = archive/lambda_cpp/vendor/glfw
 	url = https://github.com/glfw/glfw
-[submodule "engine/vendor/imgui"]
-	path = lambda/vendor/imgui
+[submodule "archive/lambda_cpp/vendor/imgui"]
+	path = archive/lambda_cpp/vendor/imgui
 	url = https://github.com/C3NZ/imgui
-[submodule "engine/vendor/glm"]
-	path = lambda/vendor/glm
+[submodule "archive/lambda_cpp/vendor/glm"]
+	path = archive/lambda_cpp/vendor/glm
 	url = https://github.com/g-truc/glm
 [submodule "docs"]
 	path = docs
 	url = https://github.com/C3NZ/game-engine-docs.git
-[submodule "engine/vendor/spdlog"]
-	path = lambda/vendor/spdlog
+[submodule "archive/lambda_cpp/vendor/spdlog"]
+	path = archive/lambda_cpp/vendor/spdlog
 	url = https://github.com/gabime/spdlog.git
-[submodule "engine/vendor/readerwriterqueue"]
-	path = lambda/vendor/readerwriterqueue
+[submodule "archive/lambda_cpp/vendor/readerwriterqueue"]
+	path = archive/lambda_cpp/vendor/readerwriterqueue
 	url = https://github.com/cameron314/readerwriterqueue
-[submodule "engine/vendor/concurrentqueue"]
-	path = lambda/vendor/concurrentqueue
+[submodule "archive/lambda_cpp/vendor/concurrentqueue"]
+	path = archive/lambda_cpp/vendor/concurrentqueue
 	url = https://github.com/cameron314/concurrentqueue
-[submodule "engine/vendor/googletest"]
-	path = lambda/vendor/googletest
+[submodule "archive/lambda_cpp/vendor/googletest"]
+	path = archive/lambda_cpp/vendor/googletest
 	url = https://github.com/google/googletest
 [submodule "lambda-sh"]
 	path = lambda-sh

.ignore

@@ -1,3 +1,4 @@
 docs
-lambda/vendor
+archive/lambda_cpp/vendor
 \.git
+target

.pre-commit-config.yaml

@@ -9,7 +9,15 @@ repos:
     rev: 0.6.0
     hooks:
       - id: cpplint
-        name: Lint-engine
+        name: C++ Linter
         args: [
           "--filter=-legal/copyright,-build/include,-build/c++11",
           ]
+  - repo: local
+    hooks:
+      - id: fmt
+        args: []
+        entry: rustup run nightly cargo fmt --
+        language: system
+        name: Linting for lambda-rs & tools.
+        types: [rust]

.vscode/c_cpp_properties.json

@@ -5,15 +5,21 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(Windows) Launch",
+            "name": "(Windows) Debug Demo",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "enter program name, for example ${workspaceFolder}/a.exe",
+            "program": "${workspaceRoot}/target/debug/demo.exe",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "externalTerminal"
+            "externalConsole": true
+        },
+        {
+            "name": "(MacOS/Linux) Debug Demo",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceRoot}/target/debug/demo",
+            "cwd": "${workspaceFolder}"
         }
     ]
 }

.vscode/launch.json

@@ -5,5 +5,10 @@
     "*.tcc": "cpp",
     "chrono": "cpp",
     "string_view": "cpp"
-  }
+  },
+  "vim.autoindent": false,
+  "editor.tabSize": 2,
+	"editor.detectIndentation": false,
+	"rust-analyzer.inlayHints.typeHints": false,
+	"rust-analyzer.inlayHints.chainingHints": false
 }

.vscode/settings.json

@@ -0,0 +1,29 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type":"shell",
+      "label": "build all",
+      "detail": "Builds all targets within the lambda repo",
+      "command": "cargo",
+      "args": [
+        "build"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "type":"shell",
+      "label": "run lambda demo",
+      "detail": "Builds & Runs the lambda demo application",
+      "command": "cargo",
+      "args": [
+        "run"
+      ],
+      "dependsOn":["build all"],
+      "group": "none"
+    }
+  ]
+}