Skip to content

Commit 983bfcf

Browse files
authored
feat: Models and ModelLayer (#3209)
* feat: model to add 3d models to map * feat: add model-layer * feat: add model-layer on android * fix(android): fix build error in android * fix(ios): fix new arch errors
1 parent 73272d4 commit 983bfcf

File tree

69 files changed

+6767
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+6767
-546
lines changed

__tests__/interface.test.js

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ describe('Public Interface', () => {
3131
'CircleLayer',
3232
'HeatmapLayer',
3333
'LineLayer',
34+
'ModelLayer',
3435
'SymbolLayer',
3536
'BackgroundLayer',
3637
'RasterLayer',
@@ -46,6 +47,7 @@ describe('Public Interface', () => {
4647
'RasterDemSource',
4748
'Images',
4849
'Image',
50+
'Models',
4951

5052
// constants
5153
'UserTrackingModes', // deprecated

android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

+4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
3030
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
3131
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
3232
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
33+
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
3334
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
3435
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
3536
import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
3637
import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
38+
import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
3739
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
3840
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
3941
import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
@@ -111,6 +113,7 @@ class RNMBXPackage : TurboReactPackage() {
111113
managers.add(RNMBXViewportManager(reactApplicationContext))
112114
managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
113115
managers.add(RNMBXStyleImportManager(reactApplicationContext))
116+
managers.add(RNMBXModelsManager(reactApplicationContext))
114117

115118
// annotations
116119
managers.add(RNMBXMarkerViewManager(reactApplicationContext))
@@ -146,6 +149,7 @@ class RNMBXPackage : TurboReactPackage() {
146149
managers.add(RNMBXAtmosphereManager())
147150
managers.add(RNMBXBackgroundLayerManager())
148151
managers.add(RNMBXLightManager())
152+
managers.add(RNMBXModelLayerManager())
149153
return managers
150154
}
151155

android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.mapbox.maps.ImageContent
1414
import com.mapbox.maps.ImageStretches
1515
import com.rnmapbox.rnmbx.components.AbstractEventEmitter
1616
import com.rnmapbox.rnmbx.events.constants.EventKeys
17+
import com.rnmapbox.rnmbx.events.constants.eventMapOf
1718
import com.rnmapbox.rnmbx.utils.ImageEntry
1819
import com.rnmapbox.rnmbx.utils.Logger
1920
import com.rnmapbox.rnmbx.utils.ResourceUtils

0 commit comments

Comments
 (0)