strips/voxelotl-engine
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/voxelotl-engine.git synced 2025-11-04 02:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

use floats for instance colour memory

Browse Source
This commit is contained in:
a dinosaur
2024-08-19 07:59:36 +10:00
parent f203bcc7c1
commit 8904db24a5
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Voxelotl/Color.swift
View File

@ -89,6 +89,10 @@ public extension Color where T: BinaryFloatingPoint {
self.init(r: newR, g: newG, b: newB, a: Self.one) self.init(r: newR, g: newG, b: newB, a: Self.one)
} }
init<U: BinaryFloatingPoint>(_ other: Color<U>) {
self._values = SIMD4<T>(other._values)
}
init<U: BinaryInteger>(_ other: Color<U>) { init<U: BinaryInteger>(_ other: Color<U>) {
let mul = 1 / T(0xFF) let mul = 1 / T(0xFF)
self.init( self.init(

2
Sources/Voxelotl/Renderer.swift
View File

@ -380,7 +380,7 @@ public class Renderer {
.scale(instance.scale) .scale(instance.scale)
data[i] = VertexShaderInstance( data[i] = VertexShaderInstance(
model: model, normalModel: model.inverse.transpose, model: model, normalModel: model.inverse.transpose,
color: SIMD4(Color<UInt8>(instance.color))) color: SIMD4(Color<Float>(instance.color)))
} }
} }
instanceBuffer.didModifyRange(0..<instancesBytes) instanceBuffer.didModifyRange(0..<instancesBytes)

2
Sources/Voxelotl/shader.metal
View File

@ -23,7 +23,7 @@ vertex FragmentInput vertexMain(
FragmentInput out; FragmentInput out;
out.position = u.projView * world; out.position = u.projView * world;
out.world = world.xyz; out.world = world.xyz;
out.color = half4(i[instanceID].color) / 255.0; out.color = half4(i[instanceID].color);
out.normal = (i[instanceID].normalModel * vtx[vertexID].normal).xyz; out.normal = (i[instanceID].normalModel * vtx[vertexID].normal).xyz;
out.texCoord = vtx[vertexID].texCoord; out.texCoord = vtx[vertexID].texCoord;
return out; return out;

2
Sources/Voxelotl/shadertypes.h
View File

@ -25,7 +25,7 @@ typedef struct {
typedef struct { typedef struct {
matrix_float4x4 model; matrix_float4x4 model;
matrix_float4x4 normalModel; matrix_float4x4 normalModel;
vector_uchar4 color; vector_float4 color;
} VertexShaderInstance; } VertexShaderInstance;
typedef struct { typedef struct {