FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

- Removed the use of Boost's overload macros declaration. · Necavi/Source.Python@6b8045d · GitHub

  1. Necavi
  2. Source.Python

Repository navigation

Commit 6b8045d

Browse files
L'In20Cible
committed
- Removed the use of Boost's overload macros declaration.
1 parent d9f1570 commit 6b8045d

10 files changed

Lines changed: 82 additions & 201 deletions

File tree

‎src/core/modules/commands/commands_server_wrap_python.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ extern CServerCommandManager* GetServerCommand(const char* szName,
4646
void export_server_command_manager(scope);
4747

4848

49-
//-----------------------------------------------------------------------------
50-
// Overloads.
51-
//-----------------------------------------------------------------------------
52-
BOOST_PYTHON_FUNCTION_OVERLOADS(get_server_command_overloads, GetServerCommand, 1, 3)
53-
54-
5549
//-----------------------------------------------------------------------------
5650
// Declare the _commands._server module.
5751
//-----------------------------------------------------------------------------
@@ -61,10 +55,10 @@ DECLARE_SP_SUBMODULE(_commands, _server)
6155

6256
// Helper functions...
6357
def("get_server_command",
64-
GetServerCommand,
65-
get_server_command_overloads("Gets the ServerCommandDispatcher instance using just the name or also the helptext and/or flags",
66-
args("name", "help_text", "flags")
67-
)[reference_existing_object_policy()]
58+
&GetServerCommand,
59+
"Gets the ServerCommandDispatcher instance using just the name or also the helptext and/or flags",
60+
("name", arg("help_text")=object(), arg("flags")=0),
61+
reference_existing_object_policy()
6862
);
6963
}
7064

‎src/core/modules/engines/csgo/engines_wrap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class IEngineSoundExt
4040
{
4141
public:
4242
static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,
43-
float flVolume, float flAttenuation, int iFlags = 0, int iPitch = PITCH_NORM, const Vector *pOrigin = NULL, const Vector *pDirection = NULL,
44-
tuple origins = tuple(), bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1)
43+
float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
44+
tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
4545
{
4646
CUtlVector<Vector> *pUtlVecOrigins = NULL;
4747
CUtlVector<Vector> vecOrigins;

‎src/core/modules/engines/csgo/engines_wrap_python.h‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
extern IEngineTrace* enginetrace;
4141

4242

43-
//---------------------------------------------------------------------------------
44-
// Overloads.
45-
//---------------------------------------------------------------------------------
46-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_single_player_shared_memory_space_overload, GetSinglePlayerSharedMemorySpace, 1, 2);
47-
48-
4943
//---------------------------------------------------------------------------------
5044
// IVEngineServer visitor function.
5145
//---------------------------------------------------------------------------------
@@ -122,10 +116,9 @@ T IVEngineServer_Visitor(T cls)
122116

123117
.def("get_single_player_shared_memory_space",
124118
&IVEngineServer::GetSinglePlayerSharedMemorySpace,
125-
get_single_player_shared_memory_space_overload(
126-
"Finds or creates a shared memory_space.",
127-
args("name", "ent_num")
128-
)[reference_existing_object_policy()]
119+
"Finds or creates a shared memory_space.",
120+
("name", arg("ent_num")=MAX_EDICTS),
121+
reference_existing_object_policy()
129122
)
130123

131124
/*

‎src/core/modules/engines/engines_wrap_python.cpp‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ DECLARE_SP_MODULE(_engines)
9191
}
9292

9393

94-
//---------------------------------------------------------------------------------
95-
// Overloads.
96-
//---------------------------------------------------------------------------------
97-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_model_overload, PrecacheModel, 1, 2);
98-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_sentence_file_overload, PrecacheSentenceFile, 1, 2);
99-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_decal_overload, PrecacheDecal, 1, 2);
100-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_generic_overload, PrecacheGeneric, 1, 2);
101-
102-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_sound_overload, PrecacheSound, 1, 3);
103-
BOOST_PYTHON_FUNCTION_OVERLOADS(emit_sound_overload, IEngineSoundExt::EmitSound, 7, 15);
104-
105-
10694
//---------------------------------------------------------------------------------
10795
// Exports IVEngineServer.
10896
//---------------------------------------------------------------------------------
@@ -138,26 +126,20 @@ void export_engine_server(scope _engines)
138126

139127
.def("precache_model",
140128
&IVEngineServer::PrecacheModel,
141-
precache_model_overload(
142-
"Precaches a model and returns an integer containing its index.",
143-
args("s", "preload")
144-
)
129+
"Precaches a model and returns an integer containing its index.",
130+
("s", arg("preload")=false)
145131
)
146132

147133
.def("precache_decal",
148134
&IVEngineServer::PrecacheDecal,
149-
precache_decal_overload(
150-
"Precaches a decal file and returns an integer containing its index.",
151-
args("s", "preload")
152-
)
135+
"Precaches a decal file and returns an integer containing its index.",
136+
("s", arg("preload")=false)
153137
)
154138

155139
.def("precache_generic",
156140
&IVEngineServer::PrecacheGeneric,
157-
precache_generic_overload(
158-
"Precaches a generic asset file and returns an integer containing its index.",
159-
args("s", "preload")
160-
)
141+
"Precaches a generic asset file and returns an integer containing its index.",
142+
("s", arg("preload")=false)
161143
)
162144

163145
.def("is_model_precached",
@@ -748,10 +730,8 @@ void export_engine_sound(scope _engines)
748730

749731
.def("precache_sound",
750732
&IEngineSound::PrecacheSound,
751-
precache_sound_overload(
752-
args("sample", "preload", "is_ui_sound"),
753-
"Precaches a particular sample."
754-
)
733+
("sample", arg("preload")=false, arg("is_ui_sound")=false),
734+
"Precaches a particular sample."
755735
)
756736

757737
.def("is_sound_precached",
@@ -774,10 +754,11 @@ void export_engine_sound(scope _engines)
774754

775755
.def("emit_sound",
776756
&IEngineSoundExt::EmitSound,
777-
emit_sound_overload(
778-
args("filter", "entity_index", "channel", "sample", "volume", "attenuation", "flags", "pitch", "origin", "direction", "origins", "update_positions", "sound_time", "speaker_entity"),
779-
"Emits a sound from an entity."
780-
)
757+
("filter", "entity_index", "channel", "sample",
758+
"volume", "attenuation",
759+
arg("flags")=0, arg("pitch")=PITCH_NORM, arg("origin")=object(), arg("direction")=object(),
760+
arg("origins")=tuple(), arg("update_positions")=true, arg("sound_time")=0.0f, arg("speaker_entity")=INVALID_ENTITY_INDEX),
761+
"Emits a sound from an entity."
781762
)
782763

783764
// TODO: Can we use IVEngineServer::SentenceNameFromIndex() and then call IEngineSound::EmitSound()?

‎src/core/modules/engines/orangebox/engines_wrap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class IEngineSoundExt
4040
{
4141
public:
4242
static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,
43-
float flVolume, float flAttenuation, int iFlags = 0, int iPitch = PITCH_NORM, const Vector *pOrigin = NULL, const Vector *pDirection = NULL,
44-
tuple origins = tuple(), bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1)
43+
float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
44+
tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
4545
{
4646
CUtlVector<Vector> *pUtlVecOrigins = NULL;
4747
CUtlVector<Vector> vecOrigins;

‎src/core/modules/events/events_wrap_python.cpp‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,6 @@ DECLARE_SP_MODULE(_events)
5858
}
5959

6060

61-
//-----------------------------------------------------------------------------
62-
// Overloads.
63-
//-----------------------------------------------------------------------------
64-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_bool_overload, GetBool, 1, 2);
65-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_int_overload, GetInt, 1, 2);
66-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_float_overload, GetFloat, 1, 2);
67-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_string_overload, GetString, 1, 2);
68-
69-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_event_overload, CreateEvent, 1, 2);
70-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(fire_event_overload, FireEvent, 1, 2);
71-
72-
7361
//-----------------------------------------------------------------------------
7462
// Exports IGameEvent.
7563
//-----------------------------------------------------------------------------
@@ -99,34 +87,26 @@ void export_igameevent(scope _events)
9987

10088
.def("get_bool",
10189
&IGameEvent::GetBool,
102-
get_bool_overload(
103-
args("key_name", "default_value"),
104-
"Returns the value of the key name as a bool."
105-
)
90+
("key_name", arg("default_value")=false),
91+
"Returns the value of the key name as a bool."
10692
)
10793

10894
.def("get_int",
10995
&IGameEvent::GetInt,
110-
get_int_overload(
111-
args("key_name", "default_value"),
112-
"Returns the value of the key name as an int."
113-
)
96+
("key_name", arg("default_value")=0),
97+
"Returns the value of the key name as an int."
11498
)
11599

116100
.def("get_float",
117101
&IGameEvent::GetFloat,
118-
get_float_overload(
119-
args("key_name", "default_value"),
120-
"Returns the value of the key name as a float."
121-
)
102+
("key_name", arg("default_value")=0.0f),
103+
"Returns the value of the key name as a float."
122104
)
123105

124106
.def("get_string",
125107
&IGameEvent::GetString,
126-
get_string_overload(
127-
args("key_name", "default_value"),
128-
"Returns the value of the key name as a string."
129-
)
108+
("key_name", arg("default_value")=""),
109+
"Returns the value of the key name as a string."
130110
)
131111

132112
.def("set_bool",
@@ -222,22 +202,19 @@ void export_igameeventmanager(scope _events)
222202

223203
.def("create_event",
224204
&IGameEventManager2::CreateEvent,
225-
create_event_overload(
226-
"Creates an event by name but doesn't fire it. Returns NULL if the event\
227-
is not known or no listener is registered for it. Setting should_force to\
228-
True forces the creation of the event even if no listener for it is active.",
229-
args("event_name", "bForce")
230-
)[reference_existing_object_policy()]
205+
"Creates an event by name but doesn't fire it. Returns NULL if the event\
206+
is not known or no listener is registered for it. Setting should_force to\
207+
True forces the creation of the event even if no listener for it is active.",
208+
("event_name", arg("bForce")=false),
209+
reference_existing_object_policy()
231210
)
232211

233212
.def("fire_event",
234213
&IGameEventManager2::FireEvent,
235-
fire_event_overload(
236-
"Fires a server event created by create_event. If dont_broadcast is set\
237-
to False (which it is by default), the event is not sent to clients.\
238-
Returns true if the event is fired off successfully.",
239-
args("game_event", "dont_broadcast")
240-
)
214+
"Fires a server event created by create_event. If dont_broadcast is set\
215+
to False (which it is by default), the event is not sent to clients.\
216+
Returns true if the event is fired off successfully.",
217+
("game_event", arg("dont_broadcast")=false)
241218
)
242219

243220
.def("fire_event_client_side",

‎src/core/modules/keyvalues/keyvalues_wrap_python.cpp‎

Lines changed: 20 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,6 @@ DECLARE_SP_MODULE(_keyvalues)
4848
}
4949

5050

51-
//---------------------------------------------------------------------------------
52-
// Overloads.
53-
//---------------------------------------------------------------------------------
54-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(find_key_overload, FindKey, 1, 2);
55-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_int_overload, GetInt, 0, 2);
56-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_uint64_overload, GetUint64, 0, 2);
57-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_float_overload, GetFloat, 0, 2);
58-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_string_overload, GetString, 0, 2);
59-
BOOST_PYTHON_FUNCTION_OVERLOADS(get_color_overload, KeyValuesExt::GetColor, 2, 3);
60-
BOOST_PYTHON_FUNCTION_OVERLOADS(get_bool_overload, KeyValuesExt::GetBool, 2, 3);
61-
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(is_empty_overload, IsEmpty, 0, 1);
62-
63-
6451
//---------------------------------------------------------------------------------
6552
// Exports KeyValues.
6653
//---------------------------------------------------------------------------------
@@ -100,7 +87,7 @@ void export_keyvalues(scope _keyvalues)
10087
"Loads KeyValues data from a file into this KeyValues instance.",
10188
args("file_name")
10289
)
103-
90+
10491
.def("save_to_file",
10592
&KeyValuesExt::SaveToFile,
10693
args("file_name"),
@@ -109,19 +96,18 @@ void export_keyvalues(scope _keyvalues)
10996

11097
.def("find_key",
11198
GET_METHOD(KeyValues *, KeyValues, FindKey, const char *, bool),
112-
find_key_overload(
113-
"Finds a KeyValue. Creates it if create_key is set.",
114-
args("key_name", "create_key")
115-
)[reference_existing_object_policy()]
99+
"Finds a KeyValue. Creates it if create_key is set.",
100+
("key_name", arg("create_key")=false),
101+
reference_existing_object_policy()
116102
)
117-
103+
118104
.def("find_key_by_symbol",
119105
static_cast< KeyValues* (KeyValues::*)( int ) const >(&KeyValues::FindKey),
120106
"Finds a subkey by an integer identifier.",
121107
args("key"),
122108
reference_existing_object_policy()
123109
)
124-
110+
125111
.def("create_new_key",
126112
&KeyValues::CreateNewKey,
127113
"Creates a new child key with an autogenerated name. The name is guaranteed to be\
@@ -180,58 +166,44 @@ void export_keyvalues(scope _keyvalues)
180166

181167
.def("get_int",
182168
GET_METHOD(int, KeyValues, GetInt, const char *, int),
183-
get_int_overload(
184-
"Returns the integer value for the given key name.",
185-
args("key_name", "default_value")
186-
)
169+
"Returns the integer value for the given key name.",
170+
("key_name", arg("default_value")=0)
187171
)
188172

189173
.def("get_uint64",
190174
GET_METHOD(uint64, KeyValues, GetUint64, const char *, uint64),
191-
get_uint64_overload(
192-
"Gets the 64-bit integer value for the given key name.",
193-
args("key_name", "default_value")
194-
)
175+
"Gets the 64-bit integer value for the given key name.",
176+
("key_name", arg("default_value")=0)
195177
)
196178

197179
.def("get_float",
198180
GET_METHOD(float, KeyValues, GetFloat, const char *, float),
199-
get_float_overload(
200-
"Returns the floating point value for the given key name.",
201-
args("key_name", "default_value")
202-
)
181+
"Returns the floating point value for the given key name.",
182+
("key_name", arg("default_value")=0.0f)
203183
)
204184

205185
.def("get_string",
206186
GET_METHOD(const char *, KeyValues, GetString, const char *, const char *),
207-
get_string_overload(
208-
"Returns the string value for the given key name.",
209-
args("key_name", "default_value")
210-
)
187+
"Returns the string value for the given key name.",
188+
("key_name", arg("default_value")="")
211189
)
212190

213191
.def("get_color",
214192
&KeyValuesExt::GetColor,
215-
get_color_overload(
216-
"Returns the color value of the given key name.",
217-
args("key_name", "default_value")
218-
)
193+
"Returns the color value of the given key name.",
194+
("key_name", arg("default_value")=object())
219195
)
220196

221197
.def("get_bool",
222198
&KeyValuesExt::GetBool,
223-
get_bool_overload(
224-
"Returns the boolean value for the given key name.",
225-
args("key_name", "default_value")
226-
)
199+
"Returns the boolean value for the given key name.",
200+
("key_name", arg("default_value")=false)
227201
)
228202

229203
.def("is_empty",
230204
GET_METHOD(bool, KeyValues, IsEmpty, const char *),
231-
is_empty_overload(
232-
"Returns true if this key or the given key is empty.",
233-
args("key_name")
234-
)
205+
"Returns true if this key or the given key is empty.",
206+
(arg("key_name")=object())
235207
)
236208

237209
.def("set_string",

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL