Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add new help.html info window

Browse source
This commit is contained in:
Ryan Huffman 2016-09-21 11:41:17 -07:00
parent 476ccadb38
commit 26545b2b99
5 changed files with 75 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
interface/resources/html/help.html Normal file
View file

@ -0,0 +1,71 @@
<!-- Copyright 2015 High Fidelity, Inc. -->
<html>
<head>
<meta charset="utf-8"/>
<input type="hidden" id="version" value="1"/>
<title>Welcome to Interface</title>
<style>
body {
background: black;
width: 100%;
overflow-x: hidden;
margin: 0;
padding: 0;
}
#kbm_button {
position: absolute;
left: 70;
top: 118;
width: 297;
height: 80;
}
#hand_controllers_button {
position: absolute;
left: 367;
top: 118;
width: 267;
height: 80;
}
#game_controller_button {
position: absolute;
left: 634;
top: 118;
width: 297;
height: 80;
}
#image_area {
width: 1024;
height: 720;
margin: auto;
position: absolute;
top: 0; left: 0; bottom: 0; right: 0;
}
</style>
<script>
function showKbm() {
document.getElementById("main_image").setAttribute("src", "img/controls-help-keyboard.jpg");
}
function showHandControllers() {
document.getElementById("main_image").setAttribute("src", "img/controls-help-vive.jpg");
}
function showGameController() {
document.getElementById("main_image").setAttribute("src", "img/controls-help-gamepad.jpg");
}
</script>
</head>
<body>
<div id="image_area">
<img id="main_image" src="img/controls-help-keyboard.jpg"></img>
<a href="#" id="kbm_button" onclick="showKbm()"></a>
<a href="#" id="hand_controllers_button" onclick="showHandControllers()"></a>
<a href="#" id="game_controller_button" onclick="showGameController()"></a>
</div>
</body>
</html>

BIN
interface/resources/html/img/controls-help-gamepad.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 169 KiB

BIN
interface/resources/html/img/controls-help-keyboard.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 136 KiB

BIN
interface/resources/html/img/controls-help-vive.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 183 KiB

7
interface/src/Application.cpp
View file

@ -198,8 +198,9 @@ static const float MIRROR_FIELD_OF_VIEW = 30.0f;
static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND;
static const QString INFO_HELP_PATH = "html/interface-welcome.html";
static const QString INFO_WELCOME_PATH = "html/interface-welcome.html";
static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html";
static const QString INFO_HELP_PATH = "html/help.html";
static const unsigned int THROTTLED_SIM_FRAMERATE = 15;
static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;
@ -1999,11 +2000,11 @@ void Application::setFieldOfView(float fov) {
}
void Application::aboutApp() {
InfoView::show(INFO_HELP_PATH);
InfoView::show(INFO_WELCOME_PATH);
}
void Application::showHelp() {
InfoView::show(INFO_EDIT_ENTITIES_PATH);
InfoView::show(INFO_HELP_PATH);
}
void Application::resizeEvent(QResizeEvent* event) {