Test.NativeLaunch can now render mods

- mods are flat shaded usually, see big comment
- can also a render a spinning cube

Author: jmquigs

Test.NativeLaunch/Cargo.lock

@@ -16,4 +16,5 @@ winapi = { version = "0.3", features = ["libloaderapi",
     "dinput", "sysinfoapi", "errhandlingapi"] }
 anyhow = "*"
 rand = "*"
-aho-corasick = "0.7.20"
+aho-corasick = "0.7.20"
+glam = "*"

Test.NativeLaunch/Cargo.toml

@@ -2,10 +2,19 @@ set -e
 
 mmdir=../Native
 
+RELEASE=0
+
 # change into mm native dir, check target symlink and build mm dll
-(cd $mmdir && rm -f $mmdir/target && sh ./setjunc.sh >/dev/null && cargo build)
-cp -v $mmdir/target/debug/hook_core.dll target/debug/d3d11.dll
-cargo run -- $@
+if [ "$RELEASE" -eq 1 ]; then
+    (cd $mmdir && rm -f $mmdir/target && sh ./setjunc.sh >/dev/null && cargo build --release)
+    cp -v $mmdir/target/release/hook_core.dll target/release/d3d11.dll
+    RUST_BACKTRACE=full cargo run --release -- $@
+else
+    (cd $mmdir && rm -f $mmdir/target && sh ./setjunc.sh >/dev/null && cargo build)
+    cp -v $mmdir/target/debug/hook_core.dll target/debug/d3d11.dll
+    RUST_BACKTRACE=full cargo run -- $@
+fi
+
 
 # ad hoc benchmark functions for testing the load_mmobj module. intended
 # to be pasted into a bash shell.

Test.NativeLaunch/basic_vshader.cso

@@ -0,0 +1,25 @@
+cbuffer LightingBuffer : register(b1)
+{
+    float3 lightDirection; // Should be normalized in app code
+    float  padding;        // For alignment (16-byte row)
+};
+
+struct VS_OUTPUT
+{
+    float4 position : SV_POSITION;
+    float3 normal   : NORMAL;  // Unpacked and passed to PS
+};
+
+float4 main(VS_OUTPUT input) : SV_Target
+{
+    float3 N = normalize(input.normal);
+    float3 L = normalize(-lightDirection); // Negated so light "comes from" the direction
+
+    float diffuse = saturate(dot(N, L));
+    float ambient = 0.2;
+
+    float brightness = ambient + diffuse * 0.8;
+    return float4(brightness, brightness, brightness, 1.0); // grayscale lit color
+
+    //return float4(1.0, 0.0, 0.0, 1.0); // bright red
+}

Test.NativeLaunch/basic_vshader.hlsl

@@ -0,0 +1,63 @@
+cbuffer MatrixBuffer : register(b0)
+{
+    matrix modelViewProjection;
+};
+
+cbuffer NormalMatrixBuffer : register(b2)
+{
+    float3x3 normalMatrix;
+};
+
+struct VS_INPUT
+{
+    float3 position             : POSITION;
+    int4   normal               : NORMAL;       // Packed as R16G16B16A16_SINT
+    int2   binormal             : BINORMAL;     // Ignored for now
+    float4 texturecoordinate0   : TEXCOORD0;    // Ignored for lighting
+};
+
+struct VS_OUTPUT
+{
+    float4 position : SV_POSITION;
+    float3 normal   : NORMAL;  // Unpacked and passed to PS
+};
+
+VS_OUTPUT main(VS_INPUT input)
+//VS_OUTPUT main(uint vertexId : SV_VertexID)
+{
+    VS_OUTPUT output;
+
+    // Transform position to clip space
+    output.position = mul(float4(input.position, 1.0), modelViewProjection);
+
+    // Unpack normal from signed 16-bit int to float in [-1, 1]
+    float3 normal;
+    normal.x = input.normal.x / 32767.0;
+    normal.y = input.normal.y / 32767.0;
+    normal.z = input.normal.z / 32767.0;
+    normal = normalize(normal);
+
+    normal = mul(normalMatrix, normal);
+
+    output.normal = normalize(normal); // Normalize for lighting
+
+    return output;
+}
+
+// struct VS_INPUT
+// {
+//     float3 position : POSITION;
+// };
+
+// struct VS_OUTPUT
+// {
+//     float4 position : SV_POSITION;
+// };
+
+// VS_OUTPUT main(VS_INPUT input)
+// {
+//     VS_OUTPUT output;
+//     //output.position = float4(input.position, 1.0);
+//     output.position = mul(float4(input.position, 1.0), modelViewProjection);
+//     return output;
+// }

Test.NativeLaunch/runmm.sh

@@ -0,0 +1,50 @@
+use winapi::{shared::{winerror::SUCCEEDED}, um::d3d11::{ID3D11Buffer, ID3D11Device, ID3D11DeviceContext, D3D11_BIND_CONSTANT_BUFFER, D3D11_BUFFER_DESC, D3D11_MAPPED_SUBRESOURCE, D3D11_MAP_WRITE_DISCARD, D3D11_USAGE_DYNAMIC}};
+
+
+pub unsafe fn create_constant_buffer<T>(
+    device: *mut ID3D11Device,
+) -> anyhow::Result<*mut ID3D11Buffer> {
+    let buffer_desc = D3D11_BUFFER_DESC {
+        ByteWidth: std::mem::size_of::<T>() as u32,
+        Usage: D3D11_USAGE_DYNAMIC,
+        BindFlags: D3D11_BIND_CONSTANT_BUFFER,
+        CPUAccessFlags: winapi::um::d3d11::D3D11_CPU_ACCESS_WRITE,
+        MiscFlags: 0,
+        StructureByteStride: 0,
+    };
+
+    let mut buffer_ptr: *mut ID3D11Buffer = std::ptr::null_mut();
+    let hr = (*device).CreateBuffer(&buffer_desc, std::ptr::null(), &mut buffer_ptr);
+    if SUCCEEDED(hr) {
+        Ok(buffer_ptr)
+    } else {
+        Err(anyhow!("failed to create constant buffer: {:X}", hr))
+    }
+}
+
+pub unsafe fn update_constant_buffer<T: Copy>(
+    context: *mut ID3D11DeviceContext,
+    buffer: *mut ID3D11Buffer,
+    data: &T,
+) -> anyhow::Result<()> {
+    let mut mapped = std::mem::zeroed::<D3D11_MAPPED_SUBRESOURCE>();
+    let hr = (*context).Map(
+        buffer as *mut _,
+        0,
+        D3D11_MAP_WRITE_DISCARD,
+        0,
+        &mut mapped,
+    );
+
+    if SUCCEEDED(hr) {
+        std::ptr::copy_nonoverlapping(
+            data as *const T as *const u8,
+            mapped.pData as *mut u8,
+            std::mem::size_of::<T>(),
+        );
+        (*context).Unmap(buffer as *mut _, 0);
+        Ok(())
+    } else {
+        Err(anyhow!("failed to update constant buffer: {:X}", hr))
+    }
+}