Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Skybox, etc #35

Merged
merged 21 commits into from
Sep 28, 2020
Merged

Skybox, etc #35

merged 21 commits into from
Sep 28, 2020

Conversation

dhakehurst
Copy link
Contributor

  • progress on 3D
  • skybox
  • terrain (could do with more work)
  • text3D (needs more work)
  • Camera Movement functions and switch to "left hand rule" for 3D axis (openGL standard)
  • 3D mesh builder uses indices
  • Other
  • add facility to switch on logging to Korge
  • arg to allow Korge to run without blocking thread
  • other mods to enable skybox

…ext3D

# Conflicts:
#	korge/src/commonMain/kotlin/com/soywiz/korge3d/RenderContext3D.kt
#	korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt
…ext3D

# Conflicts:
#	korge/src/commonMain/kotlin/com/soywiz/korge3d/RenderContext3D.kt
#	korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt
…ext3D

# Conflicts:
#	korge/src/commonMain/kotlin/com/soywiz/korge/Korge.kt
#	korge/src/commonMain/kotlin/com/soywiz/korge/KorgeHeadless.kt
#	korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt
…ext3D

# Conflicts:
#	korge/src/commonMain/kotlin/com/soywiz/korge/Korge.kt
#	korge/src/commonMain/kotlin/com/soywiz/korge/KorgeHeadless.kt
#	korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt
Comment on lines +20 to +27
class TweenComponent(
override val view: View3D,
private val vs: List<V2<*>>,
val time: HRTimeSpan = HRTimeSpan.NIL,
val easing: Easing = DEFAULT_EASING,
val callback: (Double) -> Unit,
val c: CancellableContinuation<Unit>
) : UpdateComponentV2 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole file is duplicated. I think we should try to figure out a way to deduplicate it. Maybe we can create something like BaseView interface that is implemented by View and View3D? Or extract the functionality in a place that could be called in both cases

@soywiz soywiz merged commit ab22dce into soywiz-archive:master Sep 28, 2020
@soywiz
Copy link
Member

soywiz commented Sep 28, 2020

Thanks @dhakehurst ! A really nice contribution.
I will try to generalize some duplicated code so we can deduplicate it, I will try to do that in a PR so you can review it

@dhakehurst
Copy link
Contributor Author

dhakehurst commented Sep 28, 2020 via email

@dhakehurst dhakehurst deleted the skybox branch September 28, 2020 15:01
@soywiz
Copy link
Member

soywiz commented Sep 28, 2020

In the end I have deduplicated it like this (created BaseView): cf4baf3

@dhakehurst
Copy link
Contributor Author

dhakehurst commented Sep 29, 2020 via email

@SerVB SerVB mentioned this pull request Apr 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants