Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
298 changes: 241 additions & 57 deletions Cargo.lock

Large diffs are not rendered by default.

44 changes: 31 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
name = "dotrix"
version = "0.6.0"
authors = [
"Elias Kartašov <elias@lowenware.com>",
"Štěpán Wünsch <sw@lowenware.com>",
"Nikita Zemtsov <z-nik@ya.ru>",
"Elias Kartašov <elias@lowenware.com>",
"Štěpán Wünsch <sw@lowenware.com>",
"Nikita Zemtsov <z-nik@ya.ru>",
]
edition = "2021"
description = "3D Engine"
Expand All @@ -18,27 +18,45 @@ path = "src/lib.rs"
name = "demo"
path = "demo/main.rs"

[[bin]]
name = "dotrix-terrain"
path = "utils/terrain/main.rs"
required-features = ["terrain"]

[features]
default = []
default = ["terrain"]
terrain = [
"dep:noise",
"dep:rand",
"dep:num",
"dep:structopt",
"dep:toml",
"dep:serde",
]

[dependencies]
rand = "0.8"
bytemuck = { version = "1.4", features = ["derive"] }
image = "0.25"
uuid = { version = "1.1", features = ["v4"] }
log = "0.4.20"
once_cell = "1.18.0"
futures = {version = "0.3", default-features = false, features = ["std", "executor"]}
raw-window-handle = {version = "0.6.1"}
winit = {version = "0.30.5", features = ["serde", "rwh_06"]}
futures = { version = "0.3", default-features = false, features = [
"std",
"executor",
] }
raw-window-handle = { version = "0.6.1" }
winit = { version = "0.30.5", features = ["serde", "rwh_06"] }
bitflags = "2.4.1"
ash = "0.38.0"
ash-window = "0.13.0"
gltf = "1.4.1"
base64 = "0.22.0"
glam = { version = "0.27.0", features = ["bytemuck"] }
genmesh = "0.6.2"

[dev-dependencies]
#noise = { version = "0.8" }
#bytemuck = { version = "1.4", features = ["derive"] }
genmesh = "0.6.2" # TODO: make optional
# optional
noise = { version = "0.9.0", optional = true }
num = { version = "0.4", optional = true }
rand = { version = "0.8.4", features = ["small_rng"], optional = true }
structopt = { version = "0.3", optional = true }
toml = { version = "0.8", optional = true }
serde = { version = "1.0", optional = true }
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ glslc -fshader-stage=vertex src/models/shaders/only_mesh.vert -o src/models/shad
glslc -fshader-stage=fragment src/models/shaders/only_mesh.frag -o src/models/shaders/only_mesh.frag.spv
glslc -fshader-stage=vertex src/models/shaders/skin_mesh.vert -o src/models/shaders/skin_mesh.vert.spv
glslc -fshader-stage=fragment src/models/shaders/skin_mesh.frag -o src/models/shaders/skin_mesh.frag.spv
glslc -fshader-stage=vertex src/features/terrain/shaders/terrain.vert -o src/features/terrain/shaders/terrain.vert.spv
glslc -fshader-stage=fragment src/features/terrain/shaders/terrain.frag -o src/features/terrain/shaders/terrain.frag.spv
```

## Sponsors
Expand Down
14 changes: 14 additions & 0 deletions configs/terrain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name = "terrain"
size = 1024

[noise]
octaves = 4
persistence = 0.5 # 0..1
lacunarity = 2.0 # > 1
scale = 250.0
offset = [0.0, 0.0]
seed = 0

[falloff]
power = 2.6
factor = 2.4
8 changes: 0 additions & 8 deletions features/vulkan/Cargo.toml

This file was deleted.

14 changes: 0 additions & 14 deletions features/vulkan/src/lib.rs

This file was deleted.

2 changes: 2 additions & 0 deletions src/features.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#[cfg(feature = "terrain")]
pub mod terrain;
Loading
Loading