protectorate
/
game
2
0
Fork 0
Code Issues 3 Pull Requests 1 Packages Projects Releases Wiki Activity

Editor Terrain Brush #2

Merged
kayomn merged 27 commits from editor-terrain-brush into main 2023-01-19 01:51:25 +01:00
Conversation 4 Commits 27 Files Changed 62 +1107 -277
kayomn commented 2023-01-12 02:39:06 +01:00
Owner
Copy Link

Fixes:

  • Editor brush not scaling properly with respect to set brush radius.

  • Terrain brush editing remaining active after the terrain toolbox has been minimized.

Adds:

  • Way to change textures used by color channels under the "Texturing" section of the "Terrain Toolbox".

  • Support for raster-based terrain brush masks, with a basic "soft" and "hard" circular brush for now.

  • TerrainMaterial resource type for easier interaction when setting up materials on a TerrainInstance in-editor and in-script.

Fixes: * [x] Editor brush not scaling properly with respect to set brush radius. * [x] Terrain brush editing remaining active after the terrain toolbox has been minimized. Adds: * [x] Way to change textures used by color channels under the "Texturing" section of the "Terrain Toolbox". * [x] Support for raster-based terrain brush masks, with a basic "soft" and "hard" circular brush for now. * ~~`TerrainMaterial` resource type for easier interaction when setting up materials on a `TerrainInstance` in-editor and in-script.~~
kayomn self-assigned this 2023-01-12 02:39:31 +01:00
kayomn added this to the Editor Iteration 1 milestone 2023-01-12 02:39:34 +01:00
kayomn commented 2023-01-12 16:41:24 +01:00
Author
Owner
Copy Link

Work to fix brush mode always being active should also be included as part of this PR, as that is going to be needed sooner rather than later.

Work to fix brush mode always being active should also be included as part of this PR, as that is going to be needed sooner rather than later.
kayomn added 1 commit 2023-01-12 16:47:53 +01:00
kayomn commented 2023-01-12 16:58:12 +01:00
Author
Owner
Copy Link

A regression has been spotted with terrain sampling that was introduced in #1. Fixing that as part of this PR.

A regression has been spotted with terrain sampling that was introduced in #1. Fixing that as part of this PR.
kayomn added 2 commits 2023-01-12 16:59:11 +01:00
kayomn added 1 commit 2023-01-12 17:05:30 +01:00
kayomn added 1 commit 2023-01-12 17:52:43 +01:00
kayomn commented 2023-01-12 18:14:39 +01:00
Author
Owner
Copy Link

Not possible to support TerrainMaterial instances at this time due to a 4.0 engine limitation with using signals in setters.

Not possible to support `TerrainMaterial` instances at this time due to a 4.0 engine limitation with using signals in setters.
kayomn added 1 commit 2023-01-13 01:36:23 +01:00
kayomn added 1 commit 2023-01-13 01:46:19 +01:00
kayomn added 2 commits 2023-01-13 11:09:06 +01:00
kayomn added 1 commit 2023-01-13 18:30:56 +01:00
kayomn added 2 commits 2023-01-13 19:15:14 +01:00
kayomn added 3 commits 2023-01-16 02:43:34 +01:00
kayomn added 3 commits 2023-01-16 19:54:21 +01:00
kayomn added 2 commits 2023-01-17 00:49:07 +01:00
kayomn added 1 commit 2023-01-17 16:22:25 +01:00
kayomn added 1 commit 2023-01-17 16:29:49 +01:00
kayomn added 1 commit 2023-01-17 17:42:02 +01:00
kayomn added 1 commit 2023-01-17 17:44:31 +01:00
kayomn added 2 commits 2023-01-18 18:15:53 +01:00
kayomn reviewed 2023-01-18 18:29:32 +01:00
terrain/dynamic_terrain_instance_3d.gd Outdated
@ -0,0 +33,4 @@
##
##
##
func oscillate(point: Vector2i, level: float,
kayomn commented 2023-01-18 18:27:20 +01:00
Author
Owner
Copy Link

Missing doc comment.

Missing doc comment.
kayomn marked this conversation as resolved
terrain/dynamic_terrain_instance_3d.gd Outdated
@ -0,0 +62,4 @@
##
##
##
func paint(point: Vector2i, color: Color,
kayomn commented 2023-01-18 18:27:24 +01:00
Author
Owner
Copy Link

Missing doc comment.

Missing doc comment.
kayomn marked this conversation as resolved
terrain/dynamic_terrain_instance_3d.gd
@ -0,0 +95,4 @@
##
##
##
func resize(size: Vector2i) -> void:
kayomn commented 2023-01-18 18:27:30 +01:00
Author
Owner
Copy Link

Missing doc comment.

Missing doc comment.
kayomn marked this conversation as resolved
terrain/paints/terrain_paint.gd
@ -0,0 +4,4 @@
##
##
@export
var albedo_map: Texture2D = null
kayomn commented 2023-01-18 18:28:46 +01:00
Author
Owner
Copy Link

Missing doc comment.

Missing doc comment.
kayomn marked this conversation as resolved
terrain/paints/terrain_paint.gd
@ -0,0 +10,4 @@
##
##
@export
var normal_map: Texture2D = null
kayomn commented 2023-01-18 18:28:50 +01:00
Author
Owner
Copy Link

Missing doc comment.

Missing doc comment.
kayomn marked this conversation as resolved
kayomn commented 2023-01-18 18:38:59 +01:00
Author
Owner
Copy Link

Also worth further splitting up the logic contained in the editor scene as its root script is still fairly monolithic at close to 400 lines.

Also worth further splitting up the logic contained in the editor scene as its root script is still fairly monolithic at close to 400 lines.
kayomn added 1 commit 2023-01-19 01:49:53 +01:00
kayomn changed title from WIP: Editor Terrain Brush to Editor Terrain Brush 2023-01-19 01:51:19 +01:00
kayomn merged commit e72698ffcd into main 2023-01-19 01:51:25 +01:00
kayomn deleted branch editor-terrain-brush 2023-01-19 01:51:25 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Editor Iteration 1
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
kayomn
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: protectorate/game#2
No description provided.
Delete Branch "editor-terrain-brush"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?