-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #87 from vitrivr/feature/3d-preview
Feature: 3D Renderer and Preview Export of Thumbnails
- Loading branch information
Showing
107 changed files
with
7,537 additions
and
909 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| { | ||
| "schema": "vitrivr", | ||
| "context": { | ||
| "contentFactory": "InMemoryContentFactory", | ||
| "resolverName": "disk", | ||
| "local": { | ||
| "enumerator": { | ||
| "path": "./path/to/videos", | ||
| "depth": "1" | ||
| }, | ||
| "thumbs": { | ||
| "maxSideResolution": "350", | ||
| "mimeType": "JPG" | ||
| }, | ||
| "filter": { | ||
| "type": "SOURCE:VIDEO" | ||
| } | ||
| } | ||
| }, | ||
| "operators": { | ||
| "enumerator": { | ||
| "type": "ENUMERATOR", | ||
| "factory": "FileSystemEnumerator", | ||
| "mediaTypes": [ | ||
| "VIDEO" | ||
| ] | ||
| }, | ||
| "decoder": { | ||
| "type": "DECODER", | ||
| "factory": "VideoDecoder" | ||
| }, | ||
| "selector": { | ||
| "type": "TRANSFORMER", | ||
| "factory": "LastContentAggregator" | ||
| }, | ||
| "avgColor": { | ||
| "type": "EXTRACTOR", | ||
| "fieldName": "averagecolor" | ||
| }, | ||
| "file_metadata": { | ||
| "type": "EXTRACTOR", | ||
| "fieldName": "file" | ||
| }, | ||
| "time_metadata": { | ||
| "type": "EXTRACTOR", | ||
| "fieldName": "time" | ||
| }, | ||
| "video_metadata": { | ||
| "type": "EXTRACTOR", | ||
| "fieldName": "video" | ||
| }, | ||
| "thumbs": { | ||
| "type": "EXPORTER", | ||
| "exporterName": "thumbnail" | ||
| }, | ||
| "filter": { | ||
| "type": "TRANSFORMER", | ||
| "factory": "TypeFilterTransformer" | ||
| } | ||
| }, | ||
| "operations": { | ||
| "enumerator": { | ||
| "operator": "enumerator" | ||
| }, | ||
| "decoder": { | ||
| "operator": "decoder", | ||
| "inputs": [ | ||
| "enumerator" | ||
| ] | ||
| }, | ||
| "selector": { | ||
| "operator": "selector", | ||
| "inputs": [ | ||
| "decoder" | ||
| ] | ||
| }, | ||
| "averagecolor": { | ||
| "operator": "avgColor", | ||
| "inputs": [ | ||
| "selector" | ||
| ] | ||
| }, | ||
| "thumbnails": { | ||
| "operator": "thumbs", | ||
| "inputs": [ | ||
| "selector" | ||
| ] | ||
| }, | ||
| "time_metadata": { | ||
| "operator": "time_metadata", | ||
| "inputs": [ | ||
| "selector" | ||
| ] | ||
| }, | ||
| "filter": { | ||
| "operator": "filter", | ||
| "inputs": [ | ||
| "averagecolor", | ||
| "thumbnails", | ||
| "time_metadata" | ||
| ], | ||
| "merge": "COMBINE" | ||
| }, | ||
| "video_metadata": { | ||
| "operator": "video_metadata", | ||
| "inputs": [ | ||
| "filter" | ||
| ] | ||
| }, | ||
| "file_metadata": { | ||
| "operator": "file_metadata", | ||
| "inputs": [ | ||
| "video_metadata" | ||
| ] | ||
| } | ||
| }, | ||
| "output": [ | ||
| "file_metadata" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "schemas": { | ||
| "vitrivr": { | ||
| "connection": { | ||
| "database": "CottontailConnectionProvider", | ||
| "parameters": { | ||
| "Host": "127.0.0.1", | ||
| "port": "1865" | ||
| } | ||
| }, | ||
| "fields": { | ||
| "averagecolor": { | ||
| "factory": "AverageColor" | ||
| }, | ||
| "file": { | ||
| "factory": "FileSourceMetadata" | ||
| }, | ||
| "time": { | ||
| "factory": "TemporalMetadata" | ||
| }, | ||
| "video": { | ||
| "factory": "VideoSourceMetadata" | ||
| } | ||
| }, | ||
| "resolvers": { | ||
| "disk": { | ||
| "factory": "DiskResolver", | ||
| "parameters": { | ||
| "location": "./thumbnails/vitrivr", | ||
| "mimeType": "GIF" | ||
| } | ||
| } | ||
| }, | ||
| "exporters": { | ||
| "thumbnail": { | ||
| "factory": "ThumbnailExporter", | ||
| "resolverName": "disk", | ||
| "parameters": { | ||
| "maxSideResolution": "400", | ||
| "mimeType": "JPG" | ||
| } | ||
| }, | ||
| "preview": { | ||
| "factory": "ModelPreviewExporter", | ||
| "resolverName": "disk", | ||
| "parameters": { | ||
| "maxSideResolution": "400", | ||
| "mimeType": "GLTF", | ||
| "distance": "1", | ||
| "format": "jpg", | ||
| "views": "4" | ||
| } | ||
| } | ||
| }, | ||
| "extractionPipelines": { | ||
| "ingestion": { | ||
| "path": "./config-ingestion.json" | ||
| }, | ||
| "preview": { | ||
| "path": "./config-ingestion-preview-mesh.json" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...gine-core/src/main/kotlin/org/vitrivr/engine/core/model/content/element/Model3DContent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 0 additions & 28 deletions
28
vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/mesh/Material.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.