Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
charliewhitfield committed Sep 11, 2024
2 parents b0fc1c8 + 5c2ee46 commit 22c6e37
Show file tree
Hide file tree
Showing 45 changed files with 1,239 additions and 205 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
export.cfg
export_presets.cfg
*.translation
/ivoyager_assets/
/addons/ivoyager_assets/
/export/
~*

Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "ivoyager"]
path = ivoyager
url = https://github.com/ivoyager/ivoyager
[submodule "addons/ivoyager_table_importer"]
path = addons/ivoyager_table_importer
url = https://github.com/ivoyager/ivoyager_table_importer
[submodule "addons/ivoyager_core"]
path = addons/ivoyager_core
url = https://github.com/ivoyager/ivoyager_core
14 changes: 11 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@

File format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## v0.2 - Not Released
## v0.3 - 2024-09-11

Under development using Godot 4.1.1, ivoyager 0.0.16-dev.
Developed for Godot 4.3, ivoyager_core 0.0.19.dev

## Changed
* Rings exports separate LOD files to support Godot 4.3.
* Asteroids converter reads epoch from source data and tests consistency.


## v0.2 - 2023-09-25

Developed for Godot 4.1.1, ivoyager 0.0.16-dev.

## Changed
* Asteroid binaries restructured for ivoyager 0.0.16-dev.20230925
Expand All @@ -18,4 +27,3 @@ Developed for Godot 3.5.2, ivoyager 0.0.14.
### Added
* Exports binaries for use in ivoyager_assets/asteroid_binaries/.
* Exports Saturn rings texture for use in ivoyager_assets/rings/.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# ivbinary_maker

v0.3.dev exports for ivoyager_core v0.0.19.dev
v0.2 exports for ivoyager v0.0.16.

Converts raw source data into binary and texture files for use in I, Voyager.
Expand Down
1 change: 1 addition & 0 deletions addons/ivoyager_core
Submodule ivoyager_core added at db6fdd
2 changes: 0 additions & 2 deletions ivbinary_export/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Exported binaries directories.

The export directories have the correct name for copy into 'ivoyager_assets'. You may need to cull the results. E.g., asteroids_binaries should be filtered by magnitude.


34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.0.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cq0p2i1kvdccp"
path="res://.godot/imported/saturn.rings.backscatter.0.png-467bd241b90f04c28b3751df82ef7028.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.0.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.0.png-467bd241b90f04c28b3751df82ef7028.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dvuy666eywuqe"
path="res://.godot/imported/saturn.rings.backscatter.1.png-3129845ea4b3f6007b8b49f30a3036e0.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.1.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.1.png-3129845ea4b3f6007b8b49f30a3036e0.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.2.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dplundd2m8b6f"
path="res://.godot/imported/saturn.rings.backscatter.2.png-76b17285d72e5be1ec6d05bef1c3b5b8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.2.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.2.png-76b17285d72e5be1ec6d05bef1c3b5b8.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.3.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cv4nhq4muxd8o"
path="res://.godot/imported/saturn.rings.backscatter.3.png-acb1d1ad29a5f921cd656d8a88a3972f.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.3.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.3.png-acb1d1ad29a5f921cd656d8a88a3972f.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

importer="texture"
type="CompressedTexture2D"
uid="uid://mnlf3tdh54hf"
path="res://.godot/imported/saturn.rings.backscatter.png-a28b8c5f60b21783f1c75010be6c491b.ctex"
uid="uid://hey4m3cdxua3"
path="res://.godot/imported/saturn.rings.backscatter.4.png-0004e0bce1d8742de5c4a1d9d9a6646c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.png-a28b8c5f60b21783f1c75010be6c491b.ctex"]
source_file="res://ivbinary_export/rings/saturn.rings.backscatter.4.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.4.png-0004e0bce1d8742de5c4a1d9d9a6646c.ctex"]

[params]

Expand All @@ -21,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
Expand Down
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.5.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://caime4o0qj736"
path="res://.godot/imported/saturn.rings.backscatter.5.png-f087073d77907edf86868589c8a41285.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.5.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.5.png-f087073d77907edf86868589c8a41285.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.6.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://hfvykr6vnuph"
path="res://.godot/imported/saturn.rings.backscatter.6.png-bf45e6c69e48768b7cacf4722fd8d1b8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.6.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.6.png-bf45e6c69e48768b7cacf4722fd8d1b8.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.7.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cad16wtcuqcgs"
path="res://.godot/imported/saturn.rings.backscatter.7.png-9f84b2ac67d08c963dfe04662b47c951.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.7.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.7.png-9f84b2ac67d08c963dfe04662b47c951.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
34 changes: 34 additions & 0 deletions ivbinary_export/rings/saturn.rings.backscatter.8.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://biuyxfoexuyul"
path="res://.godot/imported/saturn.rings.backscatter.8.png-fd0a368bc7d8d1292b4ed22efe1ff7f5.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://ivbinary_export/rings/saturn.rings.backscatter.8.png"
dest_files=["res://.godot/imported/saturn.rings.backscatter.8.png-fd0a368bc7d8d1292b4ed22efe1ff7f5.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
process/fix_alpha_border=false
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Loading

0 comments on commit 22c6e37

Please sign in to comment.