Skip to content

Commit

Permalink
Help button for non-VR modes (currently untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
andybak committed Apr 3, 2024
1 parent 553d7bb commit 4d34438
Show file tree
Hide file tree
Showing 10 changed files with 387 additions and 85 deletions.
432 changes: 348 additions & 84 deletions Assets/Prefabs/NoPeekingCamera.prefab

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Assets/Scripts/InitNoHeadsetMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ namespace TiltBrush
{
public class InitNoHeadsetMode : MonoBehaviour
{

public TextMeshPro m_Heading;
public GameObject m_SketchLoadingUi;
public string m_NonXRHelpURL;

void Start()
{
Expand Down Expand Up @@ -77,5 +77,10 @@ public void ShowSketchSelectorUi(bool active = true)
{
m_SketchLoadingUi.SetActive(active);
}

public void HandleHelpButton()
{
SketchControlsScript.m_Instance.OpenURLAndInformUser(m_NonXRHelpURL);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3303,6 +3303,10 @@ MonoBehaviour:
m_Key: VR_NOT_DETECTED
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Key: MONOSCOPIC_HELP
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
Expand Down
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_de.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3572,6 +3572,10 @@ MonoBehaviour:
Sie Shift gedr\xFCckt, um schneller zu bewegen"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: "Mehr Informationen zur Verwendung von Open Brush ohne VR:\t"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_en.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3500,6 +3500,10 @@ MonoBehaviour:
m_Localized: Failed to Detect VR
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: 'More info on using Open Brush without VR:'
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_es.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3544,6 +3544,10 @@ MonoBehaviour:
mover arriba/abajo\nMant\xE9n presionado shift para moverte m\xE1s r\xE1pido"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: "M\xE1s informaci\xF3n sobre c\xF3mo usar Open Brush sin VR:"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_fr.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3513,6 +3513,10 @@ MonoBehaviour:
: monter/descendre\nMaintenez shift pour vous d\xE9placer plus rapidement"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: 'Plus d''informations sur l''utilisation d''Open Brush sans VR :'
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_ja.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3466,6 +3466,10 @@ MonoBehaviour:
m_Localized: "VR\u30D8\u30C3\u30C9\u30BB\u30C3\u30C8\u306A\u3057\u3067\u7D9A\u884C\u3067\u304D\u307E\u3059\u3002\u4EE5\u4E0B\u306E\u30B9\u30B1\u30C3\u30C1\u3092\u9078\u629E\u3057\u3066\u3001\u6B21\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3067\u8996\u8074\u30E2\u30FC\u30C9\u306B\u5165\u308A\u307E\u3059\uFF1A\n\n\u30DE\u30A6\u30B9\uFF1A\u5468\u308A\u3092\u898B\u308B\uFF08\u4E0A/\u4E0B\u3092\u53CD\u8EE2\u3055\u305B\u308B\u306B\u306FI\u3092\u62BC\u3059\uFF09\nW,A,S,D\uFF1A\u524D/\u5F8C/\u5DE6/\u53F3\u306B\u79FB\u52D5\nQ,E\uFF1A\u4E0A/\u4E0B\u306B\u79FB\u52D5\nShift\u3092\u62BC\u3057\u7D9A\u3051\u308B\u3068\u901F\u304F\u79FB\u52D5\u3057\u307E\u3059"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: "VR\u306A\u3057\u3067Open Brush\u3092\u4F7F\u7528\u3059\u308B\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306E\u8A73\u7D30:"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
5 changes: 5 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_ko.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3531,6 +3531,11 @@ MonoBehaviour:
\uC788\uC73C\uBA74 \uB354 \uBE68\uB9AC \uC774\uB3D9\uD569\uB2C8\uB2E4"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: "VR \uC5C6\uC774 Open Brush \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC790\uC138\uD55C
\uC815\uBCF4:"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
4 changes: 4 additions & 0 deletions Assets/Settings/Localization/Strings/Strings_zh.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3462,6 +3462,10 @@ MonoBehaviour:
shift \u952E\u4EE5\u66F4\u5FEB\u79FB\u52A8"
m_Metadata:
m_Items: []
- m_Id: 218558579745579008
m_Localized: "\u5173\u4E8E\u4E0D\u4F7F\u7528 VR \u4F7F\u7528 Open Brush \u7684\u66F4\u591A\u4FE1\u606F:"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

0 comments on commit 4d34438

Please sign in to comment.