Skip to content

Commit 7e7226f

Browse files
l0ftywhizzshreyasiyer14
authored andcommitted
Removed Wikitude files since plugins for Vuforia and Wikitude collided.
1 parent 4ec2eed commit 7e7226f

File tree

490 files changed

+7603
-51652
lines changed

Some content is hidden

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

490 files changed

+7603
-51652
lines changed

Assets/StreamingAssets/Wikitude.meta renamed to Assets/Models/Tower.meta

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

Assets/Models/Tower.prefab

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &100000
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 100100000}
8+
serializedVersion: 4
9+
m_Component:
10+
- 4: {fileID: 400000}
11+
- 33: {fileID: 3300000}
12+
- 23: {fileID: 2300000}
13+
m_Layer: 0
14+
m_Name: Tower
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &400000
21+
Transform:
22+
m_ObjectHideFlags: 1
23+
m_PrefabParentObject: {fileID: 0}
24+
m_PrefabInternal: {fileID: 100100000}
25+
m_GameObject: {fileID: 100000}
26+
m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}
27+
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalScale: {x: .0500000045, y: .0500000045, z: .0500000045}
29+
m_Children: []
30+
m_Father: {fileID: 0}
31+
--- !u!23 &2300000
32+
Renderer:
33+
m_ObjectHideFlags: 1
34+
m_PrefabParentObject: {fileID: 0}
35+
m_PrefabInternal: {fileID: 100100000}
36+
m_GameObject: {fileID: 100000}
37+
m_Enabled: 1
38+
m_CastShadows: 1
39+
m_ReceiveShadows: 1
40+
m_LightmapIndex: 255
41+
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
42+
m_Materials:
43+
- {fileID: 2100000, guid: 6c89cadd5d7e44ac7abcefd936337adc, type: 2}
44+
m_SubsetIndices:
45+
m_StaticBatchRoot: {fileID: 0}
46+
m_UseLightProbes: 0
47+
m_LightProbeAnchor: {fileID: 0}
48+
m_ScaleInLightmap: 1
49+
--- !u!33 &3300000
50+
MeshFilter:
51+
m_ObjectHideFlags: 1
52+
m_PrefabParentObject: {fileID: 0}
53+
m_PrefabInternal: {fileID: 100100000}
54+
m_GameObject: {fileID: 100000}
55+
m_Mesh: {fileID: 4300000, guid: fa07268468181489480184e43cce11c6, type: 3}
56+
--- !u!1001 &100100000
57+
Prefab:
58+
m_ObjectHideFlags: 1
59+
serializedVersion: 2
60+
m_Modification:
61+
m_TransformParent: {fileID: 0}
62+
m_Modifications: []
63+
m_RemovedComponents: []
64+
m_ParentPrefab: {fileID: 0}
65+
m_RootGameObject: {fileID: 100000}
66+
m_IsPrefabParent: 1
67+
m_IsExploded: 1

Assets/Models/Tower.prefab.meta

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

Assets/Wikitude/Samples/Models/Furniture/Materials.meta renamed to Assets/Models/Tower/Materials.meta

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

Assets/Wikitude/Samples/SampleMaterials/ScanEffectMaterial.mat renamed to Assets/Models/Tower/Materials/lambert2.mat

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,26 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 3
66
m_ObjectHideFlags: 0
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
9-
m_Name: ScanEffectMaterial
10-
m_Shader: {fileID: 4800000, guid: 51fbe3bee87cd4f9e8ebc2f611f780a7, type: 3}
11-
m_ShaderKeywords:
12-
m_LightmapFlags: 5
13-
m_CustomRenderQueue: 2000
14-
stringTagMap: {}
9+
m_Name: lambert2
10+
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords: []
1512
m_SavedProperties:
1613
serializedVersion: 2
1714
m_TexEnvs:
1815
data:
1916
first:
2017
name: _MainTex
2118
second:
22-
m_Texture: {fileID: 0}
19+
m_Texture: {fileID: 2800000, guid: d4a21e7b424f94672aa38248464ea1c5, type: 3}
2320
m_Scale: {x: 1, y: 1}
2421
m_Offset: {x: 0, y: 0}
25-
m_Floats:
22+
m_Floats: {}
23+
m_Colors:
2624
data:
2725
first:
28-
name: _ScanIntensity
29-
second: 1
30-
m_Colors: {}
26+
name: _Color
27+
second: {r: 0, g: 0, b: 0, a: 1}

Assets/Models/Tower/Materials/lambert2.mat.meta

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

Assets/Wikitude/Samples/Models/WikitudeEye.fbm/ramp7-linse_neu.png.meta renamed to Assets/Models/Tower/baked-initialShadingGroup-polySurface142.jpg.meta

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

Assets/Wikitude.meta renamed to Assets/Models/Tower/buildings_20.fbm.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
77.4 KB
Loading

0 commit comments

Comments
 (0)