Skip to content

Commit

Permalink
Merge branch 'ccrouzet/ocean' into 'main'
Browse files Browse the repository at this point in the history
Port the Sample From the `omni.ocean` Extension

See merge request omniverse/warp!739
  • Loading branch information
mmacklin committed Sep 20, 2024
2 parents d02e4d1 + 77de35c commit 9392df9
Show file tree
Hide file tree
Showing 6 changed files with 919 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- Fix issues with unrelated functions being treated as overloads (e.g., closures)
- Skip unused functions in module code generation, improving performance
- Avoid reloading modules if their content does not change, improving performance
- Add an ocean sample to the `omni.warp` extension.

## [1.3.3] - 2024-09-04

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions exts/omni.warp/data/scenes/assets/geometries/ocean.usd
Git LFS file not shown
518 changes: 518 additions & 0 deletions exts/omni.warp/data/scenes/ocean.usda

Large diffs are not rendered by default.

105 changes: 105 additions & 0 deletions exts/omni.warp/omni/warp/nodes/_impl/OgnSampleOceanDeform.ogn
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"WarpSampleOceanDeform": {
"version": 1,
"categoryDefinitions": "../../../../config/warp_categories.json",
"description": "Mesh deformer modeling ocean waves.",
"categories": ["warp"],
"language": "Python",
"uiName": "Ocean Deform",
"cudaPointers": "cpu",
"inputs": {
"execIn": {
"type": "execution",
"description": "Input execution."
},
"mesh": {
"type": "bundle",
"uiName": "Mesh",
"description": "Input mesh geometry.",
"memoryType": "cuda"
},
"directionality": {
"type": "float",
"uiName": "Directionality",
"description": "Isotropic vs directional wave motion",
"default": 0,
"minimum": 0.0,
"maximum": 1.0
},
"amplitude": {
"type": "float",
"uiName": "Amplitude",
"description": "Wave amplitude factor.",
"default": 1.0,
"minimum": 0.001,
"maximum": 1000.0
},
"direction": {
"type": "float",
"uiName": "Direction",
"description": "Wave direction.",
"default": 0,
"minimum": 0.0,
"maximum": 1.0
},
"scale": {
"type": "float",
"uiName": "Horizontal Scale",
"description": "Horizontal wave scaling, can be used to match scene units.",
"default": 1.0,
"minimum": 0.001,
"maximum": 1000.0
},
"waterDepth": {
"type": "float",
"uiName": "Water Depth",
"description": "Water depth (1..1000 m).",
"default": 50.0,
"minimum": 1.0,
"maximum": 1000.0
},
"windSpeed": {
"type": "float",
"uiName": "Wind Speed",
"description": "Wind speed (m/s) 10m above ocean (0..30).",
"default": 10.0,
"minimum": 0.0,
"maximum": 30.0
},
"cameraPos": {
"type": "vectorf[3]",
"uiName": "Camera Position",
"default": [
0.0,
0.0,
0.0
],
"description": "Camera position to use to move the clipmap."
},
"clipmapCellSize": {
"type": "float",
"uiName": "Clipmap Cell Size",
"description": "Size of a single cell at the centre of the clipmap grid.",
"default": 1.0
},
"time": {
"type": "double",
"uiName": "Time",
"description": "Time.",
"default": 0
}
},
"outputs": {
"execOut": {
"type": "execution",
"description": "Output execution."
},
"mesh": {
"type": "bundle",
"uiName": "Mesh",
"description": "Output mesh geometry.",
"memoryType": "cuda"
}
}
}
}
Loading

0 comments on commit 9392df9

Please sign in to comment.