Commit 903a885b authored by Alex Peake's avatar Alex Peake

Merge branch 'add-floating-text-that-faces-the-camera' into 'master'

Add floating text that faces the camera (some parts are WIP)

See merge request !1
parents fc950485 49f3d0a7
fileFormatVersion: 2
guid: 912b3c91d648ead489feadbe44ec1281
folderAsset: yes
timeCreated: 1509877414
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2067402452, guid: 1e108ae5f2133934f948edded555f03e, type: 3}
m_Name: VuforiaConfiguration
m_EditorClassIdentifier:
vuforia:
vuforiaLicenseKey:
ufoLicenseKey: QVg5cERxMy8vLy8vQUFBQUtKcUx6dGtOSFVEK3JjclJCd3N3UTVrTFpTMml3ajlIY2R4enVSeURwYUxqMjArQ0NBeVhUdDRISDgxUXdnRWNCY0x4WHlEZ0tDYnNlNUpWdVYzdEZsaVM4TXRISklFVkthYVdTMkEzZ3RoTkY5dlhwUjdGbFMzR0wyTHlETkthbHdlNzkvdmlOK0thVEZsQkpyWGpON3FnMFVsRlU3RGV4RTdvNDRtUjBLenMvdmNBa2pGYWhSa25FOXpkRGZ5MjFKRFl5ZHhSb2tzN2dFRjNtaU53YmNPamJ6Qkt6Ry90amlld0hNRGgzK1lvZThxa1lkZkwvdzZsUFRaWm45YWhnSkdqWS9CNU0yc1ZrMjlVZHU5ekcrWEgrVUZXb2phdHN5VFN3alpCZ2lXbVQwQkNnSS9PK0dMeVQxamtNay9FcS85U0dKQVFIcE9EQ2xRTDI5NE5uRXFpTk5XN3I3c1NkeFc4bW5DTDVoaFU=
delayedInitialization: 0
cameraDeviceModeSetting: -1
maxSimultaneousImageTargets: 1
maxSimultaneousObjectTargets: 1
useDelayedLoadingObjectTargets: 0
cameraDirection: 0
mirrorVideoBackground: 0
digitalEyewear:
cameraOffset: 0.06
distortionRenderingLayer: 31
eyewearType: 0
stereoFramework: 0
seeThroughConfiguration: 0
viewerName:
viewerManufacturer:
useCustomViewer: 0
customViewer:
Version: 0
Name:
Manufacturer:
ButtonType: 0
ScreenToLensDistance: 0
InterLensDistance: 0
TrayAlignment: 0
LensCenterToTrayDistance: 0
DistortionCoefficients: {x: 0, y: 0}
FieldOfView: {x: 0, y: 0, z: 0, w: 0}
ContainsMagnet: 0
databaseLoad:
dataSetsToLoad: []
dataSetsToActivate: []
videoBackground:
clippingMode: 0
numDivisions: 2
videoBackgroundShader: {fileID: 15311, guid: 0000000000000000f000000000000000,
type: 0}
matteShader: {fileID: 15310, guid: 0000000000000000f000000000000000, type: 0}
videoBackgroundEnabled: 1
smartTerrainTracker:
autoInitTracker: 0
autoStartTracker: 0
autoInitBuilder: 0
sceneUnitsToMillimeter: 0
deviceTracker:
autoInitTracker: 0
autoStartTracker: 0
trackingMode: 0
posePrediction: 0
modelCorrectionMode: 0
modelTransformEnabled: 0
modelTransform: {x: 0, y: 0.1, z: -0.1}
webcam:
deviceNameSetInEditor:
flipHorizontally: 0
turnOffWebCam: 0
renderTextureLayer: 30
fileFormatVersion: 2
guid: b557a71378263a14e87c28da01a4b353
timeCreated: 1509877414
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7cc1b82d1ac1fdf4db3327a4075dc1cc
folderAsset: yes
timeCreated: 1509932659
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
B໿SketchUp Model௿{17.2.2555}ꝫ醸횻䩵뺤畣賟휮ÿ娋￿ 噃牥楳湯慍ー￾䌉䄀爀挀䌀甀爀瘀攀̀＀￾䌊䄀琀琀爀椀戀甀琀攀＀￾䌓䄀琀琀爀椀戀甀琀攀䌀漀渀琀愀椀渀攀爀＀￾䌏䄀琀琀爀椀戀甀琀攀一愀洀攀搀Ā＀￾䌐䈀愀挀欀最爀漀甀渀搀䤀洀愀最攀਀＀￾䌇䌀愀洀攀爀愀Ԁ＀￾䌊䌀漀洀瀀漀渀攀渀琀଀＀￾䌒䌀漀洀瀀漀渀攀渀琀䈀攀栀愀瘀椀漀爀Ԁ＀￾䌔䌀漀洀瀀漀渀攀渀琀䐀攀昀椀渀椀琀椀漀渀਀＀￾䌒䌀漀洀瀀漀渀攀渀琀䤀渀猀琀愀渀挀攀Ԁ＀￾䌕䌀漀渀猀琀爀甀挀琀椀漀渀䜀攀漀洀攀琀爀礀＀￾䌑䌀漀渀猀琀爀甀挀琀椀漀渀䰀椀渀攀Ā＀￾䌒䌀漀渀猀琀爀甀挀琀椀漀渀倀漀椀渀琀＀￾䌆䌀甀爀瘀攀Ѐ＀￾䌏䐀攀昀椀渀椀琀椀漀渀䰀椀猀琀＀￾䌄䐀椀戀̀＀￾䌊䐀椀洀攀渀猀椀漀渀Ā＀￾䌐䐀椀洀攀渀猀椀漀渀䰀椀渀攀愀爀؀＀￾䌐䐀椀洀攀渀猀椀漀渀刀愀搀椀愀氀Ȁ＀￾䌏䐀椀洀攀渀猀椀漀渀匀琀礀氀攀Ѐ＀￾䌏䐀爀愀眀椀渀最䔀氀攀洀攀渀琀ऀ＀￾䌅䔀搀最攀Ȁ＀￾䌈䔀搀最攀唀猀攀Ā＀￾䌇䔀渀琀椀琀礀Ԁ＀￾䌅䘀愀挀攀̀＀￾䌒䘀愀挀攀吀攀砀琀甀爀攀䌀漀漀爀搀猀Ѐ＀￾䌌䘀漀渀琀䴀愀渀愀最攀爀＀￾䌆䜀爀漀甀瀀Ā＀￾䌆䤀洀愀最攀Ā＀￾䌆䰀愀礀攀爀Ȁ＀￾䌍䰀愀礀攀爀䴀愀渀愀最攀爀Ѐ＀￾䌅䰀漀漀瀀Ā＀￾䌉䴀愀琀攀爀椀愀氀ఀ＀￾䌐䴀愀琀攀爀椀愀氀䴀愀渀愀最攀爀Ѐ＀￾䌉倀愀最攀䰀椀猀琀Ā＀￾䌋倀漀氀礀氀椀渀攀㌀搀＀￾䌍刀攀氀愀琀椀漀渀猀栀椀瀀＀￾䌐刀攀氀愀琀椀漀渀猀栀椀瀀䴀愀瀀＀￾䌑刀攀渀搀攀爀椀渀最伀瀀琀椀漀渀猀␀＀￾䌋匀挀栀攀洀愀䘀椀氀攀Ā＀￾䌑匀挀栀攀洀愀䘀椀氀琀攀爀䘀椀氀攀＀￾䌎匀挀栀攀洀愀娀椀瀀䘀椀氀攀Ā＀￾䌍匀攀挀琀椀漀渀倀氀愀渀攀Ȁ＀￾䌋匀栀愀搀漀眀䤀渀昀漀܀＀￾䌇匀欀䘀漀渀琀Ā＀￾䌉匀欀攀琀挀栀䌀匀＀￾䌎匀欀攀琀挀栀唀瀀䴀漀搀攀氀ᨀ＀￾䌍匀欀攀琀挀栀唀瀀倀愀最攀Ā＀￾䌉匀欀瀀匀琀礀氀攀Ā＀￾䌐匀欀瀀匀琀礀氀攀䴀愀渀愀最攀爀Ȁ＀￾䌅吀攀砀琀ऀ＀￾䌊吀攀砀琀匀琀礀氀攀Ԁ＀￾䌈吀攀砀琀甀爀攀؀＀￾䌊吀栀甀洀戀渀愀椀氀Ā＀￾䌇嘀攀爀琀攀砀＀￾䌉嘀椀攀眀倀愀最攀ఀ＀￾䌊圀愀琀攀爀洀愀爀欀Ā＀￾䌑圀愀琀攀爀洀愀爀欀䴀愀渀愀最攀爀Ȁ＀￾䔒渀搀ⴀ伀昀ⴀ嘀攀爀猀椀漀渀ⴀ䴀愀瀀Ā뀀Ȁ瀀＀ϿЀ䌀楄Ѣ退æ褀乐േᨊ
......
B໿SketchUp Modelࣿ{15.0.1}✘뢄꺋䚨ꕺ腢ꑝÿ娋￿ 噃牥楳湯慍ー￾䌉䄀爀挀䌀甀爀瘀攀̀＀￾䌊䄀琀琀爀椀戀甀琀攀＀￾䌓䄀琀琀爀椀戀甀琀攀䌀漀渀琀愀椀渀攀爀＀￾䌏䄀琀琀爀椀戀甀琀攀一愀洀攀搀Ā＀￾䌐䈀愀挀欀最爀漀甀渀搀䤀洀愀最攀਀＀￾䌇䌀愀洀攀爀愀Ԁ＀￾䌊䌀漀洀瀀漀渀攀渀琀଀＀￾䌒䌀漀洀瀀漀渀攀渀琀䈀攀栀愀瘀椀漀爀Ԁ＀￾䌔䌀漀洀瀀漀渀攀渀琀䐀攀昀椀渀椀琀椀漀渀਀＀￾䌒䌀漀洀瀀漀渀攀渀琀䤀渀猀琀愀渀挀攀Ԁ＀￾䌕䌀漀渀猀琀爀甀挀琀椀漀渀䜀攀漀洀攀琀爀礀＀￾䌑䌀漀渀猀琀爀甀挀琀椀漀渀䰀椀渀攀Ā＀￾䌒䌀漀渀猀琀爀甀挀琀椀漀渀倀漀椀渀琀＀￾䌆䌀甀爀瘀攀Ѐ＀￾䌏䐀攀昀椀渀椀琀椀漀渀䰀椀猀琀＀￾䌄䐀椀戀̀＀￾䌊䐀椀洀攀渀猀椀漀渀Ā＀￾䌐䐀椀洀攀渀猀椀漀渀䰀椀渀攀愀爀؀＀￾䌐䐀椀洀攀渀猀椀漀渀刀愀搀椀愀氀Ȁ＀￾䌏䐀椀洀攀渀猀椀漀渀匀琀礀氀攀Ѐ＀￾䌏䐀爀愀眀椀渀最䔀氀攀洀攀渀琀ऀ＀￾䌅䔀搀最攀Ȁ＀￾䌈䔀搀最攀唀猀攀Ā＀￾䌇䔀渀琀椀琀礀̀＀￾䌅䘀愀挀攀̀＀￾䌒䘀愀挀攀吀攀砀琀甀爀攀䌀漀漀爀搀猀Ѐ＀￾䌌䘀漀渀琀䴀愀渀愀最攀爀＀￾䌆䜀爀漀甀瀀Ā＀￾䌆䤀洀愀最攀Ā＀￾䌆䰀愀礀攀爀Ȁ＀￾䌍䰀愀礀攀爀䴀愀渀愀最攀爀Ѐ＀￾䌅䰀漀漀瀀Ā＀￾䌉䴀愀琀攀爀椀愀氀ఀ＀￾䌐䴀愀琀攀爀椀愀氀䴀愀渀愀最攀爀Ѐ＀￾䌉倀愀最攀䰀椀猀琀Ā＀￾䌋倀漀氀礀氀椀渀攀㌀搀＀￾䌍刀攀氀愀琀椀漀渀猀栀椀瀀＀￾䌐刀攀氀愀琀椀漀渀猀栀椀瀀䴀愀瀀＀￾䌑刀攀渀搀攀爀椀渀最伀瀀琀椀漀渀猀␀＀￾䌋匀挀栀攀洀愀䘀椀氀攀Ā＀￾䌑匀挀栀攀洀愀䘀椀氀琀攀爀䘀椀氀攀＀￾䌎匀挀栀攀洀愀娀椀瀀䘀椀氀攀Ā＀￾䌍匀攀挀琀椀漀渀倀氀愀渀攀Ȁ＀￾䌋匀栀愀搀漀眀䤀渀昀漀܀＀￾䌇匀欀䘀漀渀琀Ā＀￾䌉匀欀攀琀挀栀䌀匀＀￾䌎匀欀攀琀挀栀唀瀀䴀漀搀攀氀᠀＀￾䌍匀欀攀琀挀栀唀瀀倀愀最攀Ā＀￾䌉匀欀瀀匀琀礀氀攀Ā＀￾䌐匀欀瀀匀琀礀氀攀䴀愀渀愀最攀爀Ȁ＀￾䌅吀攀砀琀ऀ＀￾䌊吀攀砀琀匀琀礀氀攀Ԁ＀￾䌈吀攀砀琀甀爀攀؀＀￾䌊吀栀甀洀戀渀愀椀氀Ā＀￾䌇嘀攀爀琀攀砀＀￾䌉嘀椀攀眀倀愀最攀ఀ＀￾䌊圀愀琀攀爀洀愀爀欀Ā＀￾䌑圀愀琀攀爀洀愀爀欀䴀愀渀愀最攀爀Ȁ＀￾䔒渀搀ⴀ伀昀ⴀ嘀攀爀猀椀漀渀ⴀ䴀愀瀀Ā뀀Ȁ＀ϿЀ䌀楄Ѣ退æ褀乐േᨊ
......
......@@ -5,19 +5,19 @@ licenseType: Free
SketchUpImporter:
generateBackFace: 1
mergeCoplanarFaces: 0
selectedNodes: 000000000100000002000000030000000400000005000000
selectedNodes: 0000000001000000020000000300000004000000050000000600000007000000
assetHash:
serializedVersion: 2
Hash: 55af182a0dfc937b9cf72d8ba709575f
Hash: a19a8526fda6e3871a6282f4f5685d87
longitude: -105.242139
latitude: 40.018309
northCorrection: -0
fileUnit: 0
sketchUpImportData:
defaultCamera:
position: {x: 37.17542, y: 17.686491, z: 23.328272}
lookAt: {x: 28.968672, y: -0.2255186, z: 8.699873}
up: {x: -0.3571376, y: 0.6835226, z: -0.6365922}
position: {x: 32.272335, y: 11.896267, z: 0.78031135}
lookAt: {x: 18.900648, y: -1.6699101, z: 16.250856}
up: {x: -0.36150926, y: 0.833292, z: 0.41825286}
fov: 35
aspectRatio: 0
orthoSize: 1
......@@ -30,11 +30,13 @@ SketchUpImporter:
100004: Group 2
100006: Group 4
100008: Image 1
100010: Interior Walls
400000: Image 2
400002: //RootNode
400004: Group 2
400006: Group 4
400008: Image 1
400010: Interior Walls
2100000: _defaultMat
2100002: Material 1
2300000: Image 2
......@@ -42,20 +44,24 @@ SketchUpImporter:
2300004: Group 2
2300006: Group 4
2300008: Image 1
2300010: Interior Walls
3300000: Image 2
3300002: //RootNode
3300004: Group 2
3300006: Group 4
3300008: Image 1
3300010: Interior Walls
4300000: Mesh testentrance2015
4300002: Mesh testentrance2015
4300004: Mesh Group 2
4300006: Mesh Group 4
4300008: Mesh Interior Walls
6400000: Image 2
6400002: //RootNode
6400004: Group 2
6400006: Group 4
6400008: Image 1
6400010: Interior Walls
externalObjects: {}
materials:
importMaterials: 1
......
This diff is collapsed.
fileFormatVersion: 2
guid: 63d47e5d30786f44da786fc94136e565
timeCreated: 1506213679
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d945f5d310a21994c83e04ff9abb47e7
folderAsset: yes
timeCreated: 1510032836
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 1f918c20d2813ea4a87c22d1e5513d49
timeCreated: 1510099933
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
//This script is used to make UI elements face the player's camera
using UnityEngine;
public class LookAtCamera : MonoBehaviour {
Transform mainCamera; //The camera's transform
void Start() {
//Set the Main Camera as the target
mainCamera = Camera.main.transform;
}
//Update after all other updates have run
void LateUpdate() {
if (mainCamera == null)
return;
//Apply the rotation needed to look at the camera. Note, since pointing a UI text element
//at the camera makes it appear backwards, we are actually pointing this object
//directly *away* from the camera.
transform.rotation = Quaternion.LookRotation(transform.position - mainCamera.position);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 8c7eb1e40136f0a44b2947ad06b09de5
timeCreated: 1509881353
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class TargetedByRaycast : MonoBehaviour {
Text m_lookHereUI { get { return GetComponentInChildren<Text>(); } set { value = m_lookHereUI; } }
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
//if (ReceiveRaycast()) {
// }
}
//bool ReceiveRaycast() {
// RaycastHit hit;
// if (Physics.Raycast()) {
// return true;
// }
// else {
// return false;
// }
//}
}
fileFormatVersion: 2
guid: 97379451dd50bc3409becdc542ea8028
timeCreated: 1510050999
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
m_EditorVersion: 2017.2.0f2
m_EditorVersion: 2017.2.0f3
......@@ -3,7 +3,10 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- FxTemporaire
- projectile
- TeleportIgnore
layers:
- Default
- TransparentFX
......@@ -20,7 +23,7 @@ TagManager:
- MantleBuilding
- MantleCustom
- Vehicle
-
- FloatingLabel
-
-
-
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment