Skip to content
Open
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
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.20)

project(Caffeine VERSION 0.1.0 LANGUAGES CXX C)

# Third-party static libs (Bullet, Lua, ...) end up inside libcaffeine-capi.so, so every
# object must be position independent.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -462,11 +466,19 @@ if(CAFFEINE_ENABLE_SCRIPTING)
src/caffeine/script/RuntimeScriptBindings.cpp
src/caffeine/script/AssetTextLoader.cpp
src/caffeine/script/NativeModuleHost.cpp
src/caffeine/script/WorldApiBindings.cpp
src/caffeine/script/Physics3DBindings.cpp
src/caffeine/script/AudioSceneBindings.cpp
src/caffeine/audio/AudioService.cpp
)
if(DRYAD_AVAILABLE)
target_sources(caffeine-core PRIVATE
src/caffeine/script/DryadHost.cpp
src/caffeine/script/DryadComponentBindings.cpp
src/caffeine/script/DryadRuntimeBindings.cpp
src/caffeine/script/DryadWorldBindings.cpp
src/caffeine/script/DryadPhysics3DBindings.cpp
src/caffeine/script/DryadAudioSceneBindings.cpp
src/caffeine/script/nodes/NodeGraph.cpp
src/caffeine/script/nodes/NodeCatalog.cpp
src/caffeine/script/nodes/NodeEmitter.cpp
Expand Down
39 changes: 39 additions & 0 deletions apps/runtime/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "events/Events.hpp"
#include "input/InputManager.hpp"
#include "physics/PhysicsSystem2D.hpp"
#include "audio/AudioService.hpp"
#include "physics/PhysicsSystem3D.hpp"
#include "script/ScriptEngine.hpp"
#include "script/ScriptSystem.hpp"
#include "scene/NaturalFluidSystem.hpp"
Expand Down Expand Up @@ -461,6 +463,10 @@ int main(int argc, char** argv) {
Caffeine::Input::InputManager input;
Caffeine::Events::EventBus eventBus;
Caffeine::Physics2D::PhysicsSystem2D physics(&eventBus);
Caffeine::Physics3D::PhysicsSystem3D physics3d;
Caffeine::Audio::AudioService audio;
audio.setSearchRoot(buildRoot.string());
if (!audio.init()) std::fprintf(stderr, "caffeine-runtime: no audio device, sound disabled\n");
Caffeine::Animation::AnimationSystem animation;
Caffeine::UI::UISystem uiSystem(&eventBus);
Caffeine::Script::ScriptEngine scriptEngine;
Expand All @@ -469,8 +475,11 @@ int main(int argc, char** argv) {
scriptParams.input = &input;
scriptParams.events = &eventBus;
scriptParams.ui = &uiSystem;
scriptParams.physics3d = &physics3d.world();
scriptParams.audio = &audio;
const bool scriptsReady = scriptEngine.init(scriptParams);
scriptEngine.setSearchRoot(buildRoot.string());
scriptEngine.sceneRequests().setCurrent(config.LastScene);
Caffeine::Script::ScriptSystem scriptSystem(scriptsReady ? &scriptEngine : nullptr, &eventBus);
if (!config.RootPath.empty()) {
scriptSystem.setProjectRoot(config.RootPath.string());
Expand Down Expand Up @@ -549,11 +558,41 @@ int main(int argc, char** argv) {
Caffeine::Scene::tickNaturalFluids(world, dt, false);
Caffeine::Navigation::updateNavigation(world, dt);
physics.onUpdate(world, dt);
physics3d.onUpdate(world, dt);
if (scriptsReady) {
scriptEngine.setWorld(&world);
scriptEngine.setInput(&input);
scriptSystem.onUpdate(world, dt);

// A script asked for another scene: swap it now, between frames' scripts.
auto& sceneRequests = scriptEngine.sceneRequests();
if (sceneRequests.hasPending()) {
const std::string requested = sceneRequests.take();
std::filesystem::path next(requested);
if (!std::filesystem::exists(next)) next = buildRoot / requested;
if (std::filesystem::exists(next)) {
physics3d.reset();
Caffeine::Editor::SceneSerializer serializer(world);
if (serializer.deserialize(next.string())) {
Caffeine::Scene::resetNaturalFluidRuntime();
scriptSystem.resetPlayState();
audio.stopAll();
sceneRequests.setCurrent(requested);
scenePath = next;
sceneLoaded = true;
#ifdef CF_HAS_IMGUI
editorCtx.currentScenePath = scenePath.string();
#endif
std::printf("Loaded scene: %s\n", next.string().c_str());
} else {
std::fprintf(stderr, "caffeine-runtime: scene failed to load: %s\n", next.string().c_str());
}
} else {
std::fprintf(stderr, "caffeine-runtime: scene not found: %s\n", requested.c_str());
}
}
}
audio.update(dt);
Caffeine::Procedural::ProceduralWorldSystem::update(world);
uiSystem.onUpdate(world, dt);
}
Expand Down
2 changes: 1 addition & 1 deletion caf-pack
2 changes: 1 addition & 1 deletion caffeine-website
Submodule caffeine-website updated 79 files
+3 −0 .dockerignore
+2 −0 .gitignore
+14 −0 Dockerfile
+34 −0 README.md
+1 −3 content/en/docs/architecture/cafpack.md
+149 −0 content/en/docs/scripting/api-roadmap.md
+201 −0 content/en/docs/scripting/api/animation.md
+39 −0 content/en/docs/scripting/api/assets.md
+326 −0 content/en/docs/scripting/api/audio.md
+386 −0 content/en/docs/scripting/api/component.md
+39 −0 content/en/docs/scripting/api/core.md
+89 −0 content/en/docs/scripting/api/debug.md
+148 −0 content/en/docs/scripting/api/draw2d.md
+178 −0 content/en/docs/scripting/api/effects.md
+140 −0 content/en/docs/scripting/api/entity.md
+91 −0 content/en/docs/scripting/api/events.md
+174 −0 content/en/docs/scripting/api/forwardrender.md
+111 −0 content/en/docs/scripting/api/gameState.md
+165 −0 content/en/docs/scripting/api/hierarchy.md
+78 −0 content/en/docs/scripting/api/index.md
+247 −0 content/en/docs/scripting/api/input.md
+41 −0 content/en/docs/scripting/api/map.md
+615 −0 content/en/docs/scripting/api/math.md
+66 −0 content/en/docs/scripting/api/native.md
+148 −0 content/en/docs/scripting/api/navigation.md
+40 −0 content/en/docs/scripting/api/particles.md
+196 −0 content/en/docs/scripting/api/physics3d.md
+213 −0 content/en/docs/scripting/api/pick.md
+770 −0 content/en/docs/scripting/api/postprocess.md
+343 −0 content/en/docs/scripting/api/procedural.md
+134 −0 content/en/docs/scripting/api/random.md
+93 −0 content/en/docs/scripting/api/scene.md
+133 −0 content/en/docs/scripting/api/session.md
+237 −0 content/en/docs/scripting/api/time.md
+174 −0 content/en/docs/scripting/api/ui.md
+706 −0 content/en/docs/scripting/api/world.md
+2 −0 content/en/docs/scripting/scripting.md
+1 −3 content/pt/docs/architecture/cafpack.md
+149 −0 content/pt/docs/scripting/api-roadmap.md
+201 −0 content/pt/docs/scripting/api/animation.md
+39 −0 content/pt/docs/scripting/api/assets.md
+326 −0 content/pt/docs/scripting/api/audio.md
+386 −0 content/pt/docs/scripting/api/component.md
+39 −0 content/pt/docs/scripting/api/core.md
+89 −0 content/pt/docs/scripting/api/debug.md
+148 −0 content/pt/docs/scripting/api/draw2d.md
+178 −0 content/pt/docs/scripting/api/effects.md
+140 −0 content/pt/docs/scripting/api/entity.md
+91 −0 content/pt/docs/scripting/api/events.md
+174 −0 content/pt/docs/scripting/api/forwardrender.md
+111 −0 content/pt/docs/scripting/api/gameState.md
+165 −0 content/pt/docs/scripting/api/hierarchy.md
+78 −0 content/pt/docs/scripting/api/index.md
+247 −0 content/pt/docs/scripting/api/input.md
+41 −0 content/pt/docs/scripting/api/map.md
+615 −0 content/pt/docs/scripting/api/math.md
+66 −0 content/pt/docs/scripting/api/native.md
+148 −0 content/pt/docs/scripting/api/navigation.md
+40 −0 content/pt/docs/scripting/api/particles.md
+196 −0 content/pt/docs/scripting/api/physics3d.md
+213 −0 content/pt/docs/scripting/api/pick.md
+770 −0 content/pt/docs/scripting/api/postprocess.md
+343 −0 content/pt/docs/scripting/api/procedural.md
+134 −0 content/pt/docs/scripting/api/random.md
+93 −0 content/pt/docs/scripting/api/scene.md
+133 −0 content/pt/docs/scripting/api/session.md
+237 −0 content/pt/docs/scripting/api/time.md
+174 −0 content/pt/docs/scripting/api/ui.md
+706 −0 content/pt/docs/scripting/api/world.md
+2 −0 content/pt/docs/scripting/scripting.md
+22 −0 nginx.conf
+21 −0 package.json
+936 −0 pnpm-lock.yaml
+243 −0 site/assets/app.js
+1 −0 site/assets/logo.svg
+440 −0 site/assets/style.css
+629 −0 site/build.mjs
+73 −0 site/config.json
+514 −0 site/templates.mjs
1 change: 1 addition & 0 deletions doppio/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion doppio/crates/ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ roxmltree = "0.20"
serde = { version = "1", features = ["derive"] }
serde_json.workspace = true
zip = { version = "9.0", default-features = false, features = ["deflate"] }
iced-code-editor = "0.5.3"
iced-code-editor = { version = "0.5.3", features = ["lsp-process"] }
iced_test = { workspace = true, optional = true }
fontdue = { version = "0.9", optional = true }

Expand Down
34 changes: 33 additions & 1 deletion doppio/crates/ui/src/bin/doppio-material.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn usage() -> ! {
doppio-material texset-export <file.texset> --out DIR [--preset NAME]\n \
doppio-material bake-preset <NAME|--all> --out DIR [--size 512] [--depth 0.04] [--list|--slugs]\n \
doppio-material nature <NAME|--all> --out DIR [--quality 0|1|2] [--seed N] [--list]\n \
doppio-material bake-texture <NAME|FILE.texgraph|--all> --out DIR [--size 512] [--bits 8|16] [--flipbook CxR] [--list|--slugs]"
doppio-material variants <FILE.generator.nature> --out DIR [--count 4] [--seed 1] [--quality 0|1|2]\n doppio-material bake-texture <NAME|FILE.texgraph|--all> --out DIR [--size 512] [--bits 8|16] [--flipbook CxR] [--list|--slugs]"
);
std::process::exit(2);
}
Expand All @@ -41,6 +41,7 @@ fn main() {
"bake-preset" => bake_preset(&args[1..]),
"bake-texture" => bake_texture(&args[1..]),
"nature" => nature_models(&args[1..]),
"variants" => recipe_variants(&args[1..]),
_ => usage(),
};
if let Err(error) = result {
Expand Down Expand Up @@ -570,6 +571,37 @@ fn bake_texture(args: &[String]) -> Result<(), String> {
}

/// Exports Nature Generator presets as `.obj` files (one per part) plus their `.nature` recipe.
/// `variants <Name.generator.nature> --out DIR [--count 4] [--seed 1] [--quality 0|1|2]`:
/// bakes seeded variants of a nature recipe into a content-addressed cache folder.
fn recipe_variants(args: &[String]) -> Result<(), String> {
use doppio_ui::uikit::{nature, recipe_ref};
let recipe = positional(args).ok_or_else(|| "name a .generator.nature file".to_owned())?;
let out = argument(args, "--out")
.map(PathBuf::from)
.ok_or_else(|| "expected --out DIR".to_owned())?;
let count: u32 = argument(args, "--count")
.and_then(|value| value.parse().ok())
.unwrap_or(4);
let seed: u64 = argument(args, "--seed")
.and_then(|value| value.parse().ok())
.unwrap_or(1);
let quality = argument(args, "--quality")
.and_then(|value| value.parse::<usize>().ok())
.map(nature::Quality::from_index);
for baked in
recipe_ref::nature_variants(std::path::Path::new(recipe), seed, count, quality, &out)?
{
println!(
"{:016x} seed {:<5} {} {}",
baked.key,
baked.seed,
if baked.cached { "cached" } else { "baked " },
baked.directory.display()
);
}
Ok(())
}

fn nature_models(args: &[String]) -> Result<(), String> {
use doppio_ui::uikit::nature;
let presets = nature::presets();
Expand Down
2 changes: 1 addition & 1 deletion doppio/crates/ui/src/uikit/asset_wizard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! be tested with temp directories and never touches the engine. The wizard
//! panel and `App` only translate messages into these calls.
//!
//! Raw assets live under the project asset root (`assets/raw`). The engine
//! Raw assets live under the project asset root (`Assets/Raw`). The engine
//! recognises them by extension (see `assetKind` in the C ABI); `caf-pack`
//! turns that raw tree into the `.cap` archive shipped with a game.

Expand Down
29 changes: 27 additions & 2 deletions doppio/crates/ui/src/uikit/components/code_editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
//! pane on a stable component boundary and gives the editor a queryable id.

use crate::uikit::theme;
use iced::widget::container;
use iced::{Element, Length};
use iced::widget::{container, stack};
use iced::{Element, Length, Theme};
use std::sync::OnceLock;

pub fn view<'a, Message: Clone + 'a>(
id: impl Into<iced::widget::Id>,
Expand All @@ -21,3 +22,27 @@ pub fn view<'a, Message: Clone + 'a>(
.style(theme::surface)
.into()
}

fn overlay_theme() -> &'static Theme {
static THEME: OnceLock<Theme> = OnceLock::new();
THEME.get_or_init(|| Theme::Dark)
}

/// The editor with a floating reference card (hover tooltip) above it.
pub fn view_with_reference<'a, Message: Clone + 'a>(
id: impl Into<iced::widget::Id>,
editor: &'a iced_code_editor::CodeEditor,
overlay: &'a iced_code_editor::LspOverlayState,
on_action: impl Fn(iced_code_editor::Message) -> Message + 'a,
on_overlay: impl Fn(iced_code_editor::LspOverlayMessage) -> Message + 'a,
) -> Element<'a, Message> {
let card = iced_code_editor::view_lsp_overlay(
overlay,
editor,
overlay_theme(),
14.0,
20.0,
on_overlay,
);
stack![view(id, editor, on_action), card].into()
}
144 changes: 143 additions & 1 deletion doppio/crates/ui/src/uikit/components/gizmo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub struct Target {
pub scale: [f32; 3],
}

#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy, PartialEq)]
pub enum Edit {
Move {
axis: Axis,
Expand Down Expand Up @@ -190,6 +190,73 @@ impl Edit {
}
}

/// Grid steps used when snapping is on: metres, degrees and a scale factor.
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct SnapSteps {
pub translate: f32,
pub rotate: f32,
pub scale: f32,
}

impl Default for SnapSteps {
fn default() -> Self {
Self {
translate: 0.25,
rotate: 15.0,
scale: 0.1,
}
}
}

fn round_to(value: f32, step: f32) -> f32 {
if step <= 0.0 {
value
} else {
// `+ 0.0` turns a negative zero into zero so history keys and text stay clean.
(value / step).round() * step + 0.0
}
}

impl Edit {
/// The same edit with the handle's own values moved onto the grid. Only the coordinates the
/// handle controls are snapped, so dragging X never nudges Y or Z.
pub fn snapped(&self, steps: SnapSteps) -> Edit {
match *self {
Edit::Move { axis, mut position } => {
let i = axis.index();
position[i] = round_to(position[i], steps.translate);
Edit::Move { axis, position }
}
Edit::MovePlane {
plane,
mut position,
} => {
let (a, b) = plane.spans();
for axis in [a, b] {
position[axis.index()] = round_to(position[axis.index()], steps.translate);
}
Edit::MovePlane { plane, position }
}
Edit::Rotate { axis, mut rotation } => {
let i = axis.index();
rotation[i] = round_to(rotation[i], steps.rotate);
Edit::Rotate { axis, rotation }
}
Edit::Scale { axis, mut scale } => {
let i = axis.index();
scale[i] = round_to(scale[i], steps.scale).max(steps.scale.max(0.01));
Edit::Scale { axis, scale }
}
Edit::ScaleUniform { scale } => {
let value = round_to(scale[0], steps.scale).max(steps.scale.max(0.01));
Edit::ScaleUniform {
scale: [value, value, value],
}
}
}
}
}

#[derive(Debug, Clone)]
pub enum Message {
Changed(Edit),
Expand Down Expand Up @@ -1370,3 +1437,78 @@ mod tests {
);
}
}

#[cfg(test)]
mod snap_tests {
use super::*;

#[test]
fn moving_one_axis_only_snaps_that_axis() {
let edit = Edit::Move {
axis: Axis::X,
position: [1.13, 2.37, -0.61],
};
let Edit::Move { position, .. } = edit.snapped(SnapSteps::default()) else {
panic!("still a move");
};
assert_eq!(position, [1.25, 2.37, -0.61]);
}

#[test]
fn plane_moves_snap_both_coordinates_of_the_plane() {
let edit = Edit::MovePlane {
plane: Plane::XZ,
position: [0.9, 5.55, -1.1],
};
let Edit::MovePlane { position, .. } = edit.snapped(SnapSteps::default()) else {
panic!("still a plane move");
};
assert_eq!(position, [1.0, 5.55, -1.0]);
}

#[test]
fn rotation_snaps_to_degrees_and_never_leaves_negative_zero() {
let edit = Edit::Rotate {
axis: Axis::Y,
rotation: [3.0, 37.4, -2.0],
};
let Edit::Rotate { rotation, .. } = edit.snapped(SnapSteps::default()) else {
panic!("still a rotation");
};
assert_eq!(rotation, [3.0, 30.0, -2.0]);
assert!(round_to(-0.01, 15.0).is_sign_positive());
}

#[test]
fn scale_snaps_and_never_reaches_zero() {
let Edit::ScaleUniform { scale } = (Edit::ScaleUniform {
scale: [0.012, 0.012, 0.012],
})
.snapped(SnapSteps::default()) else {
panic!("still uniform");
};
assert_eq!(scale, [0.1, 0.1, 0.1]);
let Edit::Scale { scale, .. } = (Edit::Scale {
axis: Axis::Z,
scale: [1.0, 1.0, 2.46],
})
.snapped(SnapSteps::default()) else {
panic!("still a scale");
};
assert_eq!(scale, [1.0, 1.0, 2.5]);
}

#[test]
fn a_zero_step_leaves_values_alone() {
let steps = SnapSteps {
translate: 0.0,
rotate: 0.0,
scale: 0.0,
};
let edit = Edit::Move {
axis: Axis::Z,
position: [0.1, 0.2, 0.3],
};
assert_eq!(edit.snapped(steps), edit);
}
}
Loading
Loading