Browse Source

Merge pull request #586 from Calinou/improve-demo-configuration

Improve several demos' configuration
Aaron Franke 4 years ago
parent
commit
fecbed5fb2
48 changed files with 71 additions and 47 deletions
  1. 3 0
      3d/kinematic_character/project.godot
  2. 1 1
      3d/kinematic_character/purple_wood.png.import
  3. 1 1
      3d/kinematic_character/white_wood.png.import
  4. 4 0
      3d/material_testers/project.godot
  5. 1 1
      3d/material_testers/test_materials/aluminium_albedo.png.import
  6. 1 1
      3d/material_testers/test_materials/aluminium_flow.png.import
  7. 1 1
      3d/material_testers/test_materials/aluminium_normal.png.import
  8. 1 1
      3d/material_testers/test_materials/marble_albedo.png.import
  9. 1 1
      3d/material_testers/test_materials/rock_albedo.jpg.import
  10. 1 1
      3d/material_testers/test_materials/rock_ao.jpg.import
  11. 1 1
      3d/material_testers/test_materials/rock_depth.jpg.import
  12. 1 1
      3d/material_testers/test_materials/rock_metal.jpg.import
  13. 1 1
      3d/material_testers/test_materials/rock_rough.jpg.import
  14. 1 1
      3d/material_testers/test_materials/sand_albedo.jpg.import
  15. 1 1
      3d/material_testers/test_materials/sand_metal.jpg.import
  16. 1 1
      3d/material_testers/test_materials/sand_normal.jpg.import
  17. 1 1
      3d/material_testers/test_materials/sand_rough.jpg.import
  18. 1 1
      3d/material_testers/test_materials/sand_shine.jpg.import
  19. 1 1
      3d/material_testers/test_materials/texture_bricks.jpg.import
  20. 1 1
      3d/material_testers/test_materials/texture_bricks_depth.jpg.import
  21. 1 1
      3d/material_testers/test_materials/texture_bricks_metal.jpg.import
  22. 1 1
      3d/material_testers/test_materials/texture_bricks_normal.jpg.import
  23. 1 1
      3d/material_testers/test_materials/texture_cheese_albedo.png.import
  24. 1 1
      3d/material_testers/test_materials/texture_cheese_ao.png.import
  25. 1 1
      3d/material_testers/test_materials/texture_cheese_depth.png.import
  26. 1 1
      3d/material_testers/test_materials/texture_cheese_normal.png.import
  27. 1 1
      3d/material_testers/test_materials/texture_rock_albedo.png.import
  28. 1 1
      3d/material_testers/test_materials/texture_rock_ao.png.import
  29. 1 1
      3d/material_testers/test_materials/texture_rock_depth.png.import
  30. 1 1
      3d/material_testers/test_materials/texture_rock_metal.png.import
  31. 1 1
      3d/material_testers/test_materials/texture_rock_normal.png.import
  32. 1 1
      3d/material_testers/test_materials/texture_wood.png.import
  33. 1 1
      3d/material_testers/test_materials/wool_albedo.png.import
  34. 1 1
      3d/material_testers/test_materials/wool_depth.png.import
  35. 1 1
      3d/material_testers/test_materials/wool_normal.png.import
  36. 2 0
      3d/navmesh/project.godot
  37. 3 0
      3d/platformer/project.godot
  38. 1 1
      3d/platformer/stage/texture.png.import
  39. 1 1
      3d/platformer/stage/texturemr.png.import
  40. 1 1
      3d/truck_town/Images/cement.png.import
  41. 1 1
      3d/truck_town/Images/grass.png.import
  42. 4 0
      3d/truck_town/project.godot
  43. 2 0
      3d/voxel/project.godot
  44. 7 9
      3d/voxel/world/textures/texture_sheet.png.import
  45. 1 1
      mobile/android_iap/project.godot
  46. 2 0
      mobile/multitouch_cubes/project.godot
  47. 2 0
      viewport/dynamic_split_screen/project.godot
  48. 4 0
      viewport/dynamic_split_screen/split_screen.tscn

+ 3 - 0
3d/kinematic_character/project.godot

@@ -84,5 +84,8 @@ shadow_filter=3
 
 [rendering]
 
+quality/filters/anisotropic_filter_level=16
 quality/filters/msaa=2
 environment/default_environment="res://default_env.tres"
+quality/filters/msaa.mobile=0
+quality/filters/anisotropic_filter_level.mobile=4

+ 1 - 1
3d/kinematic_character/purple_wood.png.import

@@ -24,7 +24,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/kinematic_character/white_wood.png.import

@@ -24,7 +24,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 4 - 0
3d/material_testers/project.godot

@@ -39,5 +39,9 @@ multithread/thread_rid_pool_prealloc=60
 
 [rendering]
 
+quality/intended_usage/framebuffer_allocation=3
 vram_compression/import_etc2=false
+quality/filters/anisotropic_filter_level=16
 quality/filters/msaa=2
+quality/filters/msaa.mobile=0
+quality/filters/anisotropic_filter_level.mobile=4

+ 1 - 1
3d/material_testers/test_materials/aluminium_albedo.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/aluminium_flow.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/aluminium_normal.png.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/marble_albedo.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/rock_albedo.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/rock_ao.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/rock_depth.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/rock_metal.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/rock_rough.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/sand_albedo.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/sand_metal.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/sand_normal.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/sand_rough.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/sand_shine.jpg.import

@@ -22,7 +22,7 @@ compress/normal_map=0
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_bricks.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_bricks_depth.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_bricks_metal.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_bricks_normal.jpg.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_cheese_albedo.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_cheese_ao.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_cheese_depth.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_cheese_normal.png.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_rock_albedo.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_rock_ao.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_rock_depth.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_rock_metal.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_rock_normal.png.import

@@ -23,7 +23,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/texture_wood.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/wool_albedo.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/wool_depth.png.import

@@ -23,7 +23,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/material_testers/test_materials/wool_normal.png.import

@@ -22,7 +22,7 @@ compress/normal_map=1
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 2 - 0
3d/navmesh/project.godot

@@ -30,4 +30,6 @@ singletons=[  ]
 [rendering]
 
 quality/driver/driver_name="GLES2"
+quality/intended_usage/framebuffer_allocation=3
+quality/shadows/filter_mode=2
 quality/filters/msaa=2

+ 3 - 0
3d/platformer/project.godot

@@ -146,5 +146,8 @@ multithread/thread_rid_pool_prealloc=60
 [rendering]
 
 quality/intended_usage/framebuffer_allocation=3
+quality/filters/anisotropic_filter_level=16
 quality/filters/msaa=2
 environment/default_environment="res://default_env.tres"
+quality/filters/anisotropic_filter_level.mobile=4
+quality/filters/msaa.mobile=0

+ 1 - 1
3d/platformer/stage/texture.png.import

@@ -22,7 +22,7 @@ compress/normal_map=0
 flags/repeat=1
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=false
 process/premult_alpha=true

+ 1 - 1
3d/platformer/stage/texturemr.png.import

@@ -22,7 +22,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true

+ 1 - 1
3d/truck_town/Images/cement.png.import

@@ -24,7 +24,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 1 - 1
3d/truck_town/Images/grass.png.import

@@ -24,7 +24,7 @@ compress/normal_map=0
 flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
-flags/anisotropic=false
+flags/anisotropic=true
 flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false

+ 4 - 0
3d/truck_town/project.godot

@@ -77,5 +77,9 @@ shadow_filter=3
 [rendering]
 
 quality/driver/driver_name="GLES2"
+quality/intended_usage/framebuffer_allocation=3
+quality/shadows/filter_mode=2
+quality/filters/anisotropic_filter_level=16
 quality/filters/msaa=2
 environment/default_environment="res://default_env.tres"
+quality/filters/anisotropic_filter_level.mobile=4

+ 2 - 0
3d/voxel/project.godot

@@ -160,6 +160,8 @@ common/physics_fps=120
 quality/driver/driver_name="GLES2"
 vram_compression/import_etc=true
 vram_compression/import_etc2=false
+quality/filters/anisotropic_filter_level=16
 quality/filters/msaa=2
 environment/default_environment="res://default_env.tres"
 gles2/debug/disable_half_float=true
+quality/filters/anisotropic_filter_level.mobile=4

+ 7 - 9
3d/voxel/world/textures/texture_sheet.png.import

@@ -2,31 +2,29 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.s3tc.stex"
-path.etc="res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.etc.stex"
+path="res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.stex"
 metadata={
-"imported_formats": [ "s3tc", "etc" ],
-"vram_texture": true
+"vram_texture": false
 }
 
 [deps]
 
 source_file="res://world/textures/texture_sheet.png"
-dest_files=[ "res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.s3tc.stex", "res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.etc.stex" ]
+dest_files=[ "res://.import/texture_sheet.png-52286655fc64f0acb01bdaefe1f1bd3e.stex" ]
 
 [params]
 
-compress/mode=2
+compress/mode=0
 compress/lossy_quality=1.0
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
+flags/mipmaps=true
+flags/anisotropic=true
 flags/srgb=2
-process/fix_alpha_border=true
+process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false

+ 1 - 1
mobile/android_iap/project.godot

@@ -19,7 +19,7 @@ modules="org/godotengine/godot/GodotPaymentV3"
 
 [application]
 
-config/name="Android in-app purchases"
+config/name="Android In-App Purchases"
 run/main_scene="res://main.tscn"
 config/icon="res://icon.png"
 

+ 2 - 0
mobile/multitouch_cubes/project.godot

@@ -26,5 +26,7 @@ singletons=[  ]
 [rendering]
 
 quality/driver/driver_name="GLES2"
+quality/intended_usage/framebuffer_allocation=0
+quality/intended_usage/framebuffer_allocation.mobile=0
 environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 )
 environment/default_environment="res://default_env.tres"

+ 2 - 0
viewport/dynamic_split_screen/project.godot

@@ -89,5 +89,7 @@ move_right_player2={
 [rendering]
 
 quality/driver/driver_name="GLES2"
+quality/intended_usage/framebuffer_allocation=3
+quality/shadows/filter_mode=2
 environment/default_clear_color=Color( 1, 1, 1, 1 )
 environment/default_environment="res://default_env.tres"

+ 4 - 0
viewport/dynamic_split_screen/split_screen.tscn

@@ -189,6 +189,8 @@ __meta__ = {
 
 [node name="Viewport1" type="Viewport" parent="Cameras"]
 size = Vector2( 100, 100 )
+msaa = 2
+usage = 3
 render_target_v_flip = true
 render_target_update_mode = 3
 
@@ -198,6 +200,8 @@ current = true
 
 [node name="Viewport2" type="Viewport" parent="Cameras"]
 size = Vector2( 100, 100 )
+msaa = 2
+usage = 3
 render_target_v_flip = true
 render_target_update_mode = 3