Skip to content

Commit 5fc5b1e

Browse files
committed
Updating storage scene, adding test code, and adding vbl-core
1 parent 5629261 commit 5fc5b1e

File tree

14 files changed

+557
-122
lines changed

14 files changed

+557
-122
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Assets/vbl-core"]
2+
path = Assets/vbl-core
3+
url = https://github.com/dbirman/vbl-core

.vsconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.ManagedGame"
5+
]
6+
}

Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MonoBehaviour:
3232
m_RemoteCatalogBuildPath:
3333
m_Id: 8d294227e6e994fd3a0acbe9728872b1
3434
m_RemoteCatalogLoadPath:
35-
m_Id: brainlab.org/AddressablesStorage/[BuildTarget]
35+
m_Id: http://data.virtualbrainlab.org/AddressablesStorage/[BuildTarget]
3636
m_ContentStateBuildPath:
3737
m_overridePlayerVersion:
3838
m_GroupAssets:
@@ -59,7 +59,7 @@ MonoBehaviour:
5959
- m_Id: 8d294227e6e994fd3a0acbe9728872b1
6060
m_Value: ServerData/[BuildTarget]
6161
- m_Id: 778b3b19aa73b43dd91db4f1321e90ed
62-
m_Value: http://localhost/[BuildTarget]
62+
m_Value: http://data.virtualbrainlab.org/UMData/[BuildTarget]
6363
m_ProfileEntryNames:
6464
- m_Id: cb5cf8fbe87ed4a4db1afa2055cfe7cf
6565
m_Name: BuildTarget

Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ MonoBehaviour:
3434
m_RedirectLimit: -1
3535
m_RetryCount: 0
3636
m_BuildPath:
37-
m_Id: b1dd0f0e9a31a4757a408904e11c81a6
37+
m_Id: 8d294227e6e994fd3a0acbe9728872b1
3838
m_LoadPath:
39-
m_Id: http://data.virtualbrainlab.org/UMData/StandaloneWindows64/brainareas_assets_assets/addressableassets/allenccf/
39+
m_Id: 778b3b19aa73b43dd91db4f1321e90ed
4040
m_BundleMode: 0
4141
m_AssetBundleProviderType:
4242
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
Lines changed: 112 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RenderSettings:
3737
m_ReflectionBounces: 1
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
40-
m_Sun: {fileID: 705507994}
41-
m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1}
40+
m_Sun: {fileID: 0}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -75,18 +75,18 @@ LightmapSettings:
7575
m_BakeBackend: 1
7676
m_PVRSampling: 1
7777
m_PVRDirectSampleCount: 32
78-
m_PVRSampleCount: 500
78+
m_PVRSampleCount: 512
7979
m_PVRBounces: 2
80-
m_PVREnvironmentSampleCount: 500
80+
m_PVREnvironmentSampleCount: 256
8181
m_PVREnvironmentReferencePointCount: 2048
82-
m_PVRFilteringMode: 2
83-
m_PVRDenoiserTypeDirect: 0
84-
m_PVRDenoiserTypeIndirect: 0
85-
m_PVRDenoiserTypeAO: 0
82+
m_PVRFilteringMode: 1
83+
m_PVRDenoiserTypeDirect: 1
84+
m_PVRDenoiserTypeIndirect: 1
85+
m_PVRDenoiserTypeAO: 1
8686
m_PVRFilterTypeDirect: 0
8787
m_PVRFilterTypeIndirect: 0
8888
m_PVRFilterTypeAO: 0
89-
m_PVREnvironmentMIS: 0
89+
m_PVREnvironmentMIS: 1
9090
m_PVRCulling: 1
9191
m_PVRFilteringGaussRadiusDirect: 1
9292
m_PVRFilteringGaussRadiusIndirect: 5
@@ -123,78 +123,157 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126-
--- !u!1 &40737311
126+
--- !u!1 &17064360
127127
GameObject:
128128
m_ObjectHideFlags: 0
129129
m_CorrespondingSourceObject: {fileID: 0}
130130
m_PrefabInstance: {fileID: 0}
131131
m_PrefabAsset: {fileID: 0}
132132
serializedVersion: 6
133133
m_Component:
134-
- component: {fileID: 40737313}
135-
- component: {fileID: 40737312}
134+
- component: {fileID: 17064363}
135+
- component: {fileID: 17064362}
136+
- component: {fileID: 17064361}
137+
m_Layer: 0
138+
m_Name: Main Camera
139+
m_TagString: MainCamera
140+
m_Icon: {fileID: 0}
141+
m_NavMeshLayer: 0
142+
m_StaticEditorFlags: 0
143+
m_IsActive: 1
144+
--- !u!81 &17064361
145+
AudioListener:
146+
m_ObjectHideFlags: 0
147+
m_CorrespondingSourceObject: {fileID: 0}
148+
m_PrefabInstance: {fileID: 0}
149+
m_PrefabAsset: {fileID: 0}
150+
m_GameObject: {fileID: 17064360}
151+
m_Enabled: 1
152+
--- !u!20 &17064362
153+
Camera:
154+
m_ObjectHideFlags: 0
155+
m_CorrespondingSourceObject: {fileID: 0}
156+
m_PrefabInstance: {fileID: 0}
157+
m_PrefabAsset: {fileID: 0}
158+
m_GameObject: {fileID: 17064360}
159+
m_Enabled: 1
160+
serializedVersion: 2
161+
m_ClearFlags: 1
162+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
163+
m_projectionMatrixMode: 1
164+
m_GateFitMode: 2
165+
m_FOVAxisMode: 0
166+
m_SensorSize: {x: 36, y: 24}
167+
m_LensShift: {x: 0, y: 0}
168+
m_FocalLength: 50
169+
m_NormalizedViewPortRect:
170+
serializedVersion: 2
171+
x: 0
172+
y: 0
173+
width: 1
174+
height: 1
175+
near clip plane: 0.3
176+
far clip plane: 1000
177+
field of view: 60
178+
orthographic: 0
179+
orthographic size: 5
180+
m_Depth: -1
181+
m_CullingMask:
182+
serializedVersion: 2
183+
m_Bits: 4294967295
184+
m_RenderingPath: -1
185+
m_TargetTexture: {fileID: 0}
186+
m_TargetDisplay: 0
187+
m_TargetEye: 3
188+
m_HDR: 1
189+
m_AllowMSAA: 1
190+
m_AllowDynamicResolution: 0
191+
m_ForceIntoRT: 0
192+
m_OcclusionCulling: 1
193+
m_StereoConvergence: 10
194+
m_StereoSeparation: 0.022
195+
--- !u!4 &17064363
196+
Transform:
197+
m_ObjectHideFlags: 0
198+
m_CorrespondingSourceObject: {fileID: 0}
199+
m_PrefabInstance: {fileID: 0}
200+
m_PrefabAsset: {fileID: 0}
201+
m_GameObject: {fileID: 17064360}
202+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
203+
m_LocalPosition: {x: 0, y: 1, z: -10}
204+
m_LocalScale: {x: 1, y: 1, z: 1}
205+
m_Children: []
206+
m_Father: {fileID: 0}
207+
m_RootOrder: 0
208+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
209+
--- !u!1 &1367620459
210+
GameObject:
211+
m_ObjectHideFlags: 0
212+
m_CorrespondingSourceObject: {fileID: 0}
213+
m_PrefabInstance: {fileID: 0}
214+
m_PrefabAsset: {fileID: 0}
215+
serializedVersion: 6
216+
m_Component:
217+
- component: {fileID: 1367620461}
218+
- component: {fileID: 1367620460}
136219
m_Layer: 0
137220
m_Name: main
138221
m_TagString: Untagged
139222
m_Icon: {fileID: 0}
140223
m_NavMeshLayer: 0
141224
m_StaticEditorFlags: 0
142225
m_IsActive: 1
143-
--- !u!114 &40737312
226+
--- !u!114 &1367620460
144227
MonoBehaviour:
145228
m_ObjectHideFlags: 0
146229
m_CorrespondingSourceObject: {fileID: 0}
147230
m_PrefabInstance: {fileID: 0}
148231
m_PrefabAsset: {fileID: 0}
149-
m_GameObject: {fileID: 40737311}
232+
m_GameObject: {fileID: 1367620459}
150233
m_Enabled: 1
151234
m_EditorHideFlags: 0
152-
m_Script: {fileID: 11500000, guid: 7ace0dbbe1adb478d85bc7abd1f09113, type: 3}
235+
m_Script: {fileID: 11500000, guid: de7e19699c62fef4d8e2f16cfb5e8b22, type: 3}
153236
m_Name:
154237
m_EditorClassIdentifier:
155-
assetReference:
156-
m_AssetGUID: 5271bd35687de4a4f92d2964220f337f
157-
m_SubObjectName:
158-
m_SubObjectType:
159-
m_EditorAssetChanged: 0
160-
--- !u!4 &40737313
238+
addressablesStorageRemotePath: http://data.virtualbrainlab.org/AddressablesStorage
239+
--- !u!4 &1367620461
161240
Transform:
162241
m_ObjectHideFlags: 0
163242
m_CorrespondingSourceObject: {fileID: 0}
164243
m_PrefabInstance: {fileID: 0}
165244
m_PrefabAsset: {fileID: 0}
166-
m_GameObject: {fileID: 40737311}
245+
m_GameObject: {fileID: 1367620459}
167246
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
168247
m_LocalPosition: {x: 0, y: 0, z: 0}
169248
m_LocalScale: {x: 1, y: 1, z: 1}
170249
m_Children: []
171250
m_Father: {fileID: 0}
172-
m_RootOrder: 0
251+
m_RootOrder: 2
173252
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
174-
--- !u!1 &705507993
253+
--- !u!1 &1461802598
175254
GameObject:
176255
m_ObjectHideFlags: 0
177256
m_CorrespondingSourceObject: {fileID: 0}
178257
m_PrefabInstance: {fileID: 0}
179258
m_PrefabAsset: {fileID: 0}
180259
serializedVersion: 6
181260
m_Component:
182-
- component: {fileID: 705507995}
183-
- component: {fileID: 705507994}
261+
- component: {fileID: 1461802600}
262+
- component: {fileID: 1461802599}
184263
m_Layer: 0
185264
m_Name: Directional Light
186265
m_TagString: Untagged
187266
m_Icon: {fileID: 0}
188267
m_NavMeshLayer: 0
189268
m_StaticEditorFlags: 0
190269
m_IsActive: 1
191-
--- !u!108 &705507994
270+
--- !u!108 &1461802599
192271
Light:
193272
m_ObjectHideFlags: 0
194273
m_CorrespondingSourceObject: {fileID: 0}
195274
m_PrefabInstance: {fileID: 0}
196275
m_PrefabAsset: {fileID: 0}
197-
m_GameObject: {fileID: 705507993}
276+
m_GameObject: {fileID: 1461802598}
198277
m_Enabled: 1
199278
serializedVersion: 10
200279
m_Type: 1
@@ -203,7 +282,7 @@ Light:
203282
m_Intensity: 1
204283
m_Range: 10
205284
m_SpotAngle: 30
206-
m_InnerSpotAngle: 21.802082
285+
m_InnerSpotAngle: 21.80208
207286
m_CookieSize: 10
208287
m_Shadows:
209288
m_Type: 2
@@ -239,7 +318,7 @@ Light:
239318
serializedVersion: 2
240319
m_Bits: 4294967295
241320
m_RenderingLayerMask: 1
242-
m_Lightmapping: 1
321+
m_Lightmapping: 4
243322
m_LightShadowCasterMode: 0
244323
m_AreaSize: {x: 1, y: 1}
245324
m_BounceIntensity: 1
@@ -250,100 +329,17 @@ Light:
250329
m_UseViewFrustumForShadowCasterCull: 1
251330
m_ShadowRadius: 0
252331
m_ShadowAngle: 0
253-
--- !u!4 &705507995
332+
--- !u!4 &1461802600
254333
Transform:
255334
m_ObjectHideFlags: 0
256335
m_CorrespondingSourceObject: {fileID: 0}
257336
m_PrefabInstance: {fileID: 0}
258337
m_PrefabAsset: {fileID: 0}
259-
m_GameObject: {fileID: 705507993}
338+
m_GameObject: {fileID: 1461802598}
260339
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
261340
m_LocalPosition: {x: 0, y: 3, z: 0}
262341
m_LocalScale: {x: 1, y: 1, z: 1}
263342
m_Children: []
264343
m_Father: {fileID: 0}
265-
m_RootOrder: 2
266-
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
267-
--- !u!1 &963194225
268-
GameObject:
269-
m_ObjectHideFlags: 0
270-
m_CorrespondingSourceObject: {fileID: 0}
271-
m_PrefabInstance: {fileID: 0}
272-
m_PrefabAsset: {fileID: 0}
273-
serializedVersion: 6
274-
m_Component:
275-
- component: {fileID: 963194228}
276-
- component: {fileID: 963194227}
277-
- component: {fileID: 963194226}
278-
m_Layer: 0
279-
m_Name: Main Camera
280-
m_TagString: MainCamera
281-
m_Icon: {fileID: 0}
282-
m_NavMeshLayer: 0
283-
m_StaticEditorFlags: 0
284-
m_IsActive: 1
285-
--- !u!81 &963194226
286-
AudioListener:
287-
m_ObjectHideFlags: 0
288-
m_CorrespondingSourceObject: {fileID: 0}
289-
m_PrefabInstance: {fileID: 0}
290-
m_PrefabAsset: {fileID: 0}
291-
m_GameObject: {fileID: 963194225}
292-
m_Enabled: 1
293-
--- !u!20 &963194227
294-
Camera:
295-
m_ObjectHideFlags: 0
296-
m_CorrespondingSourceObject: {fileID: 0}
297-
m_PrefabInstance: {fileID: 0}
298-
m_PrefabAsset: {fileID: 0}
299-
m_GameObject: {fileID: 963194225}
300-
m_Enabled: 1
301-
serializedVersion: 2
302-
m_ClearFlags: 1
303-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
304-
m_projectionMatrixMode: 1
305-
m_GateFitMode: 2
306-
m_FOVAxisMode: 0
307-
m_SensorSize: {x: 36, y: 24}
308-
m_LensShift: {x: 0, y: 0}
309-
m_FocalLength: 50
310-
m_NormalizedViewPortRect:
311-
serializedVersion: 2
312-
x: 0
313-
y: 0
314-
width: 1
315-
height: 1
316-
near clip plane: 0.3
317-
far clip plane: 1000
318-
field of view: 60
319-
orthographic: 0
320-
orthographic size: 5
321-
m_Depth: -1
322-
m_CullingMask:
323-
serializedVersion: 2
324-
m_Bits: 4294967295
325-
m_RenderingPath: -1
326-
m_TargetTexture: {fileID: 0}
327-
m_TargetDisplay: 0
328-
m_TargetEye: 3
329-
m_HDR: 1
330-
m_AllowMSAA: 1
331-
m_AllowDynamicResolution: 0
332-
m_ForceIntoRT: 0
333-
m_OcclusionCulling: 1
334-
m_StereoConvergence: 10
335-
m_StereoSeparation: 0.022
336-
--- !u!4 &963194228
337-
Transform:
338-
m_ObjectHideFlags: 0
339-
m_CorrespondingSourceObject: {fileID: 0}
340-
m_PrefabInstance: {fileID: 0}
341-
m_PrefabAsset: {fileID: 0}
342-
m_GameObject: {fileID: 963194225}
343-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
344-
m_LocalPosition: {x: 0, y: 1, z: -10}
345-
m_LocalScale: {x: 1, y: 1, z: 1}
346-
m_Children: []
347-
m_Father: {fileID: 0}
348344
m_RootOrder: 1
349-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
345+
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/vbl-core

Submodule vbl-core added at e86bdcf

Assets/vbl-core.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)