kotofyt/funnygame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some updates

Browse Source
This commit is contained in:
kotofyt
2026-05-29 01:49:38 +03:00
parent ab9e5f47b3
commit 363bd9001d
11 changed files with 59 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/miniaudio.cpp
View File

@@ -96,7 +96,6 @@ void CMiniAudioPlayer::SetIsLooping( bool b )
void CMiniAudioPlayer::SetDirection( Vector v )
{
ma_sound_set_position(&m_sound, v.x, v.y, v.z);
}

0
engine/xr.cpp Normal file
View File

15
funnyassets/maps/mainmenu/a.fmap Normal file
View File

@@ -0,0 +1,15 @@
[
{
"classname": "prop_physics",
"model": "game/core/maps/test/test0.fmdl",
"physics": "static",
"origin": [ 0, -10, 0 ]
},
{
"classname": "prop_physics",
"model": "game/core/models/sphere.fmdl",
"physics": "dynamic",
"origin": [ 0, -5, 0 ]
}
]

206
funnyassets/maps/test/test.map
View File

@@ -1,206 +0,0 @@
// Game: Generic
// Format: Standard
// entity 0
{
"classname" "worldspawn"
// brush 0
{
( -832 -64 -160 ) ( -832 -63 -160 ) ( -832 -64 -159 ) __TB_empty 0 0 0 1 1
( -64 -576 -160 ) ( -64 -576 -159 ) ( -63 -576 -160 ) __TB_empty 0 0 0 1 1
( -64 -64 -160 ) ( -63 -64 -160 ) ( -64 -63 -160 ) __TB_empty 0 0 0 1 1
( 64 64 -144 ) ( 64 65 -144 ) ( 65 64 -144 ) __TB_empty 0 0 0 1 1
( 64 544 -128 ) ( 65 544 -128 ) ( 64 544 -127 ) __TB_empty 0 0 0 1 1
( 576 64 -128 ) ( 576 64 -127 ) ( 576 65 -128 ) __TB_empty 0 0 0 1 1
}
// brush 1
{
( -528 288 -144 ) ( -528 289 -144 ) ( -528 288 -143 ) __TB_empty 0 0 0 1 1
( -528 288 -144 ) ( -528 288 -143 ) ( -527 288 -144 ) __TB_empty 0 0 0 1 1
( -528 288 -144 ) ( -527 288 -144 ) ( -528 289 -144 ) __TB_empty 0 0 0 1 1
( -448 352 -128 ) ( -448 353 -128 ) ( -447 352 -128 ) __TB_empty 0 0 0 1 1
( -448 352 -128 ) ( -447 352 -128 ) ( -448 352 -127 ) __TB_empty 0 0 0 1 1
( -448 352 -128 ) ( -448 352 -127 ) ( -448 353 -128 ) __TB_empty 0 0 0 1 1
}
// brush 2
{
( -528 224 -144 ) ( -528 225 -144 ) ( -528 224 -143 ) __TB_empty 0 0 0 1 1
( -528 224 -144 ) ( -528 224 -143 ) ( -527 224 -144 ) __TB_empty 0 0 0 1 1
( -528 224 -144 ) ( -527 224 -144 ) ( -528 225 -144 ) __TB_empty 0 0 0 1 1
( -448 288 -112 ) ( -448 289 -112 ) ( -447 288 -112 ) __TB_empty 0 0 0 1 1
( -448 288 -128 ) ( -447 288 -128 ) ( -448 288 -127 ) __TB_empty 0 0 0 1 1
( -448 288 -128 ) ( -448 288 -127 ) ( -448 289 -128 ) __TB_empty 0 0 0 1 1
}
// brush 3
{
( -528 160 -144 ) ( -528 161 -144 ) ( -528 160 -143 ) __TB_empty 0 0 0 1 1
( -528 160 -144 ) ( -528 160 -143 ) ( -527 160 -144 ) __TB_empty 0 0 0 1 1
( -528 160 -144 ) ( -527 160 -144 ) ( -528 161 -144 ) __TB_empty 0 0 0 1 1
( -448 224 -96 ) ( -448 225 -96 ) ( -447 224 -96 ) __TB_empty 0 0 0 1 1
( -448 224 -128 ) ( -447 224 -128 ) ( -448 224 -127 ) __TB_empty 0 0 0 1 1
( -448 224 -128 ) ( -448 224 -127 ) ( -448 225 -128 ) __TB_empty 0 0 0 1 1
}
// brush 4
{
( -528 96 -144 ) ( -528 97 -144 ) ( -528 96 -143 ) __TB_empty 0 0 0 1 1
( -528 96 -144 ) ( -528 96 -143 ) ( -527 96 -144 ) __TB_empty 0 0 0 1 1
( -528 96 -144 ) ( -527 96 -144 ) ( -528 97 -144 ) __TB_empty 0 0 0 1 1
( -448 160 -80 ) ( -448 161 -80 ) ( -447 160 -80 ) __TB_empty 0 0 0 1 1
( -448 160 -128 ) ( -447 160 -128 ) ( -448 160 -127 ) __TB_empty 0 0 0 1 1
( -448 160 -128 ) ( -448 160 -127 ) ( -448 161 -128 ) __TB_empty 0 0 0 1 1
}
// brush 5
{
( -528 32 -144 ) ( -528 33 -144 ) ( -528 32 -143 ) __TB_empty 0 0 0 1 1
( -528 32 -144 ) ( -528 32 -143 ) ( -527 32 -144 ) __TB_empty 0 0 0 1 1
( -528 32 -144 ) ( -527 32 -144 ) ( -528 33 -144 ) __TB_empty 0 0 0 1 1
( -448 96 -64 ) ( -448 97 -64 ) ( -447 96 -64 ) __TB_empty 0 0 0 1 1
( -448 96 -128 ) ( -447 96 -128 ) ( -448 96 -127 ) __TB_empty 0 0 0 1 1
( -448 96 -128 ) ( -448 96 -127 ) ( -448 97 -128 ) __TB_empty 0 0 0 1 1
}
// brush 6
{
( -528 -32 -144 ) ( -528 -31 -144 ) ( -528 -32 -143 ) __TB_empty 0 0 0 1 1
( -528 -32 -144 ) ( -528 -32 -143 ) ( -527 -32 -144 ) __TB_empty 0 0 0 1 1
( -528 -32 -144 ) ( -527 -32 -144 ) ( -528 -31 -144 ) __TB_empty 0 0 0 1 1
( -448 32 -48 ) ( -448 33 -48 ) ( -447 32 -48 ) __TB_empty 0 0 0 1 1
( -448 32 -128 ) ( -447 32 -128 ) ( -448 32 -127 ) __TB_empty 0 0 0 1 1
( -448 32 -128 ) ( -448 32 -127 ) ( -448 33 -128 ) __TB_empty 0 0 0 1 1
}
// brush 7
{
( -528 -96 -144 ) ( -528 -95 -144 ) ( -528 -96 -143 ) __TB_empty 0 0 0 1 1
( -528 -96 -144 ) ( -528 -96 -143 ) ( -527 -96 -144 ) __TB_empty 0 0 0 1 1
( -528 -96 -144 ) ( -527 -96 -144 ) ( -528 -95 -144 ) __TB_empty 0 0 0 1 1
( -448 -32 -32 ) ( -448 -31 -32 ) ( -447 -32 -32 ) __TB_empty 0 0 0 1 1
( -448 -32 -128 ) ( -447 -32 -128 ) ( -448 -32 -127 ) __TB_empty 0 0 0 1 1
( -448 -32 -128 ) ( -448 -32 -127 ) ( -448 -31 -128 ) __TB_empty 0 0 0 1 1
}
// brush 8
{
( 64 -496 -144 ) ( 64 -495 -144 ) ( 64 -496 -143 ) __TB_empty 0 0 0 1 1
( 64 -496 -144 ) ( 64 -496 -143 ) ( 65 -496 -144 ) __TB_empty 0 0 0 1 1
( 64 -496 -144 ) ( 65 -496 -144 ) ( 64 -495 -144 ) __TB_empty 0 0 0 1 1
( 352 -480 16 ) ( 352 -479 16 ) ( 353 -480 16 ) __TB_empty 0 0 0 1 1
( 352 -480 -128 ) ( 353 -480 -128 ) ( 352 -480 -127 ) __TB_empty 0 0 0 1 1
( 352 -480 -128 ) ( 352 -480 -127 ) ( 352 -479 -128 ) __TB_empty 0 0 0 1 1
}
// brush 9
{
( 223 0 -144 ) ( 223 1 -144 ) ( 223 0 -143 ) __TB_empty 0 0 0 1 1
( 208 0 -144 ) ( 208 0 -143 ) ( 209 0 -144 ) __TB_empty 0 0 0 1 1
( 208 0 -144 ) ( 209 0 -144 ) ( 208 1 -144 ) __TB_empty 0 0 0 1 1
( 224 240 112 ) ( 224 241 112 ) ( 225 240 112 ) __TB_empty 0 0 0 1 1
( 224 64 -128 ) ( 225 64 -128 ) ( 224 64 -127 ) __TB_empty 0 0 0 1 1
( 224 240 -128 ) ( 224 240 -127 ) ( 224 241 -128 ) __TB_empty 0 0 0 1 1
}
// brush 10
{
( 222 64 -144 ) ( 222 65 -144 ) ( 222 64 -143 ) __TB_empty 0 0 0 1 1
( 208 64 -144 ) ( 208 64 -143 ) ( 209 64 -144 ) __TB_empty 0 0 0 1 1
( 208 64 -144 ) ( 209 64 -144 ) ( 208 65 -144 ) __TB_empty 0 0 0 1 1
( 224 304 112 ) ( 224 305 112 ) ( 225 304 112 ) __TB_empty 0 0 0 1 1
( 224 128 -128 ) ( 225 128 -128 ) ( 224 128 -127 ) __TB_empty 0 0 0 1 1
( 224 304 -128 ) ( 224 304 -127 ) ( 224 305 -128 ) __TB_empty 0 0 0 1 1
}
// brush 11
{
( 221 128 -144 ) ( 221 129 -144 ) ( 221 128 -143 ) __TB_empty 0 0 0 1 1
( 208 128 -144 ) ( 208 128 -143 ) ( 209 128 -144 ) __TB_empty 0 0 0 1 1
( 208 128 -144 ) ( 209 128 -144 ) ( 208 129 -144 ) __TB_empty 0 0 0 1 1
( 224 368 112 ) ( 224 369 112 ) ( 225 368 112 ) __TB_empty 0 0 0 1 1
( 224 192 -128 ) ( 225 192 -128 ) ( 224 192 -127 ) __TB_empty 0 0 0 1 1
( 224 368 -128 ) ( 224 368 -127 ) ( 224 369 -128 ) __TB_empty 0 0 0 1 1
}
// brush 12
{
( 220 192 -144 ) ( 220 193 -144 ) ( 220 192 -143 ) __TB_empty 0 0 0 1 1
( 208 192 -144 ) ( 208 192 -143 ) ( 209 192 -144 ) __TB_empty 0 0 0 1 1
( 208 192 -144 ) ( 209 192 -144 ) ( 208 193 -144 ) __TB_empty 0 0 0 1 1
( 224 432 112 ) ( 224 433 112 ) ( 225 432 112 ) __TB_empty 0 0 0 1 1
( 224 256 -128 ) ( 225 256 -128 ) ( 224 256 -127 ) __TB_empty 0 0 0 1 1
( 224 432 -128 ) ( 224 432 -127 ) ( 224 433 -128 ) __TB_empty 0 0 0 1 1
}
// brush 13
{
( 219 256 -144 ) ( 219 257 -144 ) ( 219 256 -143 ) __TB_empty 0 0 0 1 1
( 208 256 -144 ) ( 208 256 -143 ) ( 209 256 -144 ) __TB_empty 0 0 0 1 1
( 208 256 -144 ) ( 209 256 -144 ) ( 208 257 -144 ) __TB_empty 0 0 0 1 1
( 224 496 112 ) ( 224 497 112 ) ( 225 496 112 ) __TB_empty 0 0 0 1 1
( 224 320 -128 ) ( 225 320 -128 ) ( 224 320 -127 ) __TB_empty 0 0 0 1 1
( 224 496 -128 ) ( 224 496 -127 ) ( 224 497 -128 ) __TB_empty 0 0 0 1 1
}
// brush 14
{
( 218 320 -144 ) ( 218 321 -144 ) ( 218 320 -143 ) __TB_empty 0 0 0 1 1
( 208 320 -144 ) ( 208 320 -143 ) ( 209 320 -144 ) __TB_empty 0 0 0 1 1
( 208 320 -144 ) ( 209 320 -144 ) ( 208 321 -144 ) __TB_empty 0 0 0 1 1
( 224 560 112 ) ( 224 561 112 ) ( 225 560 112 ) __TB_empty 0 0 0 1 1
( 224 384 -128 ) ( 225 384 -128 ) ( 224 384 -127 ) __TB_empty 0 0 0 1 1
( 224 560 -128 ) ( 224 560 -127 ) ( 224 561 -128 ) __TB_empty 0 0 0 1 1
}
// brush 15
{
( 208 384 -144 ) ( 208 385 -144 ) ( 208 384 -143 ) __TB_empty 0 0 0 1 1
( 208 384 -144 ) ( 208 384 -143 ) ( 209 384 -144 ) __TB_empty 0 0 0 1 1
( 208 384 -144 ) ( 209 384 -144 ) ( 208 385 -144 ) __TB_empty 0 0 0 1 1
( 224 624 112 ) ( 224 625 112 ) ( 225 624 112 ) __TB_empty 0 0 0 1 1
( 224 448 -128 ) ( 225 448 -128 ) ( 224 448 -127 ) __TB_empty 0 0 0 1 1
( 224 624 -128 ) ( 224 624 -127 ) ( 224 625 -128 ) __TB_empty 0 0 0 1 1
}
// brush 16
{
( -608 352 -128 ) ( -607 352 -128 ) ( -608 352 -127 ) __TB_empty 0 0 0 1 1
( -688 288 -144 ) ( -688 289 -144 ) ( -688 288 -143 ) __TB_empty 0 0 0 1 1
( -688 288 -144 ) ( -688 288 -143 ) ( -687 288 -144 ) __TB_empty 0 0 0 1 1
( -688 288 -144 ) ( -687 288 -144 ) ( -688 289 -144 ) __TB_empty 0 0 0 1 1
( -608 352 -144 ) ( -688 352 -128 ) ( -688 480 -128 ) __TB_empty 0 0 0 1 1
}
// brush 17
{
( -608 288 -128 ) ( -607 288 -128 ) ( -608 288 -127 ) __TB_empty 0 0 0 1 1
( -688 224 -144 ) ( -688 225 -144 ) ( -688 224 -143 ) __TB_empty 0 0 0 1 1
( -688 224 -144 ) ( -688 224 -143 ) ( -687 224 -144 ) __TB_empty 0 0 0 1 1
( -688 224 -144 ) ( -687 224 -144 ) ( -688 225 -144 ) __TB_empty 0 0 0 1 1
( -608 288 -144 ) ( -688 288 -112 ) ( -688 416 -112 ) __TB_empty 0 0 0 1 1
}
// brush 18
{
( -608 224 -128 ) ( -607 224 -128 ) ( -608 224 -127 ) __TB_empty 0 0 0 1 1
( -688 160 -144 ) ( -688 161 -144 ) ( -688 160 -143 ) __TB_empty 0 0 0 1 1
( -688 160 -144 ) ( -688 160 -143 ) ( -687 160 -144 ) __TB_empty 0 0 0 1 1
( -688 160 -144 ) ( -687 160 -144 ) ( -688 161 -144 ) __TB_empty 0 0 0 1 1
( -608 224 -144 ) ( -688 224 -96 ) ( -688 352 -96 ) __TB_empty 0 0 0 1 1
}
// brush 19
{
( -608 160 -128 ) ( -607 160 -128 ) ( -608 160 -127 ) __TB_empty 0 0 0 1 1
( -688 96 -144 ) ( -688 97 -144 ) ( -688 96 -143 ) __TB_empty 0 0 0 1 1
( -688 96 -144 ) ( -688 96 -143 ) ( -687 96 -144 ) __TB_empty 0 0 0 1 1
( -688 96 -144 ) ( -687 96 -144 ) ( -688 97 -144 ) __TB_empty 0 0 0 1 1
( -608 160 -144 ) ( -688 160 -80 ) ( -688 288 -80 ) __TB_empty 0 0 0 1 1
}
// brush 20
{
( -608 96 -128 ) ( -607 96 -128 ) ( -608 96 -127 ) __TB_empty 0 0 0 1 1
( -688 32 -144 ) ( -688 33 -144 ) ( -688 32 -143 ) __TB_empty 0 0 0 1 1
( -688 32 -144 ) ( -688 32 -143 ) ( -687 32 -144 ) __TB_empty 0 0 0 1 1
( -688 32 -144 ) ( -687 32 -144 ) ( -688 33 -144 ) __TB_empty 0 0 0 1 1
( -608 96 -144 ) ( -688 96 -64 ) ( -688 224 -64 ) __TB_empty 0 0 0 1 1
}
// brush 21
{
( -608 32 -128 ) ( -607 32 -128 ) ( -608 32 -127 ) __TB_empty 0 0 0 1 1
( -688 -32 -144 ) ( -688 -31 -144 ) ( -688 -32 -143 ) __TB_empty 0 0 0 1 1
( -688 -32 -144 ) ( -688 -32 -143 ) ( -687 -32 -144 ) __TB_empty 0 0 0 1 1
( -688 -32 -144 ) ( -687 -32 -144 ) ( -688 -31 -144 ) __TB_empty 0 0 0 1 1
( -608 32 -144 ) ( -688 32 -48 ) ( -688 160 -48 ) __TB_empty 0 0 0 1 1
}
// brush 22
{
( -608 -32 -128 ) ( -607 -32 -128 ) ( -608 -32 -127 ) __TB_empty 0 0 0 1 1
( -688 -96 -144 ) ( -688 -95 -144 ) ( -688 -96 -143 ) __TB_empty 0 0 0 1 1
( -688 -96 -144 ) ( -688 -96 -143 ) ( -687 -96 -144 ) __TB_empty 0 0 0 1 1
( -688 -96 -144 ) ( -687 -96 -144 ) ( -688 -95 -144 ) __TB_empty 0 0 0 1 1
( -608 -32 -144 ) ( -688 -32 -32 ) ( -688 96 -32 ) __TB_empty 0 0 0 1 1
}
}

BIN
funnyassets/textures/dev/tile128.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 190 B

BIN
funnyassets/textures/dev/tile64.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 173 B

8
game/client/userinput.cpp
View File

@@ -12,10 +12,18 @@ public:
virtual void OnGameAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue) override;
virtual void OnGameAxisDiff( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) override;
virtual void OnGameButton( EInputDeviceType eDevice, const char *szName, bool bIsPressed ) override {};
virtual void OnGameAxis( EInputDeviceType eDevice, const char *szName, float fValue) override {};
virtual void OnGameAxisDiff( EInputDeviceType eDevice, const char *szName, float fValue ) override {};
virtual void OnButton( EInputDeviceType eDevice, EInputButton eScancode, bool bIsPressed ) override {};
virtual void OnAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue) override {};
virtual void OnAxisDiff( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) override {};
virtual void OnButton( EInputDeviceType eDevice, const char *szName, bool bIsPressed ) override {};
virtual void OnAxis( EInputDeviceType eDevice, const char *szName, float fValue) override {};
virtual void OnAxisDiff( EInputDeviceType eDevice, const char *szName, float fValue ) override {};
virtual void OnTextWriteUTF8( uint32_t uCode ) override {};
CUtlString m_aszBindings[k_EInputButton_Count];

6
game/server/game.cpp
View File

@@ -138,7 +138,10 @@ void CFunnyGameBridge::Init()
g_pPhysics = (IPhysics*)fnPhysicsFactory(PHYSICS_INTERFACE_VERSION, NULL);
g_pPhysicsWorld = g_pPhysics->CreateWorld();
g_pWorldSystem->LoadMap("game/core/maps/test/test.fmap");
if (g_pEngineConstants->m_bIsDedicated == false)
g_pWorldSystem->LoadMap("game/core/maps/mainmenu/a.fmap");
else
g_pWorldSystem->LoadMap("game/core/maps/test/test.fmap");
}
@@ -199,6 +202,7 @@ void CFunnyGameBridge::Frame( float fDelta )
g_pEngineVars->m_fDeltaTime = fDelta;
#ifdef STEAM
if (g_pEngineConstants->m_bIsSteam && g_pEngineConstants->m_bIsDedicated)
{
if (m_bIsConnectedToSteamRelay == 0 && SteamNetworkingUtils()->GetRelayNetworkStatus(NULL) == k_ESteamNetworkingAvailability_Current)

12
public/ihumandevice.h
View File

@@ -11,13 +11,21 @@ public:
virtual EInputType GetInputType() = 0;
virtual void OnGameButton( EInputDeviceType eDevice, EInputButton eScancode, bool bIsPressed ) = 0;
virtual void OnGameAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue) = 0;
virtual void OnGameAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) = 0;
virtual void OnGameAxisDiff( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) = 0;
virtual void OnButton( EInputDeviceType eDevice, EInputButton eScancode, bool bIsPressed ) = 0;
virtual void OnAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue) = 0;
virtual void OnAxis( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) = 0;
virtual void OnAxisDiff( EInputDeviceType eDevice, EInputAxis eAxis, float fValue ) = 0;
virtual void OnGameButton( EInputDeviceType eDevice, const char *szName, bool bIsPressed ) = 0;
virtual void OnGameAxis( EInputDeviceType eDevice, const char *szName, float fValue ) = 0;
virtual void OnGameAxisDiff( EInputDeviceType eDevice, const char *szName, float fValue ) = 0;
virtual void OnButton( EInputDeviceType eDevice, const char *szName, bool bIsPressed ) = 0;
virtual void OnAxis( EInputDeviceType eDevice, const char *szName, float fValue ) = 0;
virtual void OnAxisDiff( EInputDeviceType eDevice, const char *szName, float fValue ) = 0;
virtual void OnTextWriteUTF8( uint32_t uCode ) = 0;
};

14
public/ixr.h Normal file
View File

@@ -0,0 +1,14 @@
#ifndef IXR_H
#define IXR_H
#include "tier1/interface.h"
#include "tier2/iappsystem.h"
#include "trig.h"
abstract_class IXrManager: public IAppSystem
{
public:
};
#endif

7
public/materialsystem/humandevice_enums.h
View File

@@ -89,6 +89,11 @@ enum EInputAxis
{
k_EInputAxis_MouseX,
k_EInputAxis_MouseY,
k_EInputAxis_Gamepad_ThumbStick_LX,
k_EInputAxis_Gamepad_ThumbStick_LY,
k_EInputAxis_Gamepad_ThumbStick_RX,
k_EInputAxis_Gamepad_ThumbStick_RY,
};
enum EInputType
@@ -103,6 +108,8 @@ enum EInputDeviceType
k_EInputDevice_Keyboard,
k_EInputDevice_Mouse,
k_EInputDevice_Gamepad,
k_EInputDevice_VrHeadset,
k_EInputDevice_VrController,
};
#endif