54 Commits

Author SHA1 Message Date
b2187bf0ad perf(server): parallelize entity update loop
Use parallel_do to process entities concurrently via the compute
pool. Switch get_all_session to a thread-safe
tbb::concurrent_vector and make ChunkEntity's ref_count atomic to
avoid data races. Also remove the debug pig spawn from world init.
2026-08-05 20:30:01 +08:00
2aa9d07e43 feat(gameplay): add run mode based thread pool config
Introduce RunMode enum and thread pool sizing helpers for client,
server, and hybrid modes. Add compute pool to server world and pass
mode through server/client initialization.
2026-08-05 19:49:06 +08:00
8ff789c576 feat(gameplay): spawn creatures during chunk generation
Add creature spawning to chunk generation with a configurable
SpawnConfig, including a default pig spawn. Spawning occurs in
the final generation phase and registers entities through the
server world's entity manager.

Also destroy entities when their chunk is unloaded to prevent
orphaned entities and expose the entity manager from ServerWorld.
2026-08-05 16:56:02 +08:00
322fb2fea0 refactor(localization): switch block translations to item naming
Remove the `name_key` field from block definitions and use item-based
localization keys (`item.*.name`) for inventory display. Item data now
stores the localized name at load time.
2026-08-05 15:42:53 +08:00
277aab1b81 feat: add --direct-enter option to skip to world scene
Support a new CLI flag that launches the app directly into the world scene. If no IP is provided, it starts a local server on the specified port and connects to 127.0.0.1; otherwise it connects to the given IP. With this flag enabled, a port must be specified via -p. Also expose SceneManager::push as public so scenes can be pushed immediately when bypassing the normal menu flow.
2026-08-05 15:30:14 +08:00
30b4060fb5 perf(render): skip entities outside loaded chunks 2026-08-05 15:15:01 +08:00
0ffa2804d1 refactor(gameplay): update systems per entity with chunk check
Refactor server entity update flow to process entities individually,
skipping those whose chunk is not loaded. System update methods now
accept a single entity instead of iterating the full registry view,
and `ServerWorld::get_chunk_ref_count` is added to determine if an
entity's chunk is active.
2026-08-05 10:00:52 +08:00
abf1f4db7d feat: add pig spawn egg item
Add pig spawn egg asset and texture, parse spawn egg item kind and creature property, and spawn the configured entity when used on an empty block. Also fix item texture loading to use actual image dimensions and update selected item UI sizing.
2026-08-04 18:00:08 +08:00
1514338144 fix: stabilize block item registration and display
Store item names as owned strings in ItemManager, set block type
property for block items, validate item kind before placement, and
handle items without textures gracefully in inventory UI.
2026-08-04 16:58:57 +08:00
8af30e159d fix(gameplay): use inline const for static EMPTY members
Use inline const for static EMPTY members to avoid ODR and linker issues.
Add missing block_manager.hpp includes in gameplay sources.
2026-08-04 16:20:16 +08:00
0259ca71ce refactor(item): decouple items from block types
The item system now supports an ItemKind and property, allowing item JSON to declare a type instead of assuming every item is a block. BlockManager was moved to its own header, redesigned around concurrent hash maps, and exposes id_from_name(). Texture and UI code now key items by ItemID, while block placement resolves the block type from the item registry.
2026-08-04 16:14:00 +08:00
2358cfd9a4 feat(item): add item manager with JSON asset loading
Implement ItemManager to load and query item definitions from assets/item JSON files. Add ItemData struct, item asset metadata, CMake source registration, and initialize the manager during app startup. Also add AGENTS.md repository guidelines.
2026-08-04 14:24:10 +08:00
5e7c6ec891 refactor(json): migrate from nlohmann to rapidjson
Replace nlohmann::json with rapidjson across localization, hitbox manager, server world, and sensitive filter. Add json_utils helper for converting rapidjson documents to maps, and improve parse error handling.
2026-08-04 13:17:45 +08:00
ef3be12b64 build: replace nlohmann json with rapidjson 2026-08-04 11:51:05 +08:00
67fbbe1229 fix(server_world): send time before entity updates 2026-08-04 11:27:40 +08:00
d970988022 feat(render): interpolate entity transforms for rendering
Add RenderTransform component to smooth position/direction updates
and use it in entity and shadow passes.
2026-08-04 10:59:56 +08:00
e2bbc2d57f feat: sync entity direction and rotate models accordingly
Move direction into the transform component and include it in server-to-client entity updates. Client now sets transform direction from the network message and uses it to compute yaw for model rotation, so entities visually face their movement direction. Refactor net_utils to support arbitrary Vec3 fields.
2026-08-04 10:46:31 +08:00
6b1f9d7354 feat(physics): implement step-up for horizontal collisions 2026-08-02 17:14:13 +08:00
5980400e2e feat(creatures): refine pig movement physics
Add movement constants for pigs and switch deceleration to per-axis friction so creatures stop naturally. Extend wander boost duration for smoother behavior.
2026-08-02 16:36:56 +08:00
9bb1882d92 fix: correct velocity clamping and hitbox loading
Preserve sign when clamping velocity; negative velocities now clamp to zero instead of flipping direction. Support loading hitbox definitions from JSON arrays and objects. Tune pig entity movement, spawn height, and wander probabilities.
2026-08-02 16:14:56 +08:00
a54858e4c6 feat(server): send entity position updates to all sessions 2026-08-02 14:01:56 +08:00
18e308bd03 feat(gameplay): add pig wander AI and refine speed physics 2026-08-02 13:51:01 +08:00
2e4a32fed7 feat(gameplay): add server-side entity movement and AI
Refactor LocalPlayer::update_physical to operate on a passed position, and run speed, physical, and wander AI systems in ServerEntityManager.
2026-07-31 20:51:14 +08:00
c5ce91e653 refactor(ecs): move entity physics to tick-based systems
Update PhysicalSystem and SpeedSystem to operate on entt::registry
instead of individual components. Add TickVelocity for server creatures
so movement is calculated per tick without frame delta time. LocalPlayer
now implements its own client-side physics with collision detection.
2026-07-31 20:39:40 +08:00
412f88565a feat(ai): add wander AI system with move boost
Add AIBase and WanderAITag components, a WanderAISystem, and a MoveBoost component to control wandering behavior. Replace the old MoveState with MoveBoost and include a horizontal random direction helper.
2026-07-31 19:59:33 +08:00
8451921161 feat(gameplay): implement entity update packets
Add S2CEntityUpdate to sync entity positions from server to client, including update handling in the client entity manager and server-side AI updates.
2026-07-31 17:44:33 +08:00
d6f304e6ca feat(entity): add client-to-server entity creation and destruction requests
Extend the network protocol with `C2SEntityCreateRequest` and `C2SEntityDestoryRequest` packets. Refactor entity managers to split public client-facing create/destroy methods that send requests over the network, from internal handlers that process received packets. Add utility functions for converting protobuf Vec3 to glm::vec3.
2026-07-30 15:53:09 +08:00
826c6600d0 feat(gameplay): add entity destruction support 2026-07-30 15:24:19 +08:00
b166bab4f3 feat(gameplay): implement entity system with concurrent task handling and fix model loading 2026-07-30 15:05:56 +08:00
efa49a98b7 refactor(gameplay): replace client thread with timer-based system and add entity manager 2026-07-29 18:17:15 +08:00
3a9ab6a14a feat(gameplay): add entity managers and refactor to ECS components 2026-07-29 18:06:04 +08:00
d15037e7a3 refactor(gameplay): separate player logic into manager and ECS components 2026-07-28 21:00:04 +08:00
0ff5820e6e refactor(gameplay): rename ClientPlayer to LocalPlayer 2026-07-28 18:09:43 +08:00
5e96c1573b build: add entt library 2026-07-28 18:03:51 +08:00
90273e87f2 refactor(gameplay): integrate model and hitbox ID system into Entity
- Introduce HitboxID, EntityID, and ModelID types for safer ID-based lookups
- Replace AABB struct with Hitbox (includes HitboxID)
- Convert ModelManager and HitboxManager to singletons with Handle structs
- Update Entity to store IDs for model and hitbox, removing direct references
- Reorganize creature model assets into subdirectories per entity type
- Add player model (player.glb) and collision data for pig
- Remove ModelManager dependency from App and Renderer
- Add namespace parsing utility for asset paths
- Mark sparse_vector::insert() with [[nodiscard]]
2026-07-28 14:28:22 +08:00
1e106d75a3 refactor(gameplay): extract physics and collision from ClientPlayer into PhysicalSystem
Move per-axis collision detection and move distance calculation to new
PhysicalSystem. Move SpeedSystem implementation from inline header to
separate .cpp file. Add const accessors to Entity. Replace inline AABB
helper with HitboxManager registration of player hitbox using new
PLAYER_SIZE constant. Remove obsolete members and functions from
ClientPlayer.
2026-07-28 11:43:10 +08:00
bd1a9557a5 refactor: move movement logic into SpeedSystem and Entity components 2026-07-28 10:54:13 +08:00
831569cec6 feat(player): split max speed into horizontal/vertical, set spawn pos 2026-07-28 10:10:01 +08:00
a5c1c7d4aa refactor(gameplay): extract Entity base class from ClientPlayer
Move position, walk pose, velocity, orientation, movement, and gravity
fields and their accessors into a new Entity base class. ClientPlayer now
inherits from Entity, removing duplicated members. Also update velocity
handling to use 3D vector per axis and adjust related logic.
2026-07-28 09:27:28 +08:00
802d2ecb5a refactor(gameplay): extract movement, gravity, orientation, and walk pose into structs 2026-07-28 08:53:51 +08:00
ab605f7590 feat(render): add model ID system with concurrent lookup and namespace-based loading
- Extract `ModelID` and `Model` struct to new `model.hpp`
- Replace `std::unordered_map` with `tbb::concurrent_hash_map` for thread safety
- Add `get_model(ModelID)`, `get_model_id`, `get_model_name` methods
- Parse model names in `namespace:name` format to construct asset paths
- Update `load_model` to accept `string_view` and use ID-based management
2026-07-27 21:03:31 +08:00
15d5af34b9 refactor(gameplay): replace entt components with SparseVector for player data
Refactor client world to use a custom SparseVector for player data instead of entt registry. Consolidate Transform, ViewAngles, and related structs into Position, Orientation, WalkPose. Introduce PlayerData and PlayerRenderData. Remove the unused move_system.cpp. Unify player render and shadow render into a single function.
2026-07-27 20:21:44 +08:00
6d0e60e241 build: remove entt library 2026-07-27 09:33:51 +08:00
7b530968af fix(gameplay): correct hitbox insertion in HitboxManager::load 2026-07-25 17:52:13 +08:00
930226cc47 feat(gameplay): implement entity movement system with collision detection
- Add Velocity and HitBoxes components to entity
- Introduce HitboxManager for loading per-entity collision AABBs from JSON
- Create MoveSystem with per-axis collision handling
- Move get_block_aabb to base World class and add virtual get_per_tick_time
- Remove static get_block_aabb from ClientWorld; use member m_per_tick_time for tick duration
2026-07-25 17:47:13 +08:00
f9bf2f4b89 refactor(gameplay): add base classes Chunk and World for shared logic 2026-07-25 15:47:46 +08:00
df3ac5b5db refactor(collision): convert AABB to center-half representation and migrate player data to ECS 2026-07-25 14:53:19 +08:00
2568eb7d18 refactor(render): unify model and player rendering with single shader pipeline 2026-07-25 13:29:52 +08:00
2e3b4f4f0f feat(render): add shadow pass for entity models 2026-07-25 11:57:00 +08:00
5951a5e81c feat(entity): add ECS-based entity rendering 2026-07-25 11:19:27 +08:00
849386a3bc build: add EnTT library 2026-07-25 10:29:04 +08:00
3e7ce71219 refactor(render): rename depth player shaders to depth model and clean up 2026-07-24 19:53:35 +08:00
94fed9a810 feat(render): add model loading and rendering pipeline 2026-07-24 18:35:09 +08:00
f4174724c6 build(deps): add assimp library as dependency 2026-07-24 10:59:05 +08:00
289 changed files with 708 additions and 4462 deletions

1
.gitignore vendored
View File

@@ -14,7 +14,6 @@
*.pch *.pch
*.sbr *.sbr
build/ build/
build_debug/
Build/ Build/
bin/ bin/
Debug/ Debug/

View File

@@ -1,14 +0,0 @@
{
"name": "air",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": true,
"is_passable": true,
"is_discard": true,
"is_blend": false,
"is_transitional": false,
"is_gas": true,
"roughness": 1.0
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "dirt",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": true,
"is_gas": false,
"roughness": 1.0
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/dirt",
"normal": "cubed:normals/blocks/dirt"
},
"sounds": {
"break": "cubed:sounds/blocks/dirt/break.ogg",
"place": "cubed:sounds/blocks/dirt/place.ogg",
"walk": "cubed:sounds/blocks/dirt/walk.ogg"
}
}

View File

@@ -1,22 +0,0 @@
{
"name": "grass",
"properties": {
"is_liquid": false,
"is_cross_plane": true,
"is_transparent": true,
"is_passable": true,
"is_discard": true,
"is_blend": false,
"is_transitional": false,
"is_gas": false,
"roughness": 0.9
},
"texture": {
"type": "cross",
"path": "cubed:textures/blocks/grass"
},
"sounds": {
"break": "cubed:sounds/blocks/grass/break.ogg",
"place": "cubed:sounds/blocks/grass/place.ogg"
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "grass_block",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": true,
"is_gas": false,
"roughness": 0.9
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/grass_block",
"normal": "cubed:normals/blocks/grass_block"
},
"sounds": {
"break": "cubed:sounds/blocks/grass_block/break.ogg",
"place": "cubed:sounds/blocks/grass_block/place.ogg",
"walk": "cubed:sounds/blocks/grass_block/walk.ogg"
}
}

View File

@@ -1,23 +0,0 @@
{
"name": "leaf",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": true,
"is_passable": false,
"is_discard": true,
"is_blend": false,
"is_transitional": false,
"is_gas": false,
"roughness": 0.7
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/leaf"
},
"sounds": {
"break": "cubed:sounds/blocks/leaf/break.ogg",
"place": "cubed:sounds/blocks/leaf/place.ogg",
"walk": "cubed:sounds/blocks/leaf/walk.ogg"
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "log",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": false,
"is_gas": false,
"roughness": 0.7
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/log",
"normal": "cubed:normals/blocks/log"
},
"sounds": {
"break": "cubed:sounds/blocks/log/break.ogg",
"place": "cubed:sounds/blocks/log/place.ogg",
"walk": "cubed:sounds/blocks/log/walk.ogg"
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "sand",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": true,
"is_gas": false,
"roughness": 0.8
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/sand",
"normal": "cubed:normals/blocks/sand"
},
"sounds": {
"break": "cubed:sounds/blocks/sand/break.ogg",
"place": "cubed:sounds/blocks/sand/place.ogg",
"walk": "cubed:sounds/blocks/sand/walk.ogg"
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "snowy_grass_block",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": true,
"is_gas": false,
"roughness": 0.9
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/snowy_grass_block",
"normal": "cubed:normals/blocks/snowy_grass_block"
},
"sounds": {
"break": "cubed:sounds/blocks/snowy_grass_block/break.ogg",
"place": "cubed:sounds/blocks/snowy_grass_block/place.ogg",
"walk": "cubed:sounds/blocks/snowy_grass_block/walk.ogg"
}
}

View File

@@ -1,24 +0,0 @@
{
"name": "stone",
"properties": {
"is_liquid": false,
"is_cross_plane": false,
"is_transparent": false,
"is_passable": false,
"is_discard": false,
"is_blend": false,
"is_transitional": true,
"is_gas": false,
"roughness": 0.75
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/stone",
"normal": "cubed:normals/blocks/stone"
},
"sounds": {
"break": "cubed:sounds/blocks/stone/break.ogg",
"place": "cubed:sounds/blocks/stone/place.ogg",
"walk": "cubed:sounds/blocks/stone/walk.ogg"
}
}

View File

@@ -1,18 +0,0 @@
{
"name": "water",
"properties": {
"is_liquid": true,
"is_cross_plane": false,
"is_transparent": true,
"is_passable": true,
"is_discard": false,
"is_blend": true,
"is_transitional": false,
"is_gas": false,
"roughness": 0.02
},
"texture": {
"type": "cuboid",
"path": "cubed:textures/blocks/water"
}
}

View File

@@ -1,6 +0,0 @@
{
"name": "pig",
"model": "cubed:models/creatures/pig/pig.glb",
"animation": "cubed:models/creatures/pig/animation.json",
"collision": "cubed:models/creatures/pig/collision.json"
}

View File

@@ -1,5 +0,0 @@
{
"name": "player",
"model": "cubed:models/creatures/player/player.glb",
"collision": "cubed:models/creatures/player/collision.json"
}

View File

@@ -1,7 +0,0 @@
{
"name": "air",
"type": "block",
"block": "cubed:air",
"texture": "cubed:textures/items/block/air.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "dirt",
"type": "block",
"block": "cubed:dirt",
"texture": "cubed:textures/items/block/dirt.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "grass",
"type": "block",
"block": "cubed:grass",
"texture": "cubed:textures/items/block/grass.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "grass_block",
"type": "block",
"block": "cubed:grass_block",
"texture": "cubed:textures/items/block/grass_block.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "leaf",
"type": "block",
"block": "cubed:leaf",
"texture": "cubed:textures/items/block/leaf.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "log",
"type": "block",
"block": "cubed:log",
"texture": "cubed:textures/items/block/log.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "pig_spawn_egg",
"type": "spawn_egg",
"creature": "cubed:pig",
"texture": "cubed:textures/items/spawn_egg/pig_spawn_egg.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "sand",
"type": "block",
"block": "cubed:sand",
"texture": "cubed:textures/items/block/sand.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "snowy_grass_block",
"type": "block",
"block": "cubed:snowy_grass_block",
"texture": "cubed:textures/items/block/snowy_grass_block.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "stone",
"type": "block",
"block": "cubed:stone",
"texture": "cubed:textures/items/block/stone.png",
"description": ""
}

View File

@@ -1,7 +0,0 @@
{
"name": "water",
"type": "block",
"block": "cubed:water",
"texture": "cubed:textures/items/block/water.png",
"description": ""
}

View File

@@ -1,33 +0,0 @@
{
"walk": {
"speed": 6.0,
"amplitude": 25.0
},
"run": {
"speed": 12.0,
"amplitude": 40.0
},
"body_bob": 0.03,
"head": {
"node": "Head",
"amplitude": 4.0
},
"legs": [
{
"node": "Foot_FL",
"phase": 0.0
},
{
"node": "Foot_FR",
"phase": 3.14159
},
{
"node": "Foot_HL",
"phase": 3.14159
},
{
"node": "Foot_HR",
"phase": 0.0
}
]
}

View File

@@ -1,16 +0,0 @@
{
"boxes": [
{
"center": [
0,
0.9,
0
],
"half": [
0.3,
0.9,
0.3
]
}
]
}

View File

@@ -1,27 +0,0 @@
{
"blocks": {
"air": 0,
"grass_block": 1,
"dirt": 2,
"stone": 3,
"sand": 4,
"log": 5,
"leaf": 6,
"water": 7,
"snowy_grass_block": 8,
"grass": 9
},
"items": {
"air": 0,
"grass_block": 1,
"dirt": 2,
"stone": 3,
"sand": 4,
"log": 5,
"leaf": 6,
"water": 7,
"snowy_grass_block": 8,
"grass": 9,
"pig_spawn_egg": 10
}
}

View File

@@ -0,0 +1,11 @@
id = 0
is_blend = false
is_cross_plane = false
is_discard = true
is_gas = true
is_liquid = false
is_passable = true
is_transitional = false
is_transparent = true
name = 'air'
roughness = 1.0

View File

@@ -0,0 +1,11 @@
id = 2
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = true
is_transparent = false
name = 'dirt'
roughness = 1.0

View File

@@ -0,0 +1,11 @@
id = 9
is_blend = false
is_cross_plane = true
is_discard = true
is_gas = false
is_liquid = false
is_passable = true
is_transitional = false
is_transparent = true
name = 'grass'
roughness = 0.90000000000000002

View File

@@ -0,0 +1,11 @@
id = 1
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = true
is_transparent = false
name = 'grass_block'
roughness = 0.90000000000000002

View File

@@ -0,0 +1,11 @@
id = 6
is_blend = false
is_cross_plane = false
is_discard = true
is_gas = false
is_liquid = false
is_passable = false
is_transitional = false
is_transparent = true
name = 'leaf'
roughness = 0.69999999999999996

View File

@@ -0,0 +1,11 @@
id = 5
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = false
is_transparent = false
name = 'log'
roughness = 0.69999999999999996

View File

@@ -0,0 +1,11 @@
id = 4
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = true
is_transparent = false
name = 'sand'
roughness = 0.80000000000000004

View File

@@ -0,0 +1,11 @@
id = 8
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = true
is_transparent = false
name = 'snowy_grass_block'
roughness = 0.90000000000000002

View File

@@ -0,0 +1,11 @@
id = 3
is_blend = false
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = false
is_passable = false
is_transitional = true
is_transparent = false
name = 'stone'
roughness = 0.75

View File

@@ -0,0 +1,11 @@
name = "template"
id = 0
is_liquid = false
is_gas = false
is_passable = false
is_cross_plane = false
is_transparent = false
is_discard = false
is_blend = false
is_transitional = false
roughness = 1.0

View File

@@ -0,0 +1,11 @@
id = 7
is_blend = true
is_cross_plane = false
is_discard = false
is_gas = false
is_liquid = true
is_passable = true
is_transitional = false
is_transparent = true
name = 'water'
roughness = 0.02

6
assets/item/air.json Normal file
View File

@@ -0,0 +1,6 @@
{
"id": 0,
"name": "air",
"description": "",
"type": "block"
}

7
assets/item/dirt.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 2,
"name": "dirt",
"description": "",
"texture": "texture/item/block/dirt.png",
"type": "block"
}

7
assets/item/grass.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 9,
"name": "grass",
"description": "",
"texture": "texture/item/block/grass.png",
"type": "block"
}

View File

@@ -0,0 +1,7 @@
{
"id": 1,
"name": "grass_block",
"description": "",
"texture": "texture/item/block/grass_block.png",
"type": "block"
}

7
assets/item/leaf.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 6,
"name": "leaf",
"description": "",
"texture": "texture/item/block/leaf.png",
"type": "block"
}

7
assets/item/log.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 5,
"name": "log",
"description": "",
"texture": "texture/item/block/log.png",
"type": "block"
}

View File

@@ -0,0 +1,8 @@
{
"id": 10,
"name": "pig_spawn_egg",
"description": "",
"texture": "texture/item/spawn_egg/pig_spawn_egg.png",
"type": "spawn_egg",
"creature": "cubed:pig"
}

7
assets/item/sand.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 4,
"name": "sand",
"description": "",
"texture": "texture/item/block/sand.png",
"type": "block"
}

View File

@@ -0,0 +1,7 @@
{
"id": 8,
"name": "snowy_grass_block",
"description": "",
"texture": "texture/item/block/snowy_grass_block.png",
"type": "block"
}

7
assets/item/stone.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 3,
"name": "stone",
"description": "",
"texture": "texture/item/block/stone.png",
"type": "block"
}

7
assets/item/water.json Normal file
View File

@@ -0,0 +1,7 @@
{
"id": 7,
"name": "water",
"description": "",
"texture": "texture/item/block/water.png",
"type": "block"
}

View File

@@ -4,7 +4,6 @@
"menu.main.join_game": "Join Game", "menu.main.join_game": "Join Game",
"menu.main.credits": "Credits", "menu.main.credits": "Credits",
"menu.main.quit": "Quit", "menu.main.quit": "Quit",
"menu.screenshot": "Screenshots",
"menu.main.player_name": "Player: {name}", "menu.main.player_name": "Player: {name}",
"menu.main.cubed_version": "Cubed: {version}", "menu.main.cubed_version": "Cubed: {version}",
"menu.pause.pause_menu": "Pause Menu", "menu.pause.pause_menu": "Pause Menu",
@@ -37,20 +36,15 @@
"joingame.server_ip": "Server Ip", "joingame.server_ip": "Server Ip",
"joingame.join_world": "Join World", "joingame.join_world": "Join World",
"error.disable_voice": "Server Disable Voice Chat", "error.disable_voice": "Server Disable Voice Chat",
"item.cubed.air.name": "air", "item.air.name": "air",
"item.cubed.dirt.name": "dirt", "item.dirt.name": "dirt",
"item.cubed.grass_block.name": "grass block", "item.grass_block.name": "grass block",
"item.cubed.grass.name": "grass", "item.grass.name": "grass",
"item.cubed.leaf.name": "leaf", "item.leaf.name": "leaf",
"item.cubed.log.name": "log", "item.log.name": "log",
"item.cubed.sand.name": "sand", "item.sand.name": "sand",
"item.cubed.snowy_grass_block.name": "snowy grass block", "item.snowy_grass_block.name": "snowy grass block",
"item.cubed.stone.name": "stone", "item.stone.name": "stone",
"item.cubed.water.name": "water", "item.water.name": "water",
"item.cubed.pig_spawn_egg.name": "pig spawn egg", "item.pig_spawn_egg.name": "pig spawn egg"
"screenshot.no_screenshot": "No Screenshot",
"button.show_in_file_manager": "Show In File Manager",
"file.sort_type": "File Sort Type: {type}",
"file.newest_first": "Newest First",
"file.oldest_first": "Oldest First"
} }

View File

@@ -4,7 +4,6 @@
"menu.main.join_game": "加入游戏", "menu.main.join_game": "加入游戏",
"menu.main.credits": "制作人员", "menu.main.credits": "制作人员",
"menu.main.quit": "退出", "menu.main.quit": "退出",
"menu.screenshot": "屏幕截图",
"menu.main.player_name": "玩家:{name}", "menu.main.player_name": "玩家:{name}",
"menu.main.cubed_version": "Cubed{version}", "menu.main.cubed_version": "Cubed{version}",
"menu.pause.pause_menu": "暂停菜单", "menu.pause.pause_menu": "暂停菜单",
@@ -37,20 +36,15 @@
"joingame.server_ip": "服务器IP", "joingame.server_ip": "服务器IP",
"joingame.join_world": "加入世界", "joingame.join_world": "加入世界",
"error.disable_voice": "服务器已禁用语音聊天", "error.disable_voice": "服务器已禁用语音聊天",
"item.cubed.air.name": "空气", "item.air.name": "空气",
"item.cubed.dirt.name": "泥土", "item.dirt.name": "泥土",
"item.cubed.grass_block.name": "草方块", "item.grass_block.name": "草方块",
"item.cubed.grass.name": "草", "item.grass.name": "草",
"item.cubed.leaf.name": "树叶", "item.leaf.name": "树叶",
"item.cubed.log.name": "原木", "item.log.name": "原木",
"item.cubed.sand.name": "沙子", "item.sand.name": "沙子",
"item.cubed.snowy_grass_block.name": "覆雪草方块", "item.snowy_grass_block.name": "覆雪草方块",
"item.cubed.stone.name": "石头", "item.stone.name": "石头",
"item.cubed.water.name": "水", "item.water.name": "水",
"item.cubed.pig_spawn_egg.name": "猪猪刷怪蛋", "item.pig_spawn_egg.name": "猪猪刷怪蛋"
"screenshot.no_screenshot": "没有截图",
"button.show_in_file_manager": "在文件管理器中显示",
"file.sort_type": "文件排序方式:{type}",
"file.newest_first": "最新在前",
"file.oldest_first": "最旧在前"
} }

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 955 B

After

Width:  |  Height:  |  Size: 955 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 955 B

After

Width:  |  Height:  |  Size: 955 B

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -1,13 +0,0 @@
#version 460
layout (location = 0) in vec3 pos;
layout (location = 1) in vec2 texCoord;
layout (location = 3) in mat4 modelMatrix;
uniform mat4 lightSpaceMatrix;
out vec2 tc;
void main() {
tc = texCoord;
gl_Position = lightSpaceMatrix * modelMatrix * vec4(pos, 1.0);
}

View File

@@ -1,14 +0,0 @@
#version 460
layout (location = 0) in vec3 pos;
layout (location = 1) in vec2 texCoord;
uniform mat4 lightSpaceMatrix;
uniform mat4 modelMatrix;
out vec2 tc;
void main() {
tc = texCoord;
gl_Position = lightSpaceMatrix * modelMatrix * vec4(pos, 1.0);
}

View File

@@ -1,26 +0,0 @@
#version 460
layout (location = 0) in vec3 pos;
layout (location = 1) in vec2 texCoord;
layout (location = 2) in vec3 aNormal;
layout (location = 3) in mat4 modelMatrix;
uniform mat4 view_matrix;
uniform mat4 proj_matrix;
uniform mat4 lightSpaceMatrix;
out vec4 FragPosLightSpace;
out vec3 normal;
out vec2 tc;
out vec3 vert_pos;
void main() {
vec4 worldPos = modelMatrix * vec4(pos, 1.0);
FragPosLightSpace = lightSpaceMatrix * worldPos;
mat4 mv_matrix= view_matrix * modelMatrix;
mat4 norm_matrix = transpose(inverse(mv_matrix));
vec4 viewPos = mv_matrix * vec4(pos, 1.0);
tc = texCoord;
vert_pos = pos;
normal = normalize(mat3(norm_matrix) * aNormal);
gl_Position = proj_matrix * viewPos;
}

Some files were not shown because too many files have changed in this diff Show More