Commit 0c83cbf
Add cross-platform ColorRGBA/Texture2D helpers to ShaderUtils; enable terrain in iOS examples
- Add mix(ColorRGBA, ColorRGBA, float) as cross-platform replacement for removed mix(java.awt.Color, ...)
- Add getImageDataFromTexture(Texture2D) as cross-platform replacement for removed getImageDataFromImage(BufferedImage)
- Remove jme3test.terrain. from iOS example chooser excluded prefixes
- Move jme3-terrain from iosIncludeAwtUnsafeModules conditional to unconditional iOS dependencies
Agent-Logs-Url: https://github.com/jMonkeyEngine/jmonkeyengine/sessions/612baf0b-d7a0-4d66-bc40-412519339e72
Co-authored-by: riccardobl <4943530+riccardobl@users.noreply.github.com>1 parent b54d36f commit 0c83cbf
2 files changed
Lines changed: 18 additions & 3 deletions
File tree
- jme3-ios-examples
- jme3-terrain/src/main/java/com/jme3/terrain/noise
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | | - | |
| 38 | + | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
| |||
311 | 310 | | |
312 | 311 | | |
313 | 312 | | |
| 313 | + | |
314 | 314 | | |
315 | 315 | | |
316 | 316 | | |
317 | | - | |
318 | 317 | | |
319 | 318 | | |
320 | 319 | | |
| |||
Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
32 | 36 | | |
33 | 37 | | |
34 | 38 | | |
| |||
61 | 65 | | |
62 | 66 | | |
63 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
64 | 76 | | |
65 | 77 | | |
66 | 78 | | |
| |||
242 | 254 | | |
243 | 255 | | |
244 | 256 | | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
245 | 261 | | |
246 | 262 | | |
247 | 263 | | |
| |||
0 commit comments