mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-23 17:43:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

and also make those changes to C client. (and also fix held block colour)

Browse source
This commit is contained in:
UnknownShadow200 2018-08-03 15:15:36 +10:00
parent 3b24617c62
commit 03b061083e
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ClassicalSharp/Program.cs
View file

@ -22,13 +22,6 @@ namespace ClassicalSharp {
return; return;
} }
// NOTE: we purposely put this in another method, as we need to ensure
// that we do not reference any OpenTK code directly in the main function
// (such as DisplayDevice), which otherwise causes native crash.
RunGame(args);
}
static void RunGame(string[] args) {
ErrorHandler.InstallHandler("client.log"); ErrorHandler.InstallHandler("client.log");
OpenTK.Configuration.SkipPerfCountersHack(); OpenTK.Configuration.SkipPerfCountersHack();
Utils.LogDebug("Starting " + AppName + ".."); Utils.LogDebug("Starting " + AppName + "..");

24
src/Client/EnvRenderer.c
View file

@ -305,23 +305,23 @@ static void EnvRenderer_UpdateSkybox(void) {
static VertexP3fT2fC4b vertices[SKYBOX_COUNT] = { static VertexP3fT2fC4b vertices[SKYBOX_COUNT] = {
/* Front quad */ /* Front quad */
{ 1, -1, -1, {0,0,0,0}, 0.25f, 1.00f }, { -1, -1, -1, {0,0,0,0}, 0.50f, 1.00f }, { -1, -1, -1, {0,0,0,0}, 0.25f, 1.00f }, { 1, -1, -1, {0,0,0,0}, 0.50f, 1.00f },
{ -1, 1, -1, {0,0,0,0}, 0.50f, 0.50f }, { 1, 1, -1, {0,0,0,0}, 0.25f, 0.50f }, { 1, 1, -1, {0,0,0,0}, 0.50f, 0.50f }, { -1, 1, -1, {0,0,0,0}, 0.25f, 0.50f },
/* Left quad */ /* Left quad */
{ 1, -1, 1, {0,0,0,0}, 0.00f, 1.00f }, { 1, -1, -1, {0,0,0,0}, 0.25f, 1.00f }, { -1, -1, 1, {0,0,0,0}, 0.00f, 1.00f }, { -1, -1, -1, {0,0,0,0}, 0.25f, 1.00f },
{ 1, 1, -1, {0,0,0,0}, 0.25f, 0.50f }, { 1, 1, 1, {0,0,0,0}, 0.00f, 0.50f }, { -1, 1, -1, {0,0,0,0}, 0.25f, 0.50f }, { -1, 1, 1, {0,0,0,0}, 0.00f, 0.50f },
/* Back quad */ /* Back quad */
{ -1, -1, 1, {0,0,0,0}, 0.75f, 1.00f }, { 1, -1, 1, {0,0,0,0}, 1.00f, 1.00f }, { 1, -1, 1, {0,0,0,0}, 0.75f, 1.00f }, { -1, -1, 1, {0,0,0,0}, 1.00f, 1.00f },
{ 1, 1, 1, {0,0,0,0}, 1.00f, 0.50f }, { -1, 1, 1, {0,0,0,0}, 0.75f, 0.50f }, { -1, 1, 1, {0,0,0,0}, 1.00f, 0.50f }, { 1, 1, 1, {0,0,0,0}, 0.75f, 0.50f },
/* Right quad */ /* Right quad */
{ -1, -1, -1, {0,0,0,0}, 0.50f, 1.00f }, { -1, -1, 1, {0,0,0,0}, 0.75f, 1.00f }, { 1, -1, -1, {0,0,0,0}, 0.50f, 1.00f }, { 1, -1, 1, {0,0,0,0}, 0.75f, 1.00f },
{ -1, 1, 1, {0,0,0,0}, 0.75f, 0.50f }, { -1, 1, -1, {0,0,0,0}, 0.50f, 0.50f }, { 1, 1, 1, {0,0,0,0}, 0.75f, 0.50f }, { 1, 1, -1, {0,0,0,0}, 0.50f, 0.50f },
/* Top quad */ /* Top quad */
{ -1, 1, -1, {0,0,0,0}, 0.50f, 0.50f }, { -1, 1, 1, {0,0,0,0}, 0.50f, 0.00f }, { 1, 1, -1, {0,0,0,0}, 0.50f, 0.50f }, { 1, 1, 1, {0,0,0,0}, 0.50f, 0.00f },
{ 1, 1, 1, {0,0,0,0}, 0.25f, 0.00f }, { 1, 1, -1, {0,0,0,0}, 0.25f, 0.50f }, { -1, 1, 1, {0,0,0,0}, 0.25f, 0.00f }, { -1, 1, -1, {0,0,0,0}, 0.25f, 0.50f },
/* Bottom quad */ /* Bottom quad */
{ -1, -1, -1, {0,0,0,0}, 0.75f, 0.50f }, { -1, -1, 1, {0,0,0,0}, 0.75f, 0.00f }, { 1, -1, -1, {0,0,0,0}, 0.75f, 0.50f }, { 1, -1, 1, {0,0,0,0}, 0.75f, 0.00f },
{ 1, -1, 1, {0,0,0,0}, 0.50f, 0.00f }, { 1, -1, -1, {0,0,0,0}, 0.50f, 0.50f }, { -1, -1, 1, {0,0,0,0}, 0.50f, 0.00f }, { -1, -1, -1, {0,0,0,0}, 0.50f, 0.50f },
}; };
Int32 i; Int32 i;

1
src/Client/HeldBlockRenderer.c
View file

@ -226,6 +226,7 @@ static void HeldBlockRenderer_Init(void) {
held_entityVTABLE = *held_entity.VTABLE; held_entityVTABLE = *held_entity.VTABLE;
held_entityVTABLE.GetCol = HeldBlockRenderer_GetCol; held_entityVTABLE.GetCol = HeldBlockRenderer_GetCol;
held_entity.VTABLE = &held_entityVTABLE; held_entity.VTABLE = &held_entityVTABLE;
held_entity.NoShade = true;
held_lastBlock = Inventory_SelectedBlock; held_lastBlock = Inventory_SelectedBlock;
Event_RegisterVoid(&GfxEvents_ProjectionChanged, NULL, HeldBlockRenderer_ProjectionChanged); Event_RegisterVoid(&GfxEvents_ProjectionChanged, NULL, HeldBlockRenderer_ProjectionChanged);