Skip to content

Commit 6a0ba3e

Browse files
Williscool13Williscool13
authored
Merge pull request #42 from Williscool13/oit
Order Independent Transparency
2 parents ed9b980 + 9396fb4 commit 6a0ba3e

77 files changed

Lines changed: 2681 additions & 970 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ set(TEMP_SOURCES
244244
src/renderer/lighting/ambient_occlusion/ground_truth/ground_truth_ambient_occlusion.cpp
245245
src/renderer/lighting/ambient_occlusion/ground_truth/ground_truth_ambient_occlusion.h
246246
src/renderer/lighting/ambient_occlusion/ambient_occlusion_types.h
247+
src/renderer/pipelines/transparent_pipeline/transparent_pipeline.cpp
248+
src/renderer/pipelines/transparent_pipeline/transparent_pipeline.h
249+
src/engine_constants.h
247250

248251
)
249252

‎assets/environments/rogland_clear_night_4k.hdr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:133d77ddf6a69926a138574169e5cdf4c04b785e8d22545274aa285f1ec3d879
3+
size 27915523

‎assets/environments/satara_night_no_lamps_4k.hdr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:d2ea47493416e75f1ae32905fc06472c8e6fec221f1e1ddfd6f67add13b9e9f8
3+
size 29851032

‎assets/maps/sampleScene.willmap‎

Lines changed: 304 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"metadata": {
88
"name": "sampleScene",
9-
"created": "2025-03-23 16:02:52",
9+
"created": "2025-04-06 11:32:54",
1010
"formatVersion": 1
1111
},
1212
"rootComponents": {
@@ -350,6 +350,309 @@
350350
"componentName": "MeshRendererComponent"
351351
}
352352
}
353+
},
354+
{
355+
"id": 7,
356+
"name": "GameObject_7",
357+
"transform": {
358+
"position": {
359+
"x": 0.0,
360+
"y": 70.80000305175781,
361+
"z": 0.0
362+
},
363+
"rotation": {
364+
"x": 0.0,
365+
"y": 0.0,
366+
"z": 0.0,
367+
"w": 1.0
368+
},
369+
"scale": {
370+
"x": 1.0,
371+
"y": 1.0,
372+
"z": 1.0
373+
}
374+
},
375+
"children": [
376+
{
377+
"id": 8,
378+
"name": "GameObject_8",
379+
"transform": {
380+
"position": {
381+
"x": 0.0,
382+
"y": 0.0,
383+
"z": 0.0
384+
},
385+
"rotation": {
386+
"x": 0.0,
387+
"y": 0.0,
388+
"z": 0.0,
389+
"w": 1.0
390+
},
391+
"scale": {
392+
"x": 1.0,
393+
"y": 1.0,
394+
"z": 1.0
395+
}
396+
},
397+
"components": {
398+
"MeshRendererComponent": {
399+
"renderReference": 6331695,
400+
"renderMeshIndex": 2,
401+
"renderIsVisible": true,
402+
"renderIsShadowCaster": true,
403+
"componentName": "Bed"
404+
}
405+
}
406+
},
407+
{
408+
"id": 9,
409+
"name": "GameObject_9",
410+
"transform": {
411+
"position": {
412+
"x": 0.0,
413+
"y": 0.0,
414+
"z": 0.4090209901332855
415+
},
416+
"rotation": {
417+
"x": -0.47185850143432617,
418+
"y": 0.0,
419+
"z": 0.0,
420+
"w": 0.8816744089126587
421+
},
422+
"scale": {
423+
"x": 1.0,
424+
"y": 1.0,
425+
"z": 1.0
426+
}
427+
},
428+
"components": {
429+
"MeshRendererComponent": {
430+
"renderReference": 6331695,
431+
"renderMeshIndex": 7,
432+
"renderIsVisible": true,
433+
"renderIsShadowCaster": true,
434+
"componentName": "DecalBlend"
435+
}
436+
}
437+
},
438+
{
439+
"id": 10,
440+
"name": "GameObject_10",
441+
"transform": {
442+
"position": {
443+
"x": 0.0,
444+
"y": 0.0,
445+
"z": 0.4090207517147064
446+
},
447+
"rotation": {
448+
"x": -0.47185850143432617,
449+
"y": 0.0,
450+
"z": 0.0,
451+
"w": 0.8816744089126587
452+
},
453+
"scale": {
454+
"x": 1.0,
455+
"y": 1.0,
456+
"z": 1.0
457+
}
458+
},
459+
"components": {
460+
"MeshRendererComponent": {
461+
"renderReference": 6331695,
462+
"renderMeshIndex": 5,
463+
"renderIsVisible": true,
464+
"renderIsShadowCaster": true,
465+
"componentName": "DecalOpaque"
466+
}
467+
}
468+
},
469+
{
470+
"id": 11,
471+
"name": "GameObject_11",
472+
"transform": {
473+
"position": {
474+
"x": 0.5,
475+
"y": 1.068150520324707,
476+
"z": 0.004999999888241291
477+
},
478+
"rotation": {
479+
"x": 0.0,
480+
"y": 0.0,
481+
"z": 0.0,
482+
"w": 1.0
483+
},
484+
"scale": {
485+
"x": 1.0,
486+
"y": 1.0,
487+
"z": 1.0
488+
}
489+
},
490+
"components": {
491+
"MeshRendererComponent": {
492+
"renderReference": 6331695,
493+
"renderMeshIndex": 4,
494+
"renderIsVisible": true,
495+
"renderIsShadowCaster": true,
496+
"componentName": "GreenArrows"
497+
}
498+
}
499+
},
500+
{
501+
"id": 12,
502+
"name": "GameObject_12",
503+
"transform": {
504+
"position": {
505+
"x": -1.5,
506+
"y": 0.0,
507+
"z": 0.0
508+
},
509+
"rotation": {
510+
"x": 0.0,
511+
"y": 0.0,
512+
"z": 0.0,
513+
"w": 1.0
514+
},
515+
"scale": {
516+
"x": 1.0,
517+
"y": 1.0,
518+
"z": 1.0
519+
}
520+
},
521+
"components": {
522+
"MeshRendererComponent": {
523+
"renderReference": 6331695,
524+
"renderMeshIndex": 3,
525+
"renderIsVisible": true,
526+
"renderIsShadowCaster": true,
527+
"componentName": "TestBlend"
528+
}
529+
}
530+
},
531+
{
532+
"id": 13,
533+
"name": "GameObject_13",
534+
"transform": {
535+
"position": {
536+
"x": 0.0,
537+
"y": 0.0,
538+
"z": 0.0
539+
},
540+
"rotation": {
541+
"x": 0.0,
542+
"y": 0.0,
543+
"z": 0.0,
544+
"w": 1.0
545+
},
546+
"scale": {
547+
"x": 1.0,
548+
"y": 1.0,
549+
"z": 1.0
550+
}
551+
},
552+
"components": {
553+
"MeshRendererComponent": {
554+
"renderReference": 6331695,
555+
"renderMeshIndex": 0,
556+
"renderIsVisible": true,
557+
"renderIsShadowCaster": true,
558+
"componentName": "TestCutoff25"
559+
}
560+
}
561+
},
562+
{
563+
"id": 14,
564+
"name": "GameObject_14",
565+
"transform": {
566+
"position": {
567+
"x": 3.0,
568+
"y": 0.0,
569+
"z": 0.0
570+
},
571+
"rotation": {
572+
"x": 0.0,
573+
"y": 0.0,
574+
"z": 0.0,
575+
"w": 1.0
576+
},
577+
"scale": {
578+
"x": 1.0,
579+
"y": 1.0,
580+
"z": 1.0
581+
}
582+
},
583+
"components": {
584+
"MeshRendererComponent": {
585+
"renderReference": 6331695,
586+
"renderMeshIndex": 1,
587+
"renderIsVisible": true,
588+
"renderIsShadowCaster": true,
589+
"componentName": "TestCutoff75"
590+
}
591+
}
592+
},
593+
{
594+
"id": 15,
595+
"name": "GameObject_15",
596+
"transform": {
597+
"position": {
598+
"x": 1.5,
599+
"y": 0.0,
600+
"z": 0.0
601+
},
602+
"rotation": {
603+
"x": 0.0,
604+
"y": 0.0,
605+
"z": 0.0,
606+
"w": 1.0
607+
},
608+
"scale": {
609+
"x": 1.0,
610+
"y": 1.0,
611+
"z": 1.0
612+
}
613+
},
614+
"components": {
615+
"MeshRendererComponent": {
616+
"renderReference": 6331695,
617+
"renderMeshIndex": 8,
618+
"renderIsVisible": true,
619+
"renderIsShadowCaster": true,
620+
"componentName": "TestCutoffDefault"
621+
}
622+
}
623+
},
624+
{
625+
"id": 16,
626+
"name": "GameObject_16",
627+
"transform": {
628+
"position": {
629+
"x": -3.0,
630+
"y": 0.0,
631+
"z": 0.0
632+
},
633+
"rotation": {
634+
"x": 0.0,
635+
"y": 0.0,
636+
"z": 0.0,
637+
"w": 1.0
638+
},
639+
"scale": {
640+
"x": 1.0,
641+
"y": 1.0,
642+
"z": 1.0
643+
}
644+
},
645+
"components": {
646+
"MeshRendererComponent": {
647+
"renderReference": 6331695,
648+
"renderMeshIndex": 6,
649+
"renderIsVisible": true,
650+
"renderIsShadowCaster": true,
651+
"componentName": "TestOpaque"
652+
}
653+
}
654+
}
655+
]
353656
}
354657
]
355658
}

assets/models/AlphaBlendModeTest/glTF-Binary/AlphaBlendModeTest.glb renamed to assets/models/AlphaBlendModeTest.glb

File renamed without changes.

‎assets/models/AlphaBlendModeTest.willmodel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"renderObject": {
3+
"gltfPath": "assets\\models\\AlphaBlendModeTest.glb",
4+
"id": 6331695,
5+
"name": "AlphaBlendModeTest"
6+
},
7+
"version": 1
8+
}

‎assets/models/AlphaBlendModeTest/LICENSE.md‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)