Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: 3D Renderer and Preview Export of Thumbnails #87

Merged
merged 43 commits into from
Aug 27, 2024
Merged

Feature: 3D Renderer and Preview Export of Thumbnails #87

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9cc66fe
init rendering work from @net-cscience-raphael (see Cineast)
rahelarnold98 Jul 8, 2024
9fa71ca
rendering of 3d models with embedded textures completed
rahelarnold98 Jul 10, 2024
25a279c
3D rendering and extracting of a preview finally works🥳, clean up fol…
rahelarnold98 Jul 11, 2024
f362c99
deleted duplicated and no longer used files
rahelarnold98 Jul 11, 2024
9dfa0a3
more cleanup
rahelarnold98 Jul 11, 2024
8a21952
deleted unused files
rahelarnold98 Jul 11, 2024
09a75c6
minor cleanup changes
rahelarnold98 Jul 12, 2024
ccac2de
3d model preview can now be a gif of different views
rahelarnold98 Jul 12, 2024
8678d62
removed print statements used while debuggung
rahelarnold98 Jul 12, 2024
b2d3e55
rendering window is hidden
rahelarnold98 Jul 12, 2024
2b15d7d
renamed model to model3d to be more specific
rahelarnold98 Jul 29, 2024
237c538
renamed ModelContent to Model3DContent to be more specific
rahelarnold98 Jul 29, 2024
f50b53d
removed deprecated and unused functions from core.model.mesh
rahelarnold98 Jul 29, 2024
a1ee346
changed OptimizerOptions to class
rahelarnold98 Jul 29, 2024
8714eca
removed empty class
rahelarnold98 Jul 29, 2024
335b167
Adds facility for external rendering.
ppanopticon Jul 29, 2024
170f676
Adds facility for external rendering.
ppanopticon Jul 29, 2024
641453f
Fixes combination of four images in ModelPreviewExporter.
ppanopticon Jul 29, 2024
9427706
Removes superfluous Renderer interface.
ppanopticon Jul 29, 2024
1fecf4f
ExternalRenderer now re-creates the external process on demand.
Aug 5, 2024
d9e67f8
rewrite of Java code to Kotlin
rahelarnold98 Aug 7, 2024
39f4ac7
changed GLMaterial to data class
rahelarnold98 Aug 7, 2024
fad75ca
changed Texture to data class
rahelarnold98 Aug 7, 2024
cc627ca
changed RenderOptions to data class
rahelarnold98 Aug 7, 2024
f6fd74c
changed RenderActions to enum
rahelarnold98 Aug 7, 2024
7e8d974
Camera is now a data class
rahelarnold98 Aug 7, 2024
70f3a36
removed joml dependency in core module
rahelarnold98 Aug 16, 2024
2a28b39
merged dev in feature branch
rahelarnold98 Aug 22, 2024
7f276a2
Minor optimisation as proposed by @lucaro.
ppanopticon Aug 23, 2024
8aecbef
Attempt at better error reporting.
ppanopticon Aug 23, 2024
16affa6
The -XstartOnFirstThread is only used on MacOS.
ppanopticon Aug 23, 2024
ad07a8f
Improves error reporting.
ppanopticon Aug 23, 2024
10042ba
GitHub action script now creates a screen (in an attempt to get GLFW …
ppanopticon Aug 23, 2024
b02197e
Removes logging.
ppanopticon Aug 23, 2024
6c47ac2
Removes change, since it doesn't seem to work.
ppanopticon Aug 23, 2024
50e609d
Dependency clean-up.
ppanopticon Aug 23, 2024
cba45f5
Adds display to ubuntu container and runs tests with display.
ppanopticon Aug 23, 2024
6961a83
Adds test reporting to CI/CD.
ppanopticon Aug 23, 2024
7a14cee
Merge branch 'dev' into feature/3d-preview
ppanopticon Aug 23, 2024
1d719a6
DISPLAY=:1 is now integrated into ExternalRenderer invocation of proc…
ppanopticon Aug 23, 2024
eaa3821
Fix.
ppanopticon Aug 23, 2024
02dfef1
Merged
Aug 26, 2024
1247b9c
Downgrades Protobuf dependency, since it seems to be incompatible wit…
Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...e/model/content/element/Model3DContent.kt → ...ore/model/content/element/ModelContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
package org.vitrivr.engine.core.model.content.element

import org.vitrivr.engine.core.model.content.ContentType
import org.vitrivr.engine.core.model.mesh.Model3D
import java.awt.image.BufferedImage
import org.vitrivr.engine.core.model.mesh.texturemodel.Model

/**
* A 3D [ContentElement].
*
* @author Rahel Arnold
* @version 1.0.0
*/
interface Model3DContent: ContentElement<Model3D>{
/** The [ContentType] of a [Model3DContent] is always [ContentType.MESH]. */
interface ModelContent: ContentElement<Model>{
Copy link
Member

Choose a reason for hiding this comment

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

ModelContent is very generic; the previous name was more descriptive. I'd change it back.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done👍

/** The [ContentType] of a [ModelContent] is always [ContentType.MESH]. */

val id: String
get() = this.content.id
get() = this.content.modelId

override val type: ContentType
get() = ContentType.MESH
Expand Down
4 changes: 2 additions & 2 deletions ...ore/src/main/kotlin/org/vitrivr/engine/core/model/content/factory/CachedContentFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.vitrivr.engine.core.model.content.impl.cache.CachedAudioContent
import org.vitrivr.engine.core.model.content.impl.cache.CachedContent
import org.vitrivr.engine.core.model.content.impl.cache.CachedImageContent
import org.vitrivr.engine.core.model.content.impl.cache.CachedTextContent
import org.vitrivr.engine.core.model.mesh.Model3D
import org.vitrivr.engine.core.model.mesh.texturemodel.Model
import org.vitrivr.engine.core.model.metamodel.Schema
import java.awt.image.BufferedImage
import java.io.IOException
Expand Down Expand Up @@ -117,7 +117,7 @@ class CachedContentFactory : ContentFactoriesFactory {
return content
}

override fun newMeshContent(model3D: Model3D): Model3DContent {
override fun newMeshContent(model: Model): ModelContent {
check(!this.closed) { "CachedContentFactory has been closed." }
TODO()
Copy link
Member

Choose a reason for hiding this comment

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

This should be properly implemented before merging this PR.

}
Expand Down
6 changes: 3 additions & 3 deletions ...gine-core/src/main/kotlin/org/vitrivr/engine/core/model/content/factory/ContentFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package org.vitrivr.engine.core.model.content.factory

import org.vitrivr.engine.core.model.content.element.AudioContent
import org.vitrivr.engine.core.model.content.element.ImageContent
import org.vitrivr.engine.core.model.content.element.Model3DContent
import org.vitrivr.engine.core.model.content.element.ModelContent
import org.vitrivr.engine.core.model.content.element.TextContent
import org.vitrivr.engine.core.model.mesh.Model3D
import org.vitrivr.engine.core.model.mesh.texturemodel.Model
import java.awt.image.BufferedImage
import java.nio.ShortBuffer

Expand All @@ -15,5 +15,5 @@ interface ContentFactory {

fun newTextContent(text: String): TextContent

fun newMeshContent(model3D: Model3D): Model3DContent
fun newMeshContent(model: Model): ModelContent
}
4 changes: 2 additions & 2 deletions ...e/src/main/kotlin/org/vitrivr/engine/core/model/content/factory/InMemoryContentFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.vitrivr.engine.core.model.content.impl.memory.InMemoryAudioContent
import org.vitrivr.engine.core.model.content.impl.memory.InMemoryImageContent
import org.vitrivr.engine.core.model.content.impl.memory.InMemoryMeshContent
import org.vitrivr.engine.core.model.content.impl.memory.InMemoryTextContent
import org.vitrivr.engine.core.model.mesh.Model3D
import org.vitrivr.engine.core.model.mesh.texturemodel.Model
import org.vitrivr.engine.core.model.metamodel.Schema
import java.awt.image.BufferedImage
import java.nio.ShortBuffer
Expand All @@ -30,6 +30,6 @@ class InMemoryContentFactory : ContentFactoriesFactory {

override fun newTextContent(text: String): TextContent = InMemoryTextContent(text)

override fun newMeshContent(model3D: Model3D): Model3DContent = InMemoryMeshContent(model3D)
override fun newMeshContent(model: Model): ModelContent = InMemoryMeshContent(model)
}
}
6 changes: 3 additions & 3 deletions .../src/main/kotlin/org/vitrivr/engine/core/model/content/impl/memory/InMemoryMeshContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.vitrivr.engine.core.model.content.impl.memory

import org.vitrivr.engine.core.model.content.element.ImageContent
import org.vitrivr.engine.core.model.content.element.Model3DContent
import org.vitrivr.engine.core.model.mesh.Model3D
import org.vitrivr.engine.core.model.content.element.ModelContent
import org.vitrivr.engine.core.model.mesh.texturemodel.Model

/**
* A naive in-memory implementation of the [ImageContent] interface.
Expand All @@ -12,4 +12,4 @@ import org.vitrivr.engine.core.model.mesh.Model3D
* @author Luca Rossetto.
* @version 1.0.0
*/
data class InMemoryMeshContent(override val content: Model3D) : Model3DContent
data class InMemoryMeshContent(override val content: Model) : ModelContent
28 changes: 0 additions & 28 deletions vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/mesh/Material.kt
View file
Open in desktop

This file was deleted.

199 changes: 0 additions & 199 deletions vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/mesh/Mesh.kt
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/mesh/Model3D.kt
View file
Open in desktop

This file was deleted.

Loading