Merge pull request #83 from rust3ds/feat/textures

Implement textures

Author: Meziu

.github/workflows/ci.yml

@@ -30,6 +30,9 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
 
+      - name: Install Clang
+        run: sudo apt-get update && sudo apt-get install -y clang
+
       # https://github.com/actions/runner/issues/504
       # Removing the matchers won't keep the job from failing if there are errors,
       # but will at least declutter pull request annotations (especially for warnings).
@@ -63,27 +66,11 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
 
+      - name: Install Clang
+        run: sudo apt-get update && sudo apt-get install -y clang
+
       - name: Hide duplicated warnings from lint job
         run: echo "::remove-matcher owner=clippy::"
 
       - name: Build and run macro tests
         run: cargo test --package citro3d-macros
-
-      - name: Build and run lib and integration tests
-        uses: rust3ds/test-runner/run-tests@v1
-        with:
-          args: --tests --package citro3d
-
-      - name: Build and run doc tests
-        uses: rust3ds/test-runner/run-tests@v1
-        with:
-          args: --doc --package citro3d
-
-      - name: Upload citra logs and capture videos
-        uses: actions/upload-artifact@v4
-        if: success() || failure() # always run unless the workflow was cancelled
-        with:
-          name: citra-logs-${{ matrix.toolchain }}
-          path: |
-            target/armv6k-nintendo-3ds/debug/deps/*.txt
-            target/armv6k-nintendo-3ds/debug/deps/*.webm

.github/workflows/docs.yml

@@ -15,6 +15,9 @@ jobs:
       - name: Checkout branch
         uses: actions/checkout@v4
 
+      - name: Install Clang
+        run: sudo apt-get update && sudo apt-get install -y clang
+
       - name: Setup Pages
         uses: actions/configure-pages@v3
 

.gitignore

@@ -23,3 +23,6 @@ rust-toolchain.toml
 
 # Pica200 output files
 *.shbin
+
+# Tex3DS output files
+*.t3d

citro3d/examples/assets/create_texture.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Get the asset directory (containing this script)
+ASSET_DIR=$(dirname $0)
+
+echo "Kitten"
+tex3ds -f auto-etc1 -z auto -o $ASSET_DIR/kitten.t3d $ASSET_DIR/kitten.png
+echo "Skybox"
+tex3ds -f auto-etc1 --skybox -z auto -o $ASSET_DIR/skybox.t3d $ASSET_DIR/skybox.png

citro3d/examples/assets/kitten.png

@@ -0,0 +1,41 @@
+; Example PICA200 vertex shader
+
+; Uniforms
+.fvec projection[4], modelView[4]
+
+; Constants
+.constf myconst(0.0, 1.0, -1.0, -0.5)
+.alias  zeros myconst.xxxx ; Vector full of zeros
+.alias  ones  myconst.yyyy ; Vector full of ones
+
+; Outputs
+.out outpos position
+.out outtc0 texcoord0.st
+.out -      texcoord0w outtc0.p
+
+; Inputs (defined as aliases for convenience)
+.alias inpos v0
+
+.proc main
+	; Force the w component of inpos to be 1.0
+	mov r0.xyz, inpos
+	mov r0.w,   ones
+
+	; r1 = modelView * inpos
+	dp4 r1.x, modelView[0], r0
+	dp4 r1.y, modelView[1], r0
+	dp4 r1.z, modelView[2], r0
+	dp4 r1.w, modelView[3], r0
+
+	; outpos = projection * r1
+	dp4 outpos.x, projection[0], r1
+	dp4 outpos.y, projection[1], r1
+	dp4 outpos.z, projection[2], r1
+	dp4 outpos.w, projection[3], r1
+
+	; outtc0 = position
+	mov outtc0, inpos
+
+	; We're finished
+	end
+.end

citro3d/examples/assets/kitten.t3d

@@ -0,0 +1,35 @@
+; Basic PICA200 vertex shader
+
+; Uniforms
+.fvec projection[4]
+
+; Constants
+.constf myconst(0.0, 1.0, -1.0, -0.5)
+.constf zeros(0.0, 0.0, 0.0, 0.0)
+.constf ones(1.0, 1.0, 1.0, 1.0)
+
+; Outputs
+.out outpos position
+.out outtex texcoord0
+
+; Inputs (defined as aliases for convenience)
+.alias inpos v0
+.alias intex v1
+
+.proc main
+	; Force the w component of inpos to be 1.0
+	mov r0.xyz, inpos
+	mov r0.w,   ones
+
+	; outpos = projectionMatrix * inpos
+	dp4 outpos.x, projection[0], r0
+	dp4 outpos.y, projection[1], r0
+	dp4 outpos.z, projection[2], r0
+	dp4 outpos.w, projection[3], r0
+
+	; outtex = intex
+	mov outtex, intex
+
+	; We're finished
+	end
+.end