Tile data - part 2
This commit is contained in:
parent
7c810460d9
commit
6273915154
3 changed files with 7133 additions and 189 deletions
|
|
@ -1,8 +1,9 @@
|
|||
{
|
||||
layer: "Instances"
|
||||
instance_layer: "Instances"
|
||||
mappings: {
|
||||
"player_start": {
|
||||
object_name: "objPlayerStart",
|
||||
"block": {
|
||||
object_name: "objBlock",
|
||||
type: "tile",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
|
|||
253
main.odin
253
main.odin
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
package main
|
||||
|
||||
import "core:math"
|
||||
import "core:hash"
|
||||
import "core:encoding/json"
|
||||
import "base:runtime"
|
||||
import "core:os"
|
||||
|
|
@ -241,7 +243,7 @@ resource_room_layer_get_type :: proc(layer: json.Object) -> RoomLayerType {
|
|||
return ._Invalid
|
||||
}
|
||||
|
||||
resource_room_get_by_name :: proc(layers: ^json.Array, name: string) -> (_layer: ^json.Object, _ok: bool) {
|
||||
resource_room_layer_get_by_name :: proc(layers: ^json.Array, name: string) -> (_layer: ^json.Object, _ok: bool) {
|
||||
for &layer in layers {
|
||||
layer := &layer.(json.Object)
|
||||
layer_name := layer["name"].(json.String)
|
||||
|
|
@ -295,6 +297,100 @@ resource_room_layer_create_instance :: proc(version, resource_version, object_na
|
|||
return instance
|
||||
}
|
||||
|
||||
GamemakerTile :: distinct i32
|
||||
|
||||
GamemakerTilemap :: struct {
|
||||
width, height: int,
|
||||
tile_width: int, tile_height: int,
|
||||
data: [dynamic]i64,
|
||||
}
|
||||
|
||||
/*
|
||||
GameMaker compresses their tile data stored in the room resource
|
||||
Imagine the following data:
|
||||
-4,-2147483648,1,6,-4,-2147483648,4,6,-2147483648,-2147483648,6,-3,-2147483648,1,6,
|
||||
It represents tile data for the following tilemap:
|
||||
- - - - X - - - - X - - X - - - X
|
||||
Where X = tile mask 6 (no further transformations applied)
|
||||
1) The first four (-4) tiles are blanks (-2147483648)
|
||||
2) The following tile (1) is a real tile (6).
|
||||
3) Then the same as step 1
|
||||
4) Then four tiles are described directly (4 followed by 6,-2147483648,-2147483648,6)
|
||||
This was triggered because 2 is deemed too small to be worth compressing
|
||||
5) Then another three blanks (-3,-2147483648)
|
||||
6) Then a single tile (1, 6)
|
||||
*/
|
||||
resource_room_tile_layer_decompress :: proc(layer: json.Object, allocator := context.allocator) -> GamemakerTilemap {
|
||||
tilemap: GamemakerTilemap
|
||||
tilemap_grid_x := int(layer["gridX"].(json.Integer))
|
||||
tilemap_grid_y := int(layer["gridY"].(json.Integer))
|
||||
tilemap_data := layer["tiles"].(json.Object)
|
||||
tilemap_width := int(layer["SerializeWidth"].(json.Integer))
|
||||
tilemap_height := int(layer["SerializeHeight"].(json.Integer))
|
||||
tilemap_compressed := layer["TileCompressedData"].(json.Array)
|
||||
tilemap.data = make([dynamic]i64, tilemap_width * tilemap_height, allocator = allocator)
|
||||
tilemap_tile_index := 0
|
||||
for i := 0; i < len(tilemap_compressed); {
|
||||
value := int(tilemap_compressed[i].(json.Integer))
|
||||
switch math.sign(value) {
|
||||
case 1:
|
||||
tile_count := value
|
||||
i += 1
|
||||
for j in 0..<tile_count {
|
||||
tilemap.data[tilemap_tile_index] = tilemap_compressed[i + j].(json.Integer)
|
||||
tilemap_tile_index += 1
|
||||
}
|
||||
i += tile_count
|
||||
case -1:
|
||||
tile_count := abs(value)
|
||||
i += 1
|
||||
tile := tilemap_compressed[i].(json.Integer)
|
||||
for j in 0..<tile_count {
|
||||
tilemap.data[tilemap_tile_index] = tile
|
||||
}
|
||||
tilemap_tile_index += tile_count
|
||||
i += 1
|
||||
case 0:
|
||||
panic("Weirdo tile data what the fuck")
|
||||
}
|
||||
}
|
||||
return tilemap
|
||||
}
|
||||
|
||||
resource_room_layer_tile_is_empty :: proc(mask: GamemakerTile) -> bool {
|
||||
return mask == min(GamemakerTile)
|
||||
}
|
||||
|
||||
resource_room_tile_layer_insert_tile :: proc(tilemap: json.Array, tilemap_width, x, y: int, tile: GamemakerTile) {
|
||||
assert(len(tilemap) % tilemap_width == 0, "Wrong tilemap width")
|
||||
tilemap_height := len(tilemap) / tilemap_width
|
||||
assert(x >= tilemap_width && x < tilemap_width, "Tilemap x out of bounds")
|
||||
assert(y >= tilemap_height && y < tilemap_height, "Tilemap y out of bounds")
|
||||
index := x + y * tilemap_width
|
||||
tilemap[index] = i64(tile)
|
||||
}
|
||||
|
||||
resource_room_tile_layer_clear_area :: proc(tilemap: json.Array, tilemap_width, x, y, width, height, tile_width, tile_height: int) {
|
||||
assert(len(tilemap) % tilemap_width == 0, "Wrong tilemap width")
|
||||
tilemap_height := len(tilemap) / tilemap_width
|
||||
tilemap_area_x := x / tile_width
|
||||
tilemap_area_y := y / tile_height
|
||||
tilemap_area_width := width / tile_width
|
||||
tilemap_area_height := height / tile_height
|
||||
tilemap_area_x2 := tilemap_area_x + tilemap_area_width
|
||||
tilemap_area_y2 := tilemap_area_y + tilemap_area_height
|
||||
assert(tilemap_area_x >= tilemap_width && tilemap_area_x < tilemap_width, "Tilemap x out of bounds")
|
||||
assert(tilemap_area_y >= tilemap_height && tilemap_area_y < tilemap_height, "Tilemap y out of bounds")
|
||||
assert(tilemap_area_x2 >= tilemap_width && tilemap_area_x2 < tilemap_width, "Tilemap x2 out of bounds")
|
||||
assert(tilemap_area_y2 >= tilemap_height && tilemap_area_y2 < tilemap_height, "Tilemap y2 out of bounds")
|
||||
for x in tilemap_area_x..<tilemap_area_x2 {
|
||||
for y in tilemap_area_y..<tilemap_area_y2 {
|
||||
index := x + y * tilemap_width
|
||||
tilemap[index] = i64(min(GamemakerTile))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ###
|
||||
PROGRAM
|
||||
*/
|
||||
|
|
@ -390,6 +486,7 @@ ProgramErrorError :: enum {
|
|||
BadJmapConfig,
|
||||
RoomLayerNotFound,
|
||||
RoomLayerNotInstance,
|
||||
RoomLayerNotTile,
|
||||
}
|
||||
|
||||
ProgramErrorType :: union {
|
||||
|
|
@ -465,13 +562,29 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
if jmap_config_mappings_ok {
|
||||
jmap_config_mappings := jmap_config_mappings.(json.Object)
|
||||
for key, value in jmap_config_mappings {
|
||||
value := value.(json.Object)
|
||||
binding, binding_ok := jmap_name_to_gamemaker_instance_map[key]
|
||||
if !binding_ok {
|
||||
fmt.eprintln("WARNING: Binding for jmap object '", key, "' does not exist", sep = "")
|
||||
continue
|
||||
}
|
||||
|
||||
if type, type_ok := value["type"]; type_ok {
|
||||
type_string := type.(json.String)
|
||||
switch type_string {
|
||||
case "instance":
|
||||
jmap_name_to_gamemaker_instance_map[key].type = .Instance
|
||||
case "tile":
|
||||
jmap_name_to_gamemaker_instance_map[key].type = .Tile
|
||||
case:
|
||||
fmt.eprintln("WARNING: Unknown type (", type.(json.String) ,") for jmap object '", key, "'", sep = "")
|
||||
}
|
||||
}
|
||||
|
||||
if object_name, object_name_ok := value["object_name"]; object_name_ok {
|
||||
binding.changed = true
|
||||
jmap_name_to_gamemaker_instance_map[key].object_name = value.(json.Object)["object_name"].(json.String)
|
||||
jmap_name_to_gamemaker_instance_map[key].object_name = object_name.(json.String)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -488,15 +601,25 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
|
||||
room_layers := &(&room_resource["layers"]).(json.Array)
|
||||
|
||||
room_layer, room_layer_found := resource_room_get_by_name(room_layers, jmap_config.layer)
|
||||
if !room_layer_found {
|
||||
return program_error_create(ProgramErrorError.RoomLayerNotFound, fmt.aprint("Couldn't find room layer '", jmap_config.layer, "'", sep = ""))
|
||||
room_instance_layer, room_instance_layer_found := resource_room_layer_get_by_name(room_layers, jmap_config.instance_layer)
|
||||
if !room_instance_layer_found {
|
||||
return program_error_create(ProgramErrorError.RoomLayerNotFound, fmt.aprint("Couldn't find room layer '", jmap_config.instance_layer, "'", sep = ""))
|
||||
}
|
||||
if room_layer_type := resource_room_layer_get_type(room_layer^); room_layer_type != .Instance {
|
||||
return program_error_create(ProgramErrorError.RoomLayerNotInstance, fmt.aprint("Found room layer '", jmap_config.layer, "' was not an instance layer", sep = ""))
|
||||
if room_layer_type := resource_room_layer_get_type(room_instance_layer^); room_layer_type != .Instance {
|
||||
return program_error_create(ProgramErrorError.RoomLayerNotInstance, fmt.aprint("Found instance layer '", jmap_config.instance_layer, "'. but it was not an instance layer", sep = ""))
|
||||
}
|
||||
|
||||
room_layer_instances := &((&room_layer["instances"]).(json.Array))
|
||||
room_tile_layer, room_tile_layer_found := resource_room_layer_get_by_name(room_layers, jmap_config.instance_layer)
|
||||
room_tilemap: GamemakerTilemap
|
||||
if room_tile_layer_found {
|
||||
if room_tile_layer_type := resource_room_layer_get_type(room_tile_layer^); room_tile_layer_type != .Tile {
|
||||
return program_error_create(ProgramErrorError.RoomLayerNotTile, fmt.aprint("Found tile layer '", jmap_config.tile_layer, "' But it was not a tile layer", sep = ""))
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
room_layer_instances := &((&room_instance_layer["instances"]).(json.Array))
|
||||
|
||||
if program_config.clear_area {
|
||||
for i := 0; i < len(room_layer_instances); i += 1 {
|
||||
|
|
@ -521,8 +644,13 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
}
|
||||
x := f64(jmap_instance.x + program_config.x)
|
||||
y := f64(jmap_instance.y + program_config.y)
|
||||
switch binding.type {
|
||||
case .Instance:
|
||||
instance := resource_room_layer_create_instance("v4", "2.0", binding.object_name, x, y, binding.path, context.allocator)
|
||||
append(room_layer_instances, instance)
|
||||
case .Tile:
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
room_resource_after, room_resource_after_marshal_error := json.marshal(room_resource, GAMEMAKER_RESOURCE_JSON5_MARSHAL_OPTIONS)
|
||||
|
|
@ -539,7 +667,8 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
}
|
||||
|
||||
JmapImportConfig :: struct {
|
||||
layer: string,
|
||||
instance_layer: string,
|
||||
tile_layer: string,
|
||||
}
|
||||
|
||||
JmapObjectListError :: enum {
|
||||
|
|
@ -603,11 +732,15 @@ jmap_config_get_from_json :: proc(root: json.Value) -> (_config: JmapImportConfi
|
|||
_ok = true
|
||||
root := root.(json.Object)
|
||||
|
||||
if layer, layer_ok := root["layer"]; !layer_ok {
|
||||
if instance_layer, instance_layer_ok := root["instance_layer"]; !instance_layer_ok {
|
||||
fmt.println("ERROR: Couldn't find 'layer' property in jmap config")
|
||||
_ok = false
|
||||
} else {
|
||||
_config.layer = layer.(json.String)
|
||||
_config.instance_layer = instance_layer.(json.String)
|
||||
}
|
||||
|
||||
if tile_layer, tile_layer_ok := root["tile_layer"]; tile_layer_ok {
|
||||
_config.tile_layer = tile_layer.(json.String)
|
||||
}
|
||||
|
||||
return _config, _ok
|
||||
|
|
@ -615,58 +748,66 @@ jmap_config_get_from_json :: proc(root: json.Value) -> (_config: JmapImportConfi
|
|||
|
||||
jmap_object_map_reverse: map[string]int
|
||||
|
||||
GameMakerInstanceDefinitionType :: enum {
|
||||
Instance,
|
||||
Tile,
|
||||
}
|
||||
|
||||
GameMakerInstanceDefinition :: struct {
|
||||
object_name: string,
|
||||
jmap_object_name: string,
|
||||
type: GameMakerInstanceDefinitionType,
|
||||
changed: bool,
|
||||
warned: bool,
|
||||
width: int,
|
||||
height: int,
|
||||
path: string,
|
||||
}
|
||||
|
||||
jmap_instance_to_gamemaker_binding_map := map[int]GameMakerInstanceDefinition {
|
||||
1 = {object_name = "objBlock", jmap_object_name = "block"},
|
||||
2 = {object_name = "objMiniBlock", jmap_object_name = "mini_block"},
|
||||
3 = {object_name = "objSpikeUp", jmap_object_name = "spike_up"},
|
||||
4 = {object_name = "objSpikeRight", jmap_object_name = "spike_right"},
|
||||
5 = {object_name = "objSpikeLeft", jmap_object_name = "spike_left"},
|
||||
6 = {object_name = "objSpikeDown", jmap_object_name = "spike_down"},
|
||||
7 = {object_name = "objMiniSpikeUp", jmap_object_name = "mini_spike_up"},
|
||||
8 = {object_name = "objMiniSpikeRight", jmap_object_name = "mini_spike_right"},
|
||||
9 = {object_name = "objMiniSpikeLeft", jmap_object_name = "mini_spike_left"},
|
||||
10 = {object_name = "objMiniSpikeDown", jmap_object_name = "mini_spike_down"},
|
||||
11 = {object_name = "objCherry", jmap_object_name = "fruit"},
|
||||
12 = {object_name = "objSave", jmap_object_name = "save"},
|
||||
13 = {object_name = "objPlatform", jmap_object_name = "platform"},
|
||||
14 = {object_name = "objWater1", jmap_object_name = "water_1"},
|
||||
15 = {object_name = "objWater3", jmap_object_name = "water_3"},
|
||||
16 = {object_name = "objVineR", jmap_object_name = "vine_r"},
|
||||
17 = {object_name = "objVineL", jmap_object_name = "vine_l"},
|
||||
18 = {object_name = "objKillerBlock", jmap_object_name = "killer_block"},
|
||||
20 = {object_name = "objPlayerStart", jmap_object_name = "player_start"},
|
||||
21 = {object_name = "objWarp", jmap_object_name = "warp"},
|
||||
22 = {object_name = "objJumpRefresher", jmap_object_name = "jump_refresher"},
|
||||
23 = {object_name = "objWater2", jmap_object_name = "water_2"},
|
||||
24 = {object_name = "objGravityFlipperUp", jmap_object_name = "gravity_flipper_up"},
|
||||
25 = {object_name = "objGravityFlipperDown", jmap_object_name = "gravity_flipper_down"},
|
||||
26 = {object_name = "objSaveFlipped", jmap_object_name = "save_flipped"},
|
||||
27 = {object_name = "objBulletBlocker", jmap_object_name = "bullet_blocker"},
|
||||
28 = {object_name = "objSidewaysPlatform", jmap_object_name = "sideways_platform"},
|
||||
30 = {object_name = "objMiniWater1", jmap_object_name = "mini_water_1"},
|
||||
31 = {object_name = "objMiniWater3", jmap_object_name = "mini_water_3"},
|
||||
32 = {object_name = "objMiniWater2", jmap_object_name = "mini_water_2"},
|
||||
33 = {object_name = "objMiniCatharsisWater", jmap_object_name = "mini_catharsis_water"},
|
||||
34 = {object_name = "objWaterNekoron", jmap_object_name = "water_nekoron"},
|
||||
35 = {object_name = "objMiniWaterNekoron", jmap_object_name = "mini_water_nekoron"},
|
||||
36 = {object_name = "objLineSpikeUp", jmap_object_name = "spike_up"},
|
||||
37 = {object_name = "objLineSpikeRight", jmap_object_name = "spike_right"},
|
||||
38 = {object_name = "objLineSpikeLeft", jmap_object_name = "spike_left"},
|
||||
39 = {object_name = "objLineSpikeDown", jmap_object_name = "spike_down"},
|
||||
40 = {object_name = "objMiniLineSpikeUp", jmap_object_name = "spike_up"},
|
||||
41 = {object_name = "objMiniLineSpikeRight", jmap_object_name = "spike_right"},
|
||||
42 = {object_name = "objMiniLineSpikeLeft", jmap_object_name = "spike_left"},
|
||||
43 = {object_name = "objMiniLineSpikeDown", jmap_object_name = "spike_down"},
|
||||
44 = {object_name = "objLineBlockHorizontal", jmap_object_name = "line_block_horizontal"},
|
||||
45 = {object_name = "objLineBlockVertical", jmap_object_name = "line_block_vertical"},
|
||||
46 = {object_name = "objMiniLineBlockHorizontal", jmap_object_name = "mini_line_block_horizontal"},
|
||||
47 = {object_name = "objMiniLineBlockVertical", jmap_object_name = "mini_line_block_vertical"},
|
||||
1 = {object_name = "objBlock", jmap_object_name = "block", width = 32, height = 32},
|
||||
2 = {object_name = "objMiniBlock", jmap_object_name = "mini_block", width = 16, height = 16},
|
||||
3 = {object_name = "objSpikeUp", jmap_object_name = "spike_up", width = 32, height = 32},
|
||||
4 = {object_name = "objSpikeRight", jmap_object_name = "spike_right", width = 32, height = 32},
|
||||
5 = {object_name = "objSpikeLeft", jmap_object_name = "spike_left", width = 32, height = 32},
|
||||
6 = {object_name = "objSpikeDown", jmap_object_name = "spike_down", width = 32, height = 32},
|
||||
7 = {object_name = "objMiniSpikeUp", jmap_object_name = "mini_spike_up", width = 16, height = 16},
|
||||
8 = {object_name = "objMiniSpikeRight", jmap_object_name = "mini_spike_right", width = 16, height = 16},
|
||||
9 = {object_name = "objMiniSpikeLeft", jmap_object_name = "mini_spike_left", width = 16, height = 16},
|
||||
10 = {object_name = "objMiniSpikeDown", jmap_object_name = "mini_spike_down", width = 16, height = 16},
|
||||
11 = {object_name = "objCherry", jmap_object_name = "fruit", width = 32, height = 32},
|
||||
12 = {object_name = "objSave", jmap_object_name = "save", width = 32, height = 32},
|
||||
13 = {object_name = "objPlatform", jmap_object_name = "platform", width = 32, height = 32},
|
||||
14 = {object_name = "objWater1", jmap_object_name = "water_1", width = 32, height = 32},
|
||||
15 = {object_name = "objWater3", jmap_object_name = "water_3", width = 32, height = 32},
|
||||
16 = {object_name = "objVineR", jmap_object_name = "vine_r", width = 32, height = 32},
|
||||
17 = {object_name = "objVineL", jmap_object_name = "vine_l", width = 32, height = 32},
|
||||
18 = {object_name = "objKillerBlock", jmap_object_name = "killer_block", width = 32, height = 32},
|
||||
20 = {object_name = "objPlayerStart", jmap_object_name = "player_start", width = 32, height = 32},
|
||||
21 = {object_name = "objWarp", jmap_object_name = "warp", width = 32, height = 32},
|
||||
22 = {object_name = "objJumpRefresher", jmap_object_name = "jump_refresher", width = 8, height = 8},
|
||||
23 = {object_name = "objWater2", jmap_object_name = "water_2", width = 32, height = 32},
|
||||
24 = {object_name = "objGravityFlipperUp", jmap_object_name = "gravity_flipper_up", width = 32, height = 32},
|
||||
25 = {object_name = "objGravityFlipperDown", jmap_object_name = "gravity_flipper_down", width = 32, height = 32},
|
||||
26 = {object_name = "objSaveFlipped", jmap_object_name = "save_flipped", width = 32, height = 32},
|
||||
27 = {object_name = "objBulletBlocker", jmap_object_name = "bullet_blocker", width = 32, height = 32},
|
||||
28 = {object_name = "objSidewaysPlatform", jmap_object_name = "sideways_platform", width = 32, height = 32},
|
||||
30 = {object_name = "objMiniWater1", jmap_object_name = "mini_water_1", width = 16, height = 16},
|
||||
31 = {object_name = "objMiniWater3", jmap_object_name = "mini_water_3", width = 16, height = 16},
|
||||
32 = {object_name = "objMiniWater2", jmap_object_name = "mini_water_2", width = 16, height = 16},
|
||||
33 = {object_name = "objMiniCatharsisWater", jmap_object_name = "mini_catharsis_water", width = 16, height = 16},
|
||||
34 = {object_name = "objWaterNekoron", jmap_object_name = "water_nekoron", width = 32, height = 32},
|
||||
35 = {object_name = "objMiniWaterNekoron", jmap_object_name = "mini_water_nekoron", width = 16, height = 16},
|
||||
36 = {object_name = "objLineSpikeUp", jmap_object_name = "spike_up", width = 32, height = 32},
|
||||
37 = {object_name = "objLineSpikeRight", jmap_object_name = "spike_right", width = 32, height = 32},
|
||||
38 = {object_name = "objLineSpikeLeft", jmap_object_name = "spike_left", width = 32, height = 32},
|
||||
39 = {object_name = "objLineSpikeDown", jmap_object_name = "spike_down", width = 32, height = 32},
|
||||
40 = {object_name = "objMiniLineSpikeUp", jmap_object_name = "spike_up", width = 32, height = 32},
|
||||
41 = {object_name = "objMiniLineSpikeRight", jmap_object_name = "spike_right", width = 32, height = 32},
|
||||
42 = {object_name = "objMiniLineSpikeLeft", jmap_object_name = "spike_left", width = 32, height = 32},
|
||||
43 = {object_name = "objMiniLineSpikeDown", jmap_object_name = "spike_down", width = 32, height = 32},
|
||||
44 = {object_name = "objLineBlockHorizontal", jmap_object_name = "line_block_horizontal", width = 32, height = 32},
|
||||
45 = {object_name = "objLineBlockVertical", jmap_object_name = "line_block_vertical", width = 32, height = 32},
|
||||
46 = {object_name = "objMiniLineBlockHorizontal", jmap_object_name = "mini_line_block_horizontal", width = 32, height = 32},
|
||||
47 = {object_name = "objMiniLineBlockVertical", jmap_object_name = "mini_line_block_vertical", width = 32, height = 32},
|
||||
}
|
||||
|
|
|
|||
6992
rSatoru.yy
6992
rSatoru.yy
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue