diff --git a/cpp/simple/project/default_env.tres b/cpp/simple/project/default_env.tres index 8edf1e3..0f8c712 100644 --- a/cpp/simple/project/default_env.tres +++ b/cpp/simple/project/default_env.tres @@ -1,102 +1,18 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] - radiance_size = 4 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) sky_curve = 0.25 -sky_energy = 1.0 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) ground_curve = 0.01 -ground_energy = 1.0 -sun_color = Color( 1, 1, 1, 1 ) -sun_latitude = 35.0 -sun_longitude = 0.0 -sun_angle_min = 1.0 -sun_angle_max = 100.0 -sun_curve = 0.05 sun_energy = 16.0 -texture_size = 2 [resource] - background_mode = 2 background_sky = SubResource( 1 ) -background_sky_custom_fov = 0.0 -background_color = Color( 0, 0, 0, 1 ) -background_energy = 1.0 -background_canvas_max_layer = 0 -ambient_light_color = Color( 0, 0, 0, 1 ) -ambient_light_energy = 1.0 -ambient_light_sky_contribution = 1.0 -fog_enabled = false -fog_color = Color( 0.5, 0.6, 0.7, 1 ) -fog_sun_color = Color( 1, 0.9, 0.7, 1 ) -fog_sun_amount = 0.0 -fog_depth_enabled = true -fog_depth_begin = 10.0 -fog_depth_curve = 1.0 -fog_transmit_enabled = false -fog_transmit_curve = 1.0 -fog_height_enabled = false fog_height_min = 0.0 fog_height_max = 100.0 -fog_height_curve = 1.0 -tonemap_mode = 0 -tonemap_exposure = 1.0 -tonemap_white = 1.0 -auto_exposure_enabled = false -auto_exposure_scale = 0.4 -auto_exposure_min_luma = 0.05 -auto_exposure_max_luma = 8.0 -auto_exposure_speed = 0.5 -ss_reflections_enabled = false -ss_reflections_max_steps = 64 -ss_reflections_fade_in = 0.15 -ss_reflections_fade_out = 2.0 -ss_reflections_depth_tolerance = 0.2 -ss_reflections_roughness = true -ssao_enabled = false -ssao_radius = 1.0 -ssao_intensity = 1.0 -ssao_radius2 = 0.0 -ssao_intensity2 = 1.0 -ssao_bias = 0.01 -ssao_light_affect = 0.0 -ssao_ao_channel_affect = 0.0 -ssao_color = Color( 0, 0, 0, 1 ) ssao_quality = 0 -ssao_blur = 3 -ssao_edge_sharpness = 4.0 -dof_blur_far_enabled = false -dof_blur_far_distance = 10.0 -dof_blur_far_transition = 5.0 -dof_blur_far_amount = 0.1 -dof_blur_far_quality = 1 -dof_blur_near_enabled = false -dof_blur_near_distance = 2.0 -dof_blur_near_transition = 1.0 -dof_blur_near_amount = 0.1 -dof_blur_near_quality = 1 -glow_enabled = false -glow_levels/1 = false -glow_levels/2 = false -glow_levels/3 = true -glow_levels/4 = false -glow_levels/5 = true -glow_levels/6 = false -glow_levels/7 = false -glow_intensity = 0.8 -glow_strength = 1.0 -glow_bloom = 0.0 -glow_blend_mode = 2 -glow_hdr_threshold = 1.0 -glow_hdr_scale = 2.0 -glow_bicubic_upscale = false -adjustment_enabled = false -adjustment_brightness = 1.0 -adjustment_contrast = 1.0 -adjustment_saturation = 1.0 - diff --git a/cpp/simple/project/gdnative/simple.gdnlib b/cpp/simple/project/gdnative/simple.gdnlib index 87aa894..aed22c4 100644 --- a/cpp/simple/project/gdnative/simple.gdnlib +++ b/cpp/simple/project/gdnative/simple.gdnlib @@ -1,14 +1,14 @@ -[entry] - -X11.64="res://bin/libsimple.so" - -[dependencies] - -X11.64=[ ] - [general] singleton=false load_once=true symbol_prefix="godot_" reloadable=true + +[entry] + +Windows.64="res://gdnative/windows/libsimple.dll" + +[dependencies] + +Windows.64=[ ] diff --git a/cpp/simple/project/gdnative/simple.gdns b/cpp/simple/project/gdnative/simple.gdns index 2bd3a71..ecc4a99 100644 --- a/cpp/simple/project/gdnative/simple.gdns +++ b/cpp/simple/project/gdnative/simple.gdns @@ -1,6 +1,6 @@ [gd_resource type="NativeScript" load_steps=2 format=2] -[ext_resource path="res://bin/simple.gdnlib" type="GDNativeLibrary" id=1] +[ext_resource path="res://gdnative/simple.gdnlib" type="GDNativeLibrary" id=1] [resource] diff --git a/cpp/simple/project/icon.png.import b/cpp/simple/project/icon.png.import index 45ee6af..96cbf46 100644 --- a/cpp/simple/project/icon.png.import +++ b/cpp/simple/project/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/cpp/simple/project/main.gd b/cpp/simple/project/main.gd index 5ab430d..3969ffc 100644 --- a/cpp/simple/project/main.gd +++ b/cpp/simple/project/main.gd @@ -1,6 +1,6 @@ extends Node -const Simple = preload("res://bin/simple.gdns") +const Simple = preload("res://gdnative/simple.gdns") onready var simple_instance = Simple.new() diff --git a/cpp/simple/project/main.tscn b/cpp/simple/project/main.tscn index 4e2a607..27abaec 100644 --- a/cpp/simple/project/main.tscn +++ b/cpp/simple/project/main.tscn @@ -1,64 +1,26 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://main.gd" type="Script" id=1] [ext_resource path="res://icon.png" type="Texture" id=2] -[ext_resource path="res://bin/simple.gdnlib" type="GDNativeLibrary" id=3] - -[sub_resource type="NativeScript" id=1] - -resource_name = "SimpleSprite" -class_name = "SimpleSprite" -library = ExtResource( 3 ) [node name="Node" type="Node"] script = ExtResource( 1 ) [node name="Button" type="Button" parent="."] -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_left = 333.0 margin_top = 208.0 margin_right = 682.0 margin_bottom = 325.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null text = "Press me" -flat = false -align = 1 [node name="Label" type="Label" parent="."] -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_left = 348.0 margin_top = 360.0 margin_right = 662.0 margin_bottom = 374.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 2 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 4 align = 1 -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 2 ) -script = SubResource( 1 ) [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] diff --git a/cpp/simple/project/project.godot b/cpp/simple/project/project.godot index 6701a8c..579d639 100644 --- a/cpp/simple/project/project.godot +++ b/cpp/simple/project/project.godot @@ -10,7 +10,6 @@ config_version=4 _global_script_classes=[ ] _global_script_class_icons={ - } [application] @@ -21,4 +20,5 @@ config/icon="res://icon.png" [rendering] +quality/driver/fallback_to_gles2=true environment/default_environment="res://default_env.tres"