Commit 025333f
committed
[1.3.60] 2025-12-08
## Core
- Added vector-scalar arithmetic operators for `std::vector<float>` to enable element-wise operations: addition (`vec + scalar`, `scalar + vec`), subtraction (`vec - scalar`, `scalar - vec`), multiplication (`vec * scalar`, `scalar * vec`), and division (`vec / scalar`, `scalar / vec`).
- Fixed an issue with shared materials. If duplicate materials were merged, and the color/texture/etc. is changed for a subset of primitives, all primitives sharing that merged material would be affected.
## Photosynthesis
- Added `setCi()` method to manually override intercellular CO2 concentration for specified primitives, bypassing the normal iterative calculation that couples photosynthesis with stomatal conductance. This feature is primarily intended for testing and validation purposes.
- CRITICAL BUG: Fixed bug in `evaluateFarquharModel()` where incorrect variable name was used when calling `fzero()`. This could result in parameters reverting to the default values in certain cases.
- Added check for Farquhar `Topt` parameters to catch instances where users specify them in units of Kelvin instead of Celsius.
## Plant Architecture
- Substantially refactored XML reading/writing to avoid writing position and orientation vectors to XML. Instead, they are auto-computed based on bulk parameters.
## Radiation
- Added zoom parameter to the radiation camera parameters structure. By default zoom is 1x, so should be backward compatible.
- Added lens flare model to radiation camera.
- Radiation sources are now rendered in the radiation camera images if in view of the camera.1 parent fd8f6aa commit 025333f
44 files changed
Lines changed: 3601 additions & 1994 deletions
File tree
- core
- include
- src
- tests
- doc
- assets
- plugins
- canopygenerator/src
- leafoptics
- src
- tests
- photosynthesis
- doc
- include
- src
- tests
- plantarchitecture
- include
- src
- tests
- projectbuilder/src
- radiation
- include
- src
- tests
- solarposition
- include
- src
- tests
- stomatalconductance
- src
- tests
- voxelintersection/src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
151 | 155 | | |
152 | 156 | | |
153 | 157 | | |
| |||
176 | 180 | | |
177 | 181 | | |
178 | 182 | | |
179 | | - | |
| 183 | + | |
| 184 | + | |
180 | 185 | | |
181 | 186 | | |
182 | | - | |
183 | | - | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
184 | 190 | | |
185 | 191 | | |
186 | 192 | | |
| |||
549 | 555 | | |
550 | 556 | | |
551 | 557 | | |
552 | | - | |
| 558 | + | |
553 | 559 | | |
554 | 560 | | |
555 | 561 | | |
| |||
2472 | 2478 | | |
2473 | 2479 | | |
2474 | 2480 | | |
2475 | | - | |
| 2481 | + | |
2476 | 2482 | | |
2477 | 2483 | | |
2478 | 2484 | | |
| |||
2608 | 2614 | | |
2609 | 2615 | | |
2610 | 2616 | | |
2611 | | - | |
| 2617 | + | |
2612 | 2618 | | |
2613 | 2619 | | |
2614 | 2620 | | |
| |||
2632 | 2638 | | |
2633 | 2639 | | |
2634 | 2640 | | |
| 2641 | + | |
| 2642 | + | |
| 2643 | + | |
| 2644 | + | |
| 2645 | + | |
| 2646 | + | |
2635 | 2647 | | |
2636 | 2648 | | |
2637 | 2649 | | |
| |||
4418 | 4430 | | |
4419 | 4431 | | |
4420 | 4432 | | |
4421 | | - | |
4422 | | - | |
4423 | | - | |
| 4433 | + | |
4424 | 4434 | | |
4425 | 4435 | | |
4426 | 4436 | | |
| |||
4436 | 4446 | | |
4437 | 4447 | | |
4438 | 4448 | | |
4439 | | - | |
| 4449 | + | |
4440 | 4450 | | |
4441 | 4451 | | |
4442 | 4452 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1028 | 1028 | | |
1029 | 1029 | | |
1030 | 1030 | | |
1031 | | - | |
| 1031 | + | |
| 1032 | + | |
1032 | 1033 | | |
1033 | 1034 | | |
1034 | 1035 | | |
| |||
1275 | 1276 | | |
1276 | 1277 | | |
1277 | 1278 | | |
| 1279 | + | |
| 1280 | + | |
| 1281 | + | |
| 1282 | + | |
| 1283 | + | |
| 1284 | + | |
| 1285 | + | |
| 1286 | + | |
| 1287 | + | |
| 1288 | + | |
| 1289 | + | |
| 1290 | + | |
| 1291 | + | |
| 1292 | + | |
| 1293 | + | |
| 1294 | + | |
| 1295 | + | |
| 1296 | + | |
| 1297 | + | |
| 1298 | + | |
| 1299 | + | |
| 1300 | + | |
| 1301 | + | |
| 1302 | + | |
| 1303 | + | |
| 1304 | + | |
| 1305 | + | |
| 1306 | + | |
| 1307 | + | |
| 1308 | + | |
| 1309 | + | |
| 1310 | + | |
| 1311 | + | |
| 1312 | + | |
| 1313 | + | |
| 1314 | + | |
| 1315 | + | |
| 1316 | + | |
| 1317 | + | |
| 1318 | + | |
| 1319 | + | |
| 1320 | + | |
| 1321 | + | |
| 1322 | + | |
| 1323 | + | |
| 1324 | + | |
| 1325 | + | |
| 1326 | + | |
| 1327 | + | |
| 1328 | + | |
| 1329 | + | |
| 1330 | + | |
| 1331 | + | |
| 1332 | + | |
| 1333 | + | |
| 1334 | + | |
| 1335 | + | |
| 1336 | + | |
| 1337 | + | |
| 1338 | + | |
| 1339 | + | |
| 1340 | + | |
| 1341 | + | |
| 1342 | + | |
| 1343 | + | |
| 1344 | + | |
| 1345 | + | |
| 1346 | + | |
| 1347 | + | |
| 1348 | + | |
| 1349 | + | |
| 1350 | + | |
| 1351 | + | |
| 1352 | + | |
| 1353 | + | |
| 1354 | + | |
| 1355 | + | |
| 1356 | + | |
| 1357 | + | |
| 1358 | + | |
| 1359 | + | |
| 1360 | + | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
| 1386 | + | |
| 1387 | + | |
| 1388 | + | |
| 1389 | + | |
| 1390 | + | |
1278 | 1391 | | |
1279 | 1392 | | |
1280 | 1393 | | |
| |||
1452 | 1565 | | |
1453 | 1566 | | |
1454 | 1567 | | |
1455 | | - | |
| 1568 | + | |
1456 | 1569 | | |
1457 | | - | |
1458 | | - | |
1459 | | - | |
| 1570 | + | |
| 1571 | + | |
| 1572 | + | |
1460 | 1573 | | |
1461 | 1574 | | |
1462 | 1575 | | |
| |||
0 commit comments