mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-14 10:05:44 -04:00
Can now press F1 to hide gui.
This commit is contained in:
parent
1ec491d2a1
commit
c714c5136a
@ -14,9 +14,11 @@ namespace ClassicalSharp {
|
|||||||
|
|
||||||
TextWidget fpsTextWidget;
|
TextWidget fpsTextWidget;
|
||||||
|
|
||||||
public override void Render( double delta ) {
|
public override void Render( double delta ) {
|
||||||
graphicsApi.Texturing = true;
|
|
||||||
UpdateFPS( delta );
|
UpdateFPS( delta );
|
||||||
|
if( game.HideGui ) return;
|
||||||
|
|
||||||
|
graphicsApi.Texturing = true;
|
||||||
fpsTextWidget.Render( delta );
|
fpsTextWidget.Render( delta );
|
||||||
graphicsApi.Texturing = false;
|
graphicsApi.Texturing = false;
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ namespace ClassicalSharp {
|
|||||||
Font playerFont;
|
Font playerFont;
|
||||||
|
|
||||||
public override void Render( double delta ) {
|
public override void Render( double delta ) {
|
||||||
|
if( game.HideGui ) return;
|
||||||
graphicsApi.Texturing = true;
|
graphicsApi.Texturing = true;
|
||||||
chat.Render( delta );
|
chat.Render( delta );
|
||||||
hotbar.Render( delta );
|
hotbar.Render( delta );
|
||||||
|
@ -38,24 +38,24 @@ namespace ClassicalSharp {
|
|||||||
titleFont = new Font( "Arial", 16, FontStyle.Bold );
|
titleFont = new Font( "Arial", 16, FontStyle.Bold );
|
||||||
keyStatusFont = new Font( "Arial", 13, FontStyle.Italic );
|
keyStatusFont = new Font( "Arial", 13, FontStyle.Italic );
|
||||||
textFont = new Font( "Arial", 14, FontStyle.Bold );
|
textFont = new Font( "Arial", 14, FontStyle.Bold );
|
||||||
controlsWidget = TextWidget.Create( game, 0, 30, "&eControls list", Docking.Centre, Docking.LeftOrTop, titleFont );
|
controlsWidget = TextWidget.Create( game, 0, 20, "&eControls list", Docking.Centre, Docking.LeftOrTop, titleFont );
|
||||||
keyStatusWidget = TextWidget.Create( game, 0, 80, "", Docking.Centre, Docking.BottomOrRight, keyStatusFont );
|
keyStatusWidget = TextWidget.Create( game, 0, 70, "", Docking.Centre, Docking.BottomOrRight, keyStatusFont );
|
||||||
gameWidget = TextWidget.Create( game, 0, 50, "&eBack to game", Docking.Centre, Docking.BottomOrRight, titleFont );
|
gameWidget = TextWidget.Create( game, 0, 40, "&eBack to game", Docking.Centre, Docking.BottomOrRight, titleFont );
|
||||||
exitWidget = TextWidget.Create( game, 0, 10, "&eExit", Docking.Centre, Docking.BottomOrRight, titleFont );
|
exitWidget = TextWidget.Create( game, 0, 5, "&eExit", Docking.Centre, Docking.BottomOrRight, titleFont );
|
||||||
|
|
||||||
string[] descriptionsLeft = { "Forward", "Back", "Left", "Right", "Jump", "Respawn", "Set spawn",
|
string[] descriptionsLeft = { "Forward", "Back", "Left", "Right", "Jump", "Respawn", "Set spawn",
|
||||||
"Open chat", "Send chat", "Pause", "Open inventory" };
|
"Open chat", "Send chat", "Pause", "Open inventory", "Take screenshot" };
|
||||||
MakeKeys( KeyMapping.Forward, descriptionsLeft, 10, out keysLeft );
|
MakeKeys( KeyMapping.Forward, descriptionsLeft, 10, out keysLeft );
|
||||||
leftEnd = CalculateMaxWidth( keysLeft );
|
leftEnd = CalculateMaxWidth( keysLeft );
|
||||||
|
|
||||||
string[] descriptionsRight = { "Take screenshot", "Toggle fullscreen", "Toggle VSync", "Toggle 3rd person camera",
|
string[] descriptionsRight = { "Toggle fullscreen", "Toggle VSync", "Toggle 3rd person camera", "Change view distance",
|
||||||
"Change view distance", "Toggle fly", "Speed", "Toggle noclip", "Fly up", "Fly down", "Display player list" };
|
"Toggle fly", "Speed", "Toggle noclip", "Fly up", "Fly down", "Display player list", "Hide gui" };
|
||||||
MakeKeys( KeyMapping.Screenshot, descriptionsRight, leftEnd + 30, out keysRight );
|
MakeKeys( KeyMapping.Fullscreen, descriptionsRight, leftEnd + 30, out keysRight );
|
||||||
}
|
}
|
||||||
|
|
||||||
int leftEnd;
|
int leftEnd;
|
||||||
void MakeKeys( KeyMapping start, string[] descriptions, int offset, out KeyMapWidget[] widgets ) {
|
void MakeKeys( KeyMapping start, string[] descriptions, int offset, out KeyMapWidget[] widgets ) {
|
||||||
int startY = controlsWidget.BottomRight.Y + 10;
|
int startY = controlsWidget.BottomRight.Y + 5;
|
||||||
widgets = new KeyMapWidget[descriptions.Length];
|
widgets = new KeyMapWidget[descriptions.Length];
|
||||||
|
|
||||||
for( int i = 0; i < widgets.Length; i++ ) {
|
for( int i = 0; i < widgets.Length; i++ ) {
|
||||||
@ -80,6 +80,8 @@ namespace ClassicalSharp {
|
|||||||
exitWidget.Dispose();
|
exitWidget.Dispose();
|
||||||
for( int i = 0; i < keysLeft.Length; i++ ) {
|
for( int i = 0; i < keysLeft.Length; i++ ) {
|
||||||
keysLeft[i].Dispose();
|
keysLeft[i].Dispose();
|
||||||
|
}
|
||||||
|
for( int i = 0; i < keysRight.Length; i++ ) {
|
||||||
keysRight[i].Dispose();
|
keysRight[i].Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -90,6 +90,8 @@ namespace ClassicalSharp {
|
|||||||
Key key = e.Key;
|
Key key = e.Key;
|
||||||
if( key == Key.F4 && ( IsKeyDown( Key.AltLeft ) || IsKeyDown( Key.AltRight ) ) ) {
|
if( key == Key.F4 && ( IsKeyDown( Key.AltLeft ) || IsKeyDown( Key.AltRight ) ) ) {
|
||||||
Exit();
|
Exit();
|
||||||
|
} else if( key == Keys[KeyMapping.HideGui] ) {
|
||||||
|
HideGui = !HideGui;
|
||||||
} else if( key == Keys[KeyMapping.Screenshot] ) {
|
} else if( key == Keys[KeyMapping.Screenshot] ) {
|
||||||
screenshotRequested = true;
|
screenshotRequested = true;
|
||||||
} else if( key == Keys[KeyMapping.Fullscreen] ) {
|
} else if( key == Keys[KeyMapping.Fullscreen] ) {
|
||||||
@ -190,8 +192,8 @@ namespace ClassicalSharp {
|
|||||||
public enum KeyMapping {
|
public enum KeyMapping {
|
||||||
Forward, Back, Left, Right, Jump, Respawn, SetSpawn, OpenChat,
|
Forward, Back, Left, Right, Jump, Respawn, SetSpawn, OpenChat,
|
||||||
SendChat, PauseOrExit, OpenInventory, Screenshot, Fullscreen, VSync,
|
SendChat, PauseOrExit, OpenInventory, Screenshot, Fullscreen, VSync,
|
||||||
ThirdPersonCamera, ViewDistance, Fly, Speed, NoClip, FlyUp, FlyDown,
|
ThirdPersonCamera, ViewDistance, Fly, Speed, NoClip, FlyUp,
|
||||||
PlayerList, ChatHistoryMode,
|
FlyDown, PlayerList, HideGui,
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KeyMap {
|
public class KeyMap {
|
||||||
@ -234,8 +236,8 @@ namespace ClassicalSharp {
|
|||||||
Keys = new Key[] {
|
Keys = new Key[] {
|
||||||
Key.W, Key.S, Key.A, Key.D, Key.Space, Key.R, Key.Y, Key.T,
|
Key.W, Key.S, Key.A, Key.D, Key.Space, Key.R, Key.Y, Key.T,
|
||||||
Key.Enter, Key.Escape, Key.B, Key.F12, Key.F11, Key.F7,
|
Key.Enter, Key.Escape, Key.B, Key.F12, Key.F11, Key.F7,
|
||||||
Key.F5, Key.F6, Key.Z, Key.ShiftLeft, Key.X, Key.Q, Key.E,
|
Key.F5, Key.F6, Key.Z, Key.ShiftLeft, Key.X, Key.Q,
|
||||||
Key.Tab, Key.H };
|
Key.E, Key.Tab, Key.F1 };
|
||||||
#else
|
#else
|
||||||
Keys = new Key[23];
|
Keys = new Key[23];
|
||||||
Keys[0] = Key.W; Keys[1] = Key.S; Keys[2] = Key.A; Keys[3] = Key.D;
|
Keys[0] = Key.W; Keys[1] = Key.S; Keys[2] = Key.A; Keys[3] = Key.D;
|
||||||
@ -244,7 +246,7 @@ namespace ClassicalSharp {
|
|||||||
Keys[11] = Key.F12; Keys[12] = Key.F11; Keys[13] = Key.F7;
|
Keys[11] = Key.F12; Keys[12] = Key.F11; Keys[13] = Key.F7;
|
||||||
Keys[14] = Key.F5; Keys[15] = Key.F6; Keys[16] = Key.Z;
|
Keys[14] = Key.F5; Keys[15] = Key.F6; Keys[16] = Key.Z;
|
||||||
Keys[17] = Key.ShiftLeft; Keys[18] = Key.X; Keys[19] = Key.Q;
|
Keys[17] = Key.ShiftLeft; Keys[18] = Key.X; Keys[19] = Key.Q;
|
||||||
Keys[20] = Key.E; Keys[21] = Key.Tab; Keys[22] = Key.H;
|
Keys[20] = Key.E; Keys[21] = Key.Tab; Keys[22] = Key.F1;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,6 +99,7 @@ namespace ClassicalSharp {
|
|||||||
public AsyncDownloader AsyncDownloader;
|
public AsyncDownloader AsyncDownloader;
|
||||||
public Matrix4 View, Projection;
|
public Matrix4 View, Projection;
|
||||||
public int MouseSensitivity = 30;
|
public int MouseSensitivity = 30;
|
||||||
|
public bool HideGui = false;
|
||||||
|
|
||||||
void LoadAtlas( Bitmap bmp ) {
|
void LoadAtlas( Bitmap bmp ) {
|
||||||
TerrainAtlas1D.Dispose();
|
TerrainAtlas1D.Dispose();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user