Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous cleanup #26

Merged
merged 5 commits into from
Apr 19, 2023
Merged

Miscellaneous cleanup #26

merged 5 commits into from
Apr 19, 2023

Conversation

myaaaaaaaaa
Copy link
Contributor

Bundled together into one PR since it's hard to keep separate branches for a codebase this small without running into self-conflicts. Depends on #22 , which the first three commits are part of.

The commits should be fairly self-explanatory. If there's any that you disagree with, let me know and I'll rebase them out.

main.gd Outdated Show resolved Hide resolved
@Calinou Calinou marked this pull request as ready for review March 27, 2023 19:47
@Calinou
Copy link
Member

Calinou commented Apr 19, 2023

Ping me when this is ready to merge 🙂

@myaaaaaaaaa
Copy link
Contributor Author

@Calinou It's ready to merge 🙂

Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, it works. Results JSON for reference:

{
	"benchmarks": [
		{
			"category": "Gdscript > Alloc",
			"name": "Deep Tree",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 145.9
			}
		},
		{
			"category": "Gdscript > Alloc",
			"name": "Duplicate",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 994.9
			}
		},
		{
			"category": "Gdscript > Alloc",
			"name": "Fragmentation",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 1654
			}
		},
		{
			"category": "Gdscript > Alloc",
			"name": "Wide Tree",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 104.5
			}
		},
		{
			"category": "Gdscript > Array",
			"name": "Packed String Array",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 1594
			}
		},
		{
			"category": "Gdscript > Array",
			"name": "Typed Int Array",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 2521
			}
		},
		{
			"category": "Gdscript > Array",
			"name": "Typed String Array",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 3525
			}
		},
		{
			"category": "Gdscript > Array",
			"name": "Untyped Int Array",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 2461
			}
		},
		{
			"category": "Gdscript > Array",
			"name": "Untyped String Array",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0,
				"render_gpu": 0,
				"time": 3522
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Basic Cull",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.6005,
				"render_gpu": 1.449,
				"time": 0.034
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Directional Light Cull",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 1.908,
				"render_gpu": 1.913,
				"time": 0.036
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Dynamic Cull",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 4.027,
				"render_gpu": 1.712,
				"time": 0.019
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Dynamic Light Cull",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 1.707,
				"render_gpu": 1.958,
				"time": 0.018
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Dynamic Light Cull With Shadows",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 2.304,
				"render_gpu": 1.619,
				"time": 0.018
			}
		},
		{
			"category": "Rendering > Culling",
			"name": "Static Light Cull",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 1.631,
				"render_gpu": 1.912,
				"time": 0.017
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Box 100",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.07154,
				"render_gpu": 1.215,
				"time": 0.635
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Box 1000",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3095,
				"render_gpu": 1.144,
				"time": 15.62
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Box 10000",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 2.738,
				"render_gpu": 1.372,
				"time": 888.8
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Omni 10",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3033,
				"render_gpu": 1.21,
				"time": 11.92
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Omni 100",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.481,
				"render_gpu": 1.292,
				"time": 12.32
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Speed Fast",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3525,
				"render_gpu": 1.205,
				"time": 11.41
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Speed Slow",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3288,
				"render_gpu": 1.163,
				"time": 11.36
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Sphere 100",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.06782,
				"render_gpu": 1.175,
				"time": 0.809
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Sphere 1000",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3273,
				"render_gpu": 1.437,
				"time": 11.73
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Sphere 10000",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 2.648,
				"render_gpu": 3.113,
				"time": 840.3
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Spot 10",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.3175,
				"render_gpu": 0.8799,
				"time": 11.4
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Spot 100",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.6526,
				"render_gpu": 1.198,
				"time": 12.16
			}
		},
		{
			"category": "Rendering > Lights And Meshes",
			"name": "Stress",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 5.903,
				"render_gpu": 3.113,
				"time": 813.5
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "1000 Polygon 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.08971,
				"render_gpu": 0.13,
				"time": 0.015
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "100 Polygon 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.01406,
				"render_gpu": 0.1752,
				"time": 0.017
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "10 Polygon 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.008327,
				"render_gpu": 0.1802,
				"time": 0.011
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "5000 Sprite 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.307,
				"render_gpu": 0.8095,
				"time": 0.012
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "500 Sprite 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.0377,
				"render_gpu": 0.1535,
				"time": 0.01
			}
		},
		{
			"category": "Rendering > Polygon 2d",
			"name": "50 Sprite 2d",
			"results": {
				"idle": 0,
				"physics": 0,
				"render_cpu": 0.0103,
				"render_gpu": 0.1668,
				"time": 0.015
			}
		}
	],
	"engine": {
		"binary_size": 116431872,
		"build_type": "editor",
		"version": "v4.0.2.stable.official",
		"version_hash": "7a0977ce2c558fe6219f0a14f8bd4d05aea8f019"
	},
	"system": {
		"cpu_architecture": "x86_64",
		"cpu_count": 32,
		"cpu_name": "13th Gen Intel(R) Core(TM) i9-13900K",
		"gpu_name": "NVIDIA GeForce RTX 4090",
		"gpu_vendor": "NVIDIA",
		"os": "Linux"
	}
}

Thanks!

@Calinou Calinou merged commit 98022ec into godotengine:main Apr 19, 2023
@myaaaaaaaaa myaaaaaaaaa deleted the misc-cleanup branch April 19, 2023 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants