Skip to content

Commit

Permalink
deploy: cd90f2d
Browse files Browse the repository at this point in the history
  • Loading branch information
@PodeCaradox
PodeCaradox committed Nov 3, 2023
1 parent e6ebd0a commit dffcca3
Show file tree
Hide file tree
Showing 15 changed files with 636 additions and 696 deletions.
Binary file added 346655286a73c91d55e3.wasm
View file
Binary file not shown.
88 changes: 37 additions & 51 deletions assets/shaders/brush_world.wgsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,21 @@ struct SingleInstance
AtlasCoordSize: u32,
};

struct TileInstances
//4 * 4 = 16 bytes
struct TileData
{
TileIndex: u32,
Color: u32,//Shadow Color
MiniMapColor: u32,
Elevation: f32,
ObjectY: array<u32, 2>,//16 bits for Y //16 bits for Y //16 bits for Y //16 bits for Y
AnimationData: u32,// 8 bit enabled, 8 bit enabled, 8 bit enabled, 8 bit enabled
OffsetElevationX: u32,// 8 bit OffsetX, 8 bit OffsetX, 8 bit OffsetX, 8 bit OffsetX
SingleInstances: array<u32, 24>,
};

//4 * 8 = 32 bytes
struct TileRotationData
{
Data: u32,//16 bits for ObjectY //8 bit AnimationData //8 bit OffsetElevationX
SingleInstances: array<u32, 6>,
Free: u32
};

//12 + 4 + 8 + 4 + 4 = 32;
Expand All @@ -37,8 +42,12 @@ struct TilePropertiesStorage {
properties: array<SingleInstance>,
};

struct TileInstancesStorage {
tiles: array<TileInstances>,
struct TileDataStorage {
tiles: array<TileData>,
};

struct TileRotationDataStorage {
tiles: array<TileRotationData>,
};

struct InstancingObjectStorage {
Expand Down Expand Up @@ -325,18 +334,19 @@ struct BrushParamsCompute
@group(0) @binding(1) var<storage, read> rows_index : TilesBehindStorage;
@group(1) @binding(0) var<storage, read> tile_properties : TilePropertiesStorage;
@group(2) @binding(0) var<uniform> brush_params: BrushParamsCompute;
@group(2) @binding(1) var<storage, read> brush_tiles : TileInstancesStorage;
@group(2) @binding(1) var<storage, read> brush_tiles_data : TileDataStorage;
@group(2) @binding(2) var<storage, read> brush_tiles_rotation : TileRotationDataStorage;
@group(3) @binding(0) var<storage, read_write> visble_tiles_cp : InstancingObjectStorage;

@compute
@workgroup_size(16, 1, 1)
fn instancing_cs_brush(@builtin(global_invocation_id) global_id: vec3<u32>) {
if (global_id.x >= brush_params.instances_to_draw) {
return;
}
var tile: TileInstances = brush_tiles.tiles[global_id.x];

let brush_tile_data = brush_tiles_data.tiles[global_id.x];

let index = index_to_world_pos(tile.TileIndex);
let index = index_to_world_pos(brush_tile_data.TileIndex);

if (brush_params.draw_map_behind == 0u && brush_params.build_able == 1u){
let tiles_y: i32 = (params.start_pos.x - params.start_pos.y) - (index.x - index.y);
Expand All @@ -352,53 +362,29 @@ if (global_id.x >= brush_params.instances_to_draw) {



var elevation : f32 = tile.Elevation;
let pos = index_to_world_pos(tile.TileIndex);
var elevation : f32 = brush_tile_data.Elevation;
let pos = index_to_world_pos(brush_tile_data.TileIndex);
if(brush_params.build_able == 1u){
var visible_index : u32 = brush_params.visible_index + global_id.x * 4u;

let shift = (8u * params.direction);
let animation_enabled = 0u;
var offset_object: u32 = tile.ObjectY[0u];
if (params.direction > 1u){
offset_object = tile.ObjectY[1u];
}
var offset_object_y = f32(((offset_object >> ((params.direction & 1u) * 16u)) & 0x0000ffffu));
var offset_elevation_x = u8_to_i8((tile.OffsetElevationX >> shift) & 0x000000ffu);

if (params.direction == 0u){
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(tile.SingleInstances[0], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 1u] = CreateSpecificInstance(tile.SingleInstances[1], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 2u] = CreateBuildingInstance(tile.SingleInstances[2], index, elevation, animation_enabled, 0u, tile.Color, offset_object_y);
visble_tiles_cp.tiles[visible_index + 3u] = CreateElevationInstance(tile.SingleInstances[3], index, elevation, animation_enabled, 0u, tile.Color, offset_elevation_x);
visble_tiles_cp.tiles[visible_index + 3u].Position.z -= ZStep;
}
else if(params.direction == 1u){
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(tile.SingleInstances[6], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 1u] = CreateSpecificInstance(tile.SingleInstances[7], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 2u] = CreateBuildingInstance(tile.SingleInstances[8], index, elevation, animation_enabled, 0u, tile.Color, offset_object_y);
visble_tiles_cp.tiles[visible_index + 3u] = CreateElevationInstance(tile.SingleInstances[9], index, elevation, animation_enabled, 0u, tile.Color, offset_elevation_x);
visble_tiles_cp.tiles[visible_index + 3u].Position.z -= ZStep;
}
else if(params.direction == 2u){
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(tile.SingleInstances[12], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 1u] = CreateSpecificInstance(tile.SingleInstances[13], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 2u] = CreateBuildingInstance(tile.SingleInstances[14], index, elevation, animation_enabled, 0u, tile.Color, offset_object_y);
visble_tiles_cp.tiles[visible_index + 3u] = CreateElevationInstance(tile.SingleInstances[15], index, elevation, animation_enabled, 0u, tile.Color, offset_elevation_x);
visble_tiles_cp.tiles[visible_index + 3u].Position.z -= ZStep;
}
else if(params.direction == 3u){
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(tile.SingleInstances[18], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 1u] = CreateSpecificInstance(tile.SingleInstances[19], index, elevation, animation_enabled, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index + 2u] = CreateBuildingInstance(tile.SingleInstances[20], index, elevation, animation_enabled, 0u, tile.Color, offset_object_y);
visble_tiles_cp.tiles[visible_index + 3u] = CreateElevationInstance(tile.SingleInstances[21], index, elevation, animation_enabled, 0u, tile.Color, offset_elevation_x);
visble_tiles_cp.tiles[visible_index + 3u].Position.z -= ZStep;
}
let brush_tile_rotation = brush_tiles_rotation.tiles[global_id.x * 4u + params.direction];

var animation = (brush_tile_rotation.Data >> 8u) & 0x000000ffu;
var animation_enabled = animation & 0x00000001u;

var offset_object_y = f32(brush_tile_rotation.Data >> 16u);
var offset_elevation_x = u8_to_i8(brush_tile_rotation.Data & 0x000000ffu);


visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(brush_tile_rotation.SingleInstances[0u], index, elevation, animation_enabled, 0u, brush_tile_data.Color);
visble_tiles_cp.tiles[visible_index + 1u] = CreateSpecificInstance(brush_tile_rotation.SingleInstances[1u], index, elevation, animation_enabled, 0u, brush_tile_data.Color);
visble_tiles_cp.tiles[visible_index + 2u] = CreateBuildingInstance(brush_tile_rotation.SingleInstances[2u], index, elevation, animation_enabled, 0u, brush_tile_data.Color, offset_object_y);
visble_tiles_cp.tiles[visible_index + 3u] = CreateElevationInstance(brush_tile_rotation.SingleInstances[3u], index, elevation, animation_enabled, 0u, brush_tile_data.Color, offset_elevation_x);
visble_tiles_cp.tiles[visible_index + 3u].Position.z -= ZStep;

return;
}

var visible_index : u32 = brush_params.visible_index + global_id.x;
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(brush_params.brush_instance_not_buildable, index, elevation, 0u, 0u, tile.Color);
visble_tiles_cp.tiles[visible_index] = CreateSpecificInstance(brush_params.brush_instance_not_buildable, index, elevation, 0u, 0u, brush_tile_data.Color);
}
33 changes: 11 additions & 22 deletions assets/shaders/entity_world.wgsl
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
struct SingleInstance
{
ImageIndex: u32,
AtlasCoordSize: u32
};
const ImageSize = vec2<f32>(2048.0,2048.0);
const ColorTableImageSize = vec2<f32>(1024.0, 1024.0);
const ColorTableSize = vec2<f32>(64.0, 64.0);

//12 bytes + 4 * 6 = 28
//8 * 4 = 32 bytes
struct EntityInstance
{
Position: vec3<f32>,
ImageIndex: u32,
ColorTableIndex: u32,
ColorTablePos: u32,
AtlasCoordPos: u32,
AtlasCoordSize: u32,
MiniMapColor : u32,
ObjectType : u32,
Elevation : u32
};

//12 + 4 + 8 + 8 = 32 bytes;
struct InstancingObject
{
Position: vec3<f32>,
ImageIndex: u32,
UvCoordPos: vec2<f32>,
UvCoordSize: vec2<f32>
AtlasCoordSize: u32
};


//==============================================================================
// Vertex shader_bindings
//==============================================================================
Expand All @@ -34,11 +21,13 @@ struct VertexInput {
@builtin(instance_index) instance_index: u32,
}

// 16 byte + 8 byte + 4 bytes = 24 bytes
// 8 = 24 bytes
struct VertexOutput {
@builtin(position) Position: vec4<f32>,
@location(0) TexCoord : vec2<f32>,
@location(1) @interpolate(flat) Index : u32
@location(1) ImageIndex : u32,
@location(2) ColorTableIndex : u32,
@location(3) ColorTablePos : vec2<f32>,
}

struct CameraUniform {
Expand Down
5 changes: 0 additions & 5 deletions assets/shaders/generate_minimap.wgsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,12 @@ struct MiniMapParams {
minimap_image_pos: vec2<i32>,
};

//4 * 12 = 48 bytes //always dividable by 16
struct TileInstances
{
TileIndex: u32,
Color: u32,//Shadow Color
MiniMapColor: u32,
Elevation: f32,
ObjectY: array<u32, 2>,//16 bits for Y //16 bits for Y //16 bits for Y //16 bits for Y
AnimationData: u32,// 8 bit enabled, 8 bit enabled, 8 bit enabled, 8 bit enabled
OffsetElevationX: u32,// 8 bit OffsetX, 8 bit OffsetX, 8 bit OffsetX, 8 bit OffsetX
SingleInstances: array<u32, 24>,
};

struct TileInstancesStorage {
Expand Down
Loading

0 comments on commit dffcca3

Please sign in to comment.