Skip to content

Commit

Permalink
Update to 0.9.0-4.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
CedNaru committed Apr 24, 2024
1 parent ce41c49 commit 1b316c8
Show file tree
Hide file tree
Showing 64 changed files with 137 additions and 43 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.utopia-rise.godot-kotlin-jvm") version "0.7.2-4.1.2"
id("com.utopia-rise.godot-kotlin-jvm") version "0.9.0-4.2.2"
}

repositories {
Expand Down
2 changes: 2 additions & 0 deletions demo/Box/BoxVisuals/BoxModel.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 2 additions & 0 deletions demo/Box/BoxVisuals/DestroyedBox.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand Down Expand Up @@ -62,4 +63,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 1 addition & 1 deletion demo/CameraMode/CameraMode.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import godot.core.Basis
import godot.core.Vector3
import godot.core.asStringName
import godot.global.GD
import godot.global.PI
import godot.util.PI

private const val CAMERA_MODE_TOGGLE_GROUP = "camera_mode_toggle"

Expand Down
2 changes: 1 addition & 1 deletion demo/DemoPage/DemoPage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import godot.annotation.RegisterFunction
import godot.annotation.RegisterProperty
import godot.core.Callable
import godot.core.Color
import godot.core.asNodePath
import godot.core.asStringName
import godot.extensions.asNodePath
import godot.util.camelToSnakeCase

@RegisterClass
Expand Down
2 changes: 2 additions & 0 deletions demo/Enemies/BeeBot/bee_bot.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand Down Expand Up @@ -1831,4 +1832,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 2 additions & 0 deletions demo/Enemies/beetle_bot/beetle_bot_fused.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions demo/Enemies/smoke_puff/smoke_ball.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
3 changes: 1 addition & 2 deletions demo/Environment/GrassScatter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ class GrassScatter : MultiMeshInstance3D() {
val t = Transform3D(
Basis(Vector3.UP, 0.0),
mdt.getRandomPoint(triangles) + toLocal(targetMeshNode.globalTransform.origin)
)
t.scale(Vector3.ONE * GD.randfRange(0.6f, 0.1f))
).scaled(Vector3.ONE * GD.randfRange(0.6f, 0.1f))
multimesh?.setInstanceTransform(i, t)
}
}
Expand Down
1 change: 1 addition & 0 deletions demo/Environment/bushes/bush.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
1 change: 1 addition & 0 deletions demo/Environment/flowers/flower_patch.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
1 change: 1 addition & 0 deletions demo/Environment/grass/grass_1_geo.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
1 change: 1 addition & 0 deletions demo/Environment/large_tree_trunk/large_trunk.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
2 changes: 2 additions & 0 deletions demo/Environment/mushroom/mushroom.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions demo/Environment/orange_flowers/orange_flower.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions demo/Environment/terrain.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand All @@ -38,4 +39,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions demo/Environment/tree_trunk/tree_trunk_long.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand All @@ -35,4 +36,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions demo/Environment/tree_trunk/tree_trunk_small.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand All @@ -35,4 +36,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=1
1 change: 1 addition & 0 deletions demo/Environment/trees/tree.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
2 changes: 1 addition & 1 deletion demo/JumpingPad/JumpingPad.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction
import godot.annotation.RegisterProperty
import godot.core.Vector3
import godot.extensions.asNodePath
import godot.core.asNodePath

@RegisterClass
class JumpingPad : Area3D() {
Expand Down
2 changes: 2 additions & 0 deletions demo/JumpingPad/JumpingPadVisuals/JumpingPadModel.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 2 additions & 0 deletions demo/Level/Terrain.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand Down Expand Up @@ -60,4 +61,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=3
5 changes: 4 additions & 1 deletion demo/Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ shadow_enabled = true

[node name="Player" parent="." instance=ExtResource("2_q87gh")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.16612, -16.5725)
bullet_scene = null
coin_scene = null
bullet_speed = 10.0
acceleration = 4.0

[node name="JumpingPad" parent="." instance=ExtResource("3_w2mh2")]
transform = Transform3D(0.893364, 0, 0.449335, 0, 1, 0, -0.449335, 0, 0.893364, -35.1316, 6.60685, 19.929)
Expand All @@ -98,7 +102,6 @@ transform = Transform3D(0.893364, 0, 0.449335, 0, 1, 0, -0.449335, 0, 0.893364,

[node name="JumpingPad3" parent="." instance=ExtResource("3_w2mh2")]
transform = Transform3D(0.823187, 0, -0.567772, 0, 1, 0, 0.567772, 0, 0.823187, -43.7, 19.0958, 1.42115)
impulse_strength = 15.0

[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
navigation_mesh = ExtResource("5_n4asa")
Expand Down
1 change: 1 addition & 0 deletions demo/Player/BulletVisuals/BulletModel.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
4 changes: 2 additions & 2 deletions demo/Player/CameraController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ class CameraController : Node3D() {

@Export
@RegisterProperty
var tiltUpperLimit = GD.deg2rad(-60.0)
var tiltUpperLimit = GD.degToRad(-60.0)

@Export
@RegisterProperty
var tiltLowerLimit = GD.deg2rad(60.0)
var tiltLowerLimit = GD.degToRad(60.0)

@Export
@RegisterProperty
Expand Down
2 changes: 2 additions & 0 deletions demo/Player/Coin/CoinVisuals/CoinModel.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
3 changes: 1 addition & 2 deletions demo/Player/CoinsContainer.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package Player

import Player.Coin.Coin
import godot.HBoxContainer
import godot.Label
import godot.Timer
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction
import godot.annotation.RegisterProperty
import godot.extensions.asNodePath
import godot.core.asNodePath

private const val HIDDEN_Y_POS = -100
private const val DISPLAY_Y_POS = 20
Expand Down
1 change: 0 additions & 1 deletion demo/Player/ExplosionVisuals/materials/shell_mat.tres
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ noise_type = 2
seed = 2
fractal_type = 0
fractal_octaves = 1
cellular_jitter = 1.0

[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_q4shp"]
seamless = true
Expand Down
1 change: 1 addition & 0 deletions demo/Player/ExplosionVisuals/objects/disk.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 2 additions & 0 deletions demo/Player/GrenadeVisuals/grenade/grenade.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=3
1 change: 1 addition & 0 deletions demo/Player/GrenadeVisuals/trajectory_mockup.obj.import
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false
2 changes: 1 addition & 1 deletion demo/Player/model/character_blend_tree.tres
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ nodes/PunchOneShot/position = Vector2(300, 380)
nodes/StateMachine/node = SubResource("AnimationNodeStateMachine_k7175")
nodes/StateMachine/position = Vector2(20, 380)
nodes/output/position = Vector2(780, 80)
node_connections = [&"output", 0, &"Add2 2", &"Add2", 0, &"Animation", &"Add2", 1, &"Animation 2", &"Add2 2", 0, &"Add2", &"Add2 2", 1, &"PunchOneShot", &"PunchOneShot", 0, &"StateMachine", &"PunchOneShot", 1, &"Animation 3"]
node_connections = [&"Add2", 0, &"Animation", &"Add2", 1, &"Animation 2", &"Add2 2", 0, &"Add2", &"Add2 2", 1, &"PunchOneShot", &"PunchOneShot", 0, &"StateMachine", &"PunchOneShot", 1, &"Animation 3", &"output", 0, &"Add2 2"]
2 changes: 2 additions & 0 deletions demo/Player/model/gdbot.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
Expand Down Expand Up @@ -9027,4 +9028,5 @@ _subresources={
}
}
}
gltf/naming_version=0
gltf/embedded_image_handling=3
2 changes: 1 addition & 1 deletion demo/Player/model/materials/heart_core_mat.tres
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
albedo_color = Color(0, 0, 0, 1)
emission_enabled = true
emission = Color(0, 1, 0.392157, 1)
emission_energy_multiplier = 0.669953
emission_energy_multiplier = 0.526315
2 changes: 1 addition & 1 deletion demo/icons/Icone.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package icons
import godot.TextureRect
import godot.annotation.RegisterClass
import godot.core.Color
import godot.extensions.asNodePath
import godot.core.asNodePath

@RegisterClass
class Icone : TextureRect() {
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="TPS Demo"
run/main_scene="res://demo/Main.tscn"
config/features=PackedStringArray("4.1", "Forward Plus")
config/features=PackedStringArray("4.2", "Forward Plus")
run/max_fps=60
config/icon="res://icon.png"

Expand Down
Loading

0 comments on commit 1b316c8

Please sign in to comment.