| 74 |
74 |
}
|
| 75 |
75 |
|
| 76 |
76 |
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 77 |
|
fun <T:MeshBase> vertex(target: T, effect: VertexEffect?): JobNode
|
|
77 |
fun <T:MeshBase> vertex(target: T, effect: VertexEffect): JobNode
|
| 78 |
78 |
{
|
| 79 |
79 |
val jn = target.mJobNode[0]
|
| 80 |
80 |
|
| ... | ... | |
| 105 |
105 |
}
|
| 106 |
106 |
|
| 107 |
107 |
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 108 |
|
fun <T:MeshBase> matrix(target: T, effect: MatrixEffect?, andAssoc: Int, ecuAssoc: Int): JobNode
|
|
108 |
fun <T:MeshBase> matrix(target: T, effect: MatrixEffect, andAssoc: Int, ecuAssoc: Int): JobNode
|
| 109 |
109 |
{
|
| 110 |
110 |
val jn = target.mJobNode[0]
|
| 111 |
111 |
val job = Job(JOB_TYPE_MATRIX, target, null, null, effect, null, 0, andAssoc, ecuAssoc, 0f, 0f, 0f, null)
|
| ... | ... | |
| 188 |
188 |
}
|
| 189 |
189 |
|
| 190 |
190 |
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 191 |
|
fun <T:MeshBase> textureMap(target: T, maps: Array<Static4D?>?, comp: Int): JobNode
|
|
191 |
fun <T:MeshBase> textureMap(target: T, maps: Array<Static4D?>, comp: Int): JobNode
|
| 192 |
192 |
{
|
| 193 |
193 |
val jn = target.mJobNode[0]
|
| 194 |
194 |
val job = Job(JOB_TYPE_TEXTURE, target, null, null, null, maps, comp, 0, 0, 0f, 0f, 0f, null)
|
| ... | ... | |
| 254 |
254 |
(val mType: Int, val mTarget: MeshBase, source: Array<MeshBase>?, vEff: VertexEffect?, mEff: MatrixEffect?,
|
| 255 |
255 |
maps: Array<Static4D?>?, comp: Int, and: Int, equ: Int, x: Float, y: Float, z: Float, comps: IntArray?)
|
| 256 |
256 |
{
|
| 257 |
|
private val mSource = source!!
|
| 258 |
|
private val mMatrixEffect: MatrixEffect
|
| 259 |
|
private val mMaps = maps!!
|
|
257 |
private val mSource = source
|
|
258 |
private val mMatrixEffect: MatrixEffect?
|
|
259 |
private val mMaps = maps
|
| 260 |
260 |
private val mComp = comp
|
| 261 |
261 |
private val mAndAssoc = and
|
| 262 |
262 |
private val mEquAssoc = equ
|
| ... | ... | |
| 275 |
275 |
mVertexEffects!!.add(vEff)
|
| 276 |
276 |
}
|
| 277 |
277 |
|
| 278 |
|
mMatrixEffect = mEff!!
|
|
278 |
mMatrixEffect = mEff
|
| 279 |
279 |
}
|
| 280 |
280 |
|
| 281 |
|
fun addEffect(effect: VertexEffect?)
|
|
281 |
fun addEffect(effect: VertexEffect)
|
| 282 |
282 |
{
|
| 283 |
283 |
mVertexEffects!!.add(effect)
|
| 284 |
284 |
}
|
| ... | ... | |
| 288 |
288 |
when (mType)
|
| 289 |
289 |
{
|
| 290 |
290 |
JOB_TYPE_VERTEX -> DistortedLibrary.adjustVertices(mTarget, mVertexEffects)
|
| 291 |
|
JOB_TYPE_MATRIX -> mTarget.applyMatrix(mMatrixEffect, mAndAssoc, mEquAssoc)
|
|
291 |
JOB_TYPE_MATRIX -> mTarget.applyMatrix(mMatrixEffect!!, mAndAssoc, mEquAssoc)
|
| 292 |
292 |
JOB_TYPE_MERGE_TEX -> mTarget.mergeTexComponentsNow()
|
| 293 |
293 |
JOB_TYPE_MERGE_EFF -> mTarget.mergeEffComponentsNow()
|
| 294 |
|
JOB_TYPE_JOIN -> mTarget.joinAttribs(mSource)
|
| 295 |
|
JOB_TYPE_COPY -> mTarget.copy(mSource[0])
|
| 296 |
|
JOB_TYPE_TEXTURE -> mTarget.textureMap(mMaps, mComp)
|
|
294 |
JOB_TYPE_JOIN -> mTarget.joinAttribs(mSource!!)
|
|
295 |
JOB_TYPE_COPY -> mTarget.copy(mSource!![0])
|
|
296 |
JOB_TYPE_TEXTURE -> mTarget.textureMap(mMaps!!, mComp)
|
| 297 |
297 |
JOB_TYPE_ASSOC -> mTarget.setEffectAssociationNow(mComp, mAndAssoc, mEquAssoc)
|
| 298 |
298 |
JOB_TYPE_CENTER -> mTarget.setComponentCenterNow(mComp, mX, mY, mZ)
|
| 299 |
299 |
JOB_TYPE_ADD_EMPTY_TEX -> mTarget.addEmptyTexComponentNow()
|
fixes