Skip to content

Commit af88f9d

Browse files
committed
v4.0.12
Kotlin 1.2.60 Gradle 4.10
1 parent 40bea13 commit af88f9d

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/main/kotlin/assimp/Importer.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ constructor() {
188188
var ioHandler: IOSystem
189189
get() = impl.ioSystem
190190
set(value) {
191-
if (value != null) {
191+
if (value != null) { // TODO check nullability
192192
impl.ioSystem = value
193193
impl.isDefaultHandler = false
194194
} else {
@@ -462,34 +462,34 @@ constructor() {
462462
*
463463
* This is strictly equivalent to calling readFile() with the same flags. However, you can use this separate
464464
* function to inspect the imported scene first to fine-tune your post-processing setup.
465-
* @param flags Provide a bitwise combination of the AiPostProcessSteps flags.
465+
* @param flags_ Provide a bitwise combination of the AiPostProcessSteps flags.
466466
* @return A pointer to the post-processed data. This is still the same as the pointer returned by readFile().
467467
* However, if post-processing fails, the scene could now be null.
468468
* That's quite a rare case, post processing steps are not really designed to 'fail'. To be exact, the
469469
* AiProcess_ValidateDS flag is currently the only post processing step which can actually cause the scene to be
470470
* reset to null.
471471
*
472472
* @note The method does nothing if no scene is currently bound to the Importer instance. */
473-
fun applyPostProcessing(flags: Int): AiScene? {
473+
fun applyPostProcessing(flags_: Int): AiScene? {
474474
// Return immediately if no scene is active
475475
if (impl.scene == null) return null
476476
// If no flags are given, return the current scene with no further action
477-
if (flags == 0) return impl.scene
477+
if (flags_ == 0) return impl.scene
478478
// In debug builds: run basic flag validation
479-
assert(_validateFlags(flags))
479+
assert(_validateFlags(flags_))
480480
logger.info("Entering post processing pipeline")
481481
if (!ASSIMP.NO.VALIDATEDS_PROCESS)
482482
/* The ValidateDS process plays an exceptional role. It isn't contained in the global list of post-processing
483483
steps, so we need to call it manually. */
484-
if (flags has Pps.ValidateDataStructure) {
484+
if (flags_ has Pps.ValidateDataStructure) {
485485
ValidateDSProcess().executeOnScene(this)
486486
if (impl.scene == null) return null
487487
}
488-
if (flags has Pps.OptimizeMeshes) {
488+
if (flags_ has Pps.OptimizeMeshes) {
489489
OptimizeMeshes().executeOnScene(this)
490490
if (impl.scene == null) return null
491491
}
492-
var flags = flags
492+
var flags = flags_
493493
if (ASSIMP.DEBUG) {
494494
if (impl.extraVerbose) {
495495
if (ASSIMP.NO.VALIDATEDS_PROCESS)

src/main/kotlin/assimp/version.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,7 @@ val branch = "master"
7575
/** @brief Returns assimp's compile flags
7676
* @return Any bitwise combination of the ASSIMP_CFLAGS_xxx constants.
7777
*/
78-
val compileFlags = ASSIMP.DEBUG.i
78+
val compileFlags = ASSIMP.DEBUG.i
79+
80+
/** JVM custom */
81+
val version = "4.0.12"

0 commit comments

Comments
 (0)