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

Jump to bottom

feat: Models and ModelLayer #3209

Merged
merged 5 commits into from
Nov 29, 2023
Merged

feat: Models and ModelLayer #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff60353
feat: model to add 3d models to map
mfazekas Nov 28, 2023
694d9c5
feat: add model-layer
mfazekas Nov 29, 2023
3d85d9c
feat: add model-layer on android
mfazekas Nov 29, 2023
6fed2a2
fix(android): fix build error in android
mfazekas Nov 29, 2023
5e45da2
fix(ios): fix new arch errors
mfazekas Nov 29, 2023
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
2 changes: 2 additions & 0 deletions __tests__/interface.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ describe('Public Interface', () => {
'CircleLayer',
'HeatmapLayer',
'LineLayer',
'ModelLayer',
'SymbolLayer',
'BackgroundLayer',
'RasterLayer',
Expand All @@ -46,6 +47,7 @@ describe('Public Interface', () => {
'RasterDemSource',
'Images',
'Image',
'Models',

// constants
'UserTrackingModes', // deprecated
Expand Down
4 changes: 4 additions & 0 deletions android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
Expand Down Expand Up @@ -111,6 +113,7 @@ class RNMBXPackage : TurboReactPackage() {
managers.add(RNMBXViewportManager(reactApplicationContext))
managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
managers.add(RNMBXStyleImportManager(reactApplicationContext))
managers.add(RNMBXModelsManager(reactApplicationContext))

// annotations
managers.add(RNMBXMarkerViewManager(reactApplicationContext))
Expand Down Expand Up @@ -146,6 +149,7 @@ class RNMBXPackage : TurboReactPackage() {
managers.add(RNMBXAtmosphereManager())
managers.add(RNMBXBackgroundLayerManager())
managers.add(RNMBXLightManager())
managers.add(RNMBXModelLayerManager())
return managers
}

Expand Down
1 change: 1 addition & 0 deletions android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.mapbox.maps.ImageContent
import com.mapbox.maps.ImageStretches
import com.rnmapbox.rnmbx.components.AbstractEventEmitter
import com.rnmapbox.rnmbx.events.constants.EventKeys
import com.rnmapbox.rnmbx.events.constants.eventMapOf
import com.rnmapbox.rnmbx.utils.ImageEntry
import com.rnmapbox.rnmbx.utils.Logger
import com.rnmapbox.rnmbx.utils.ResourceUtils
Expand Down
Loading
Loading