Skip to content
New issue

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

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

Already on GitHub? # to your account

New Ditt branch master merge #54

Open
wants to merge 34 commits into
base: ditt
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
da9305f
Update README.md
devshgraphicsprogramming Apr 10, 2024
85a36e6
Merge pull request #104 from Devsh-Graphics-Programming/iesFeatures
devshgraphicsprogramming Apr 12, 2024
c89603d
update media submodule
AnastaZIuk Apr 13, 2024
3fd39cb
update media submodule
Apr 17, 2024
84fd4b2
make IES example more test friendly, add inputs.json with IES referen…
AnastaZIuk Apr 23, 2024
1762c61
update media submodule
AnastaZIuk Apr 24, 2024
fb91e36
update media submodule
AnastaZIuk Apr 25, 2024
2981984
adjust the example to new changes, flush descriptor sets on profile c…
AnastaZIuk Apr 26, 2024
235b4ff
temporary changes
AnastaZIuk May 17, 2024
0a6c7ee
debug scene commit, find our why 0 MDI I get and allocate more space …
AnastaZIuk May 17, 2024
6ec449c
update virtualGeometry.glsl to fetch combined UV+Normal attribute wit…
AnastaZIuk May 17, 2024
9472e56
fix a type typo bug in CombinedNormalUV - use floats for UV. Also use…
AnastaZIuk May 17, 2024
45d9187
Merge pull request #115 from Devsh-Graphics-Programming/Renderer32UV
AnastaZIuk May 17, 2024
bc0bb12
Improve fragmentation of mesh data, make more scenes fit in 2GB-1 byt…
Jun 4, 2024
c504bbe
update media submodule
AnastaZIuk Dec 10, 2024
a350a53
add a mask AOV, now need to configure the visibility of things for pr…
Dec 11, 2024
2f1e183
denoiser and bloom handle alpha now
Dec 11, 2024
9df4dfb
oops forgot to re-enable denoiser
Dec 11, 2024
f662bd0
Merge branch 'new_ditt' of github.com:Devsh-Graphics-Programming/Nabl…
Dec 11, 2024
b2ef17a
get the transmission alpha working nicely
Dec 12, 2024
802e8de
add `hideEnvironment` to Mitsuba XML <integrator>
Dec 12, 2024
e051c3c
envmap on wrong binding
Dec 12, 2024
609ecb2
they call me typo king
Dec 13, 2024
b988ed1
fix tangent frame handling for instances with a negative transformati…
Jan 13, 2025
e507dc5
sentinel check on up-vectors was wrong (not taking into account norma…
Jan 13, 2025
93bba79
titlebar as requested by cutealien
Jan 14, 2025
6d6ac56
reduce sentinel
Jan 14, 2025
355a283
the reconstructed right vectors weren't normalized :facepalm:
Jan 29, 2025
c88647f
now after the up vector compatibility fixes the upvector vs. view/tar…
Jan 30, 2025
60071d5
update readme.md and treat new XML tag
Jan 30, 2025
59ef73e
pass the clipping planes to shader (but now we need to recompile the …
Feb 10, 2025
3e6965b
the vertex shader and graphics pipeline need to be made JIT now, also…
Feb 10, 2025
802cc74
update readme.md and remove <span> dependency (this branch is not c++…
Feb 10, 2025
ae6d573
fix clip plane logging
Feb 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions 22.RaytracedAO/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,25 @@ Multiple Sensor tags in mitsuba XML's is now supported. This feature helps you h

You can switch between those sensors using `PAGE UP/DOWN` Keys defined in more detail below.

### Properties added to \<integrator\>:

| Property Name | Description | Type | Default Value |
|-----------------|-------------------------------------------|---------|----------------|
| hideEnvironment | Replace bakcground with Transparent Alpha | boolean | false |

Note that we don't support Mitsuba's `hideEmitters`

### Properties added to \<sensor\>:

| Property Name | Description | Type | Default Value |
|---------------|-----------------------|-------|------------------------------------------|
| moveSpeed | Camera Movement Speed | float | NaN -> Will be deduced from scene bounds |
| zoomSpeed | Camera Zoom Speed | float | NaN -> Will be deduced from scene bounds |
| rotateSpeed | Camera Rotation Speed | float | 300.0 |
| Property Name | Description | Type | Default Value |
|---------------|-------------------------------------------------------------------------------------|---------|------------------------------------------|
| up | Up Vector to determine roll around view axis and the north pole to rotate around | vector | 0.0, 1.0, 0.0 |
| moveSpeed | Camera Movement Speed | float | NaN -> Will be deduced from scene bounds |
| zoomSpeed | Camera Zoom Speed | float | NaN -> Will be deduced from scene bounds |
| rotateSpeed | Camera Rotation Speed | float | 300.0 |
| clipPlaneN\* | Worldspace coefficients for a plane equation of the form `a*x + b*y + c*z + w >= 0` | vector | 0.0, 0.0, 0.0, 0.0 (disabled) |

\* N ranges from 0 to 5

#### Properties added to \<sensor type="perspective"\>:

Expand Down Expand Up @@ -93,6 +105,7 @@ You can switch between those sensors using `PAGE UP/DOWN` Keys defined in more d
```xml
<sensor type="perspective" >
<float name="fov" value="60" />
<vector name="up" x="0" y="-0.351123" z="0.936329" />
<float name="moveSpeed" value="100.0" />
<float name="zoomSpeed" value="1.0" />
<float name="rotateSpeed" value="300.0" />
Expand Down Expand Up @@ -165,13 +178,14 @@ So the full width, height are 1152x1152 (64+1024+64=1152)

| Property Name | Description | Type | Default Value |
|---------------|------------------------------------------------------------------------------------------------------------------|-------|---------------|
| normalizeEnergy | Parameter to normalize the intensity of emission profile. <br> 1) If `normalizeEnergy` is zero, it will not perform any normalization. (no normalization) <br> 2) If `normalizeEnergy` is negative, it will normalize the intensity by dividing out the maximum intensity. (normalization by max) <br> 3) If `normalizeEnergy` is positive, it will first normalize the intensity by average energy and multiply `normalizeEnergy` to intensity. (normalization by energy) | float | 0.0 (no normalization) |
| filename | The filename of the IES profile. | string | "" |
| normalization | Parameter to normalize the intensity of emission profile. <br> 1) If `normalization` is `NONE` or invalid/none of the below, it will not perform any normalization. <br> 2) If `normalization` is `UNIT_MAX`, it will normalize the intensity by dividing out the maximum intensity. (normalization by max) <br> 3) If `normalization` is `UNIT_AVERAGE_OVER_IMPLIED_DOMAIN`, it will integrate the profile over the hemisphere as well as the solid angles where the profile has emission above 0. This has an advantage over a plain average as you don't need to care whether the light is a sphere, hemisphere, or a spotlight of a given aperture. (normalization by energy) <br> 4) If `normalization` is `UNIT_AVERAGE_OVER_FULL_DOMAIN` we behave like `UNIT_AVERAGE` but presume the soild angle of the domain is `(CIESProfile::vAngles.front()-CIESProfile::vAngles.back())*4.f` | string | "" <br> (no normalization) |
| flatten | Optional "blend" of the original profile value with the average value, if negative we use the average as if for `UNIT_AVERAGE_OVER_FULL_DOMAIN` if positive we use the average as-if for `UNIT_AVERAGE_OVER_IMPLIED_DOMAIN`. <br> This is useful when the emitter appears "not bright enough" when observing from directions outside the main power-lobes. <br> Valid range is 0.0 to 1.0, value gets treated with `min(abs(flatten),1.f)` to make it conform. <br> A value equal to 1.0 or -1.0 will render your IES profile uniform, so its not something you should use and a warning will be emitted. | float | 0.0 |
| filename | The filename of the IES profile. | string | "" |


NOTE: **\<transform\>** tag of emitter node can be used to orient the emission direction of IES light.

#### Example of Area Light with IES Profile
#### Example of Area Light with IES Profile which flattens its profile against a full Sphere or Hemisphere average

```xml
<emitter type="area" >
Expand All @@ -180,7 +194,8 @@ NOTE: **\<transform\>** tag of emitter node can be used to orient the emission d
</transform>
<rgb name="radiance" value="20.0"/>
<emissionprofile type="measured">
<float name="normalizeEnergy" value="42.5"/>
<string name="normalization" value="UNIT_AVERAGE_OVER_FULL_DOMAIN"/>
<float name="flatten" value="-0.1"/>
<string name="filename" value="emission_profile.ies"/>
</emissionprofile>
</emitter>
Expand Down
Loading