Skip to content

Commit 8760271

Browse files
ZeteliasZetelias
committed
cleanup + start of input module
1 parent b9aaa6e commit 8760271

30 files changed

+231
-151
lines changed

‎app/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
int main() {
2-
1+
int main()
2+
{
33
}

‎grngame/assets/asset_manager.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "SDL3/SDL_error.h"
44
#include "grngame/assets/load.h"
55
#include "grngame/dev/logging.h"
6-
#include "grngame/platform/paths.h"
76
#include "grngame/platform/directories.h"
7+
#include "grngame/platform/paths.h"
88
#include "khash.h"
99
#include <stdlib.h>
1010

@@ -18,7 +18,8 @@ AssetManager AssetManagerCreate()
1818
void AssetManagerLoadFolder(const char *folder)
1919
{
2020
// warn the user if he tries to use an invalid asset folder
21-
if (DirFileCount(folder) == 0) {
21+
if (DirFileCount(folder) == 0)
22+
{
2223
LOG_WARNING("No files in asset folder '%s'", folder);
2324
return;
2425
}

‎grngame/audio/sound.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ typedef struct
2525
bool playing;
2626
} SoundState;
2727

28-
2928
KHASH_MAP_INIT_STR(SoundStateMap, SoundState)
3029

3130
static khash_t(SoundStateMap) *s_sound_states = NULL;

‎grngame/audio/sound.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
#pragma once
2+
#include "grngame/utils/c_cpp.h"
23
#include "sound_info.h"
34
#include <stdbool.h>
45

56
#define MAX_FILTERS 4
67

7-
#ifdef __cplusplus
8-
extern "C"
9-
{
10-
#endif
8+
BEGIN_DECLARATIONS
119

1210
bool SoundPlay(const char *name, const SoundInfo *sound_info);
1311
void SoundStop(const char *name);
1412
bool SoundIsPlaying(const char *name);
1513
void SoundInit();
1614

17-
#ifdef __cplusplus
18-
}
19-
#endif
15+
END_DECLARATIONS

‎grngame/audio/sound_info.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "sound_info.h"
22

33
#include <float.h>
4-
#include <stddef.h>
54
#include <math.h>
5+
#include <stddef.h>
66

77
SoundInfo SoundInfoDefault()
88
{

‎grngame/audio/sound_info.h‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
#pragma once
22
#include "filter.h"
3-
3+
#include "grngame/utils/c_cpp.h"
44
#include <cglm/types-struct.h>
55
#include <stdbool.h>
66

7-
#ifdef __cplusplus
8-
extern "C"
9-
{
10-
#endif
7+
BEGIN_DECLARATIONS
118

12-
typedef struct
13-
{
14-
float volume;
15-
float pitch;
16-
float pan; // -1.0 = left, 0.0 = center, 1.0 = right
17-
bool looping;
18-
float fade_in; // seconds
19-
vec2s position;
20-
FilterDef *filters;
21-
int filter_count;
22-
} SoundInfo;
9+
typedef struct
10+
{
11+
float volume;
12+
float pitch;
13+
float pan; // -1.0 = left, 0.0 = center, 1.0 = right
14+
bool looping;
15+
float fade_in; // seconds
16+
vec2s position;
17+
FilterDef *filters;
18+
int filter_count;
19+
} SoundInfo;
2320

24-
SoundInfo SoundInfoDefault();
25-
SoundInfo SoundInfoAt(float x, float y);
21+
SoundInfo SoundInfoDefault();
22+
SoundInfo SoundInfoAt(float x, float y);
2623

27-
#ifdef __cplusplus
28-
}
29-
#endif
24+
END_DECLARATIONS

‎grngame/audio/speech.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
void SpeechSay(const char *text, const SoundInfo *sound_info)
88
{
99
// TODO have it work with filters like sound
10-
10+
1111
Speech *speech = g_app.sound_manager.speech;
1212
Soloud soloud = g_app.sound_manager.soloud;
1313

‎grngame/audio/speech.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
#pragma once
2+
#include "grngame/utils/c_cpp.h"
23
#include "sound_info.h"
34
#include "sound_manager.h"
45

5-
#ifdef __cplusplus
6-
extern "C"
7-
{
8-
#endif
6+
BEGIN_DECLARATIONS
97

108
void SpeechSay(const char *text, const SoundInfo *sound_info);
119

12-
#ifdef __cplusplus
13-
}
14-
#endif
10+
END_DECLARATIONS

‎grngame/bindings/da_script_bind.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,46 @@
22

33
#include "da_script_engine.hpp"
44

5-
extern "C" {
6-
7-
DaScriptManager* DaScriptManagerNew()
5+
extern "C"
6+
{
7+
DaScriptManager *DaScriptManagerNew()
88
{
9-
return reinterpret_cast<DaScriptManager*>(new DaScriptEngine());
9+
return reinterpret_cast<DaScriptManager *>(new DaScriptEngine());
1010
}
1111

12-
void DaScriptManagerDelete(DaScriptManager* manager)
12+
void DaScriptManagerDelete(DaScriptManager *manager)
1313
{
14-
delete reinterpret_cast<DaScriptEngine*>(manager);
14+
delete reinterpret_cast<DaScriptEngine *>(manager);
1515
}
1616

17-
bool DaScriptManagerInitialize(DaScriptManager* manager, const char* main_script_name)
17+
bool DaScriptManagerInitialize(DaScriptManager *manager, const char *main_script_name)
1818
{
19-
return reinterpret_cast<DaScriptEngine*>(manager)->Init(main_script_name);
19+
return reinterpret_cast<DaScriptEngine *>(manager)->Init(main_script_name);
2020
}
2121

22-
bool DaScriptManagerCallOnStart(DaScriptManager* manager)
22+
bool DaScriptManagerCallOnStart(DaScriptManager *manager)
2323
{
24-
return reinterpret_cast<DaScriptEngine*>(manager)->CallOnStart();
24+
return reinterpret_cast<DaScriptEngine *>(manager)->CallOnStart();
2525
}
2626

27-
bool DaScriptManagerCallOnUpdate(DaScriptManager* manager, float delta)
27+
bool DaScriptManagerCallOnUpdate(DaScriptManager *manager, float delta)
2828
{
29-
return reinterpret_cast<DaScriptEngine*>(manager)->CallOnUpdate(delta);
29+
return reinterpret_cast<DaScriptEngine *>(manager)->CallOnUpdate(delta);
3030
}
3131

32-
bool DaScriptManagerCallOnFixedUpdate(DaScriptManager* manager, float delta)
32+
bool DaScriptManagerCallOnFixedUpdate(DaScriptManager *manager, float delta)
3333
{
34-
return reinterpret_cast<DaScriptEngine*>(manager)->CallOnFixedUpdate(delta);
34+
return reinterpret_cast<DaScriptEngine *>(manager)->CallOnFixedUpdate(delta);
3535
}
3636

37-
bool DaScriptManagerCallOnRender(DaScriptManager* manager)
37+
bool DaScriptManagerCallOnRender(DaScriptManager *manager)
3838
{
39-
return reinterpret_cast<DaScriptEngine*>(manager)->CallOnRender();
39+
return reinterpret_cast<DaScriptEngine *>(manager)->CallOnRender();
4040
}
4141

42-
bool DaScriptManagerCallOnDestroy(DaScriptManager* manager)
42+
bool DaScriptManagerCallOnDestroy(DaScriptManager *manager)
4343
{
44-
return reinterpret_cast<DaScriptEngine*>(manager)->CallOnDestroy();
44+
return reinterpret_cast<DaScriptEngine *>(manager)->CallOnDestroy();
4545
}
4646

4747
} // extern "C"

‎grngame/bindings/da_script_bind.h‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
#pragma once
2+
#include "grngame/utils/c_cpp.h"
23
#include <stdbool.h>
34

4-
#ifdef __cplusplus
5-
extern "C"
6-
{
7-
#endif
5+
BEGIN_DECLARATIONS
86

9-
typedef struct DaScriptManager DaScriptManager;
7+
typedef struct DaScriptManager DaScriptManager;
108

11-
DaScriptManager *DaScriptManagerNew();
12-
void DaScriptManagerDelete(DaScriptManager *manager);
13-
bool DaScriptManagerInitialize(DaScriptManager *manager, const char *main_script_name);
9+
DaScriptManager *DaScriptManagerNew();
10+
void DaScriptManagerDelete(DaScriptManager *manager);
11+
bool DaScriptManagerInitialize(DaScriptManager *manager, const char *main_script_name);
1412

15-
bool DaScriptManagerCallOnStart(DaScriptManager *manager);
16-
bool DaScriptManagerCallOnUpdate(DaScriptManager *manager, float delta);
17-
bool DaScriptManagerCallOnFixedUpdate(DaScriptManager *manager, float delta);
18-
bool DaScriptManagerCallOnRender(DaScriptManager *manager);
19-
bool DaScriptManagerCallOnDestroy(DaScriptManager *manager);
13+
bool DaScriptManagerCallOnStart(DaScriptManager *manager);
14+
bool DaScriptManagerCallOnUpdate(DaScriptManager *manager, float delta);
15+
bool DaScriptManagerCallOnFixedUpdate(DaScriptManager *manager, float delta);
16+
bool DaScriptManagerCallOnRender(DaScriptManager *manager);
17+
bool DaScriptManagerCallOnDestroy(DaScriptManager *manager);
2018

21-
#ifdef __cplusplus
22-
}
23-
#endif
19+
END_DECLARATIONS

0 commit comments

Comments
 (0)