Skip to content

Commit a87f121

Browse files
jordanbrierejordanbriere
committed
Moved Entity.<get/set>_property_<type> methods to BaseEntity (approx. ~3 times faster).
Added BaseEntity.<get/set>_<datamap/network>_property_edict. Added BaseEntity.get_property_double. Added BaseEntity.get_property_long. Added BaseEntity.get_property_long_long. Added BaseEntity.get_property_string_array. Added BaseEntity.get_property_ulong. Added BaseEntity.get_property_ulong_long. Added BaseEntity.set_property_double. Added BaseEntity.set_property_long. Added BaseEntity.set_property_long_long. Added BaseEntity.set_property_string_array. Added BaseEntity.set_property_ulong. Added BaseEntity.set_property_ulong_long.
1 parent a179e8c commit a87f121

2 files changed

Lines changed: 335 additions & 0 deletions

File tree

‎src/core/modules/entities/entities_entity.h‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,75 @@ class CBaseEntityWrapper: public IServerEntity
206206
GetEdict()->StateChanged();
207207
}
208208

209+
// Generic property getter/setter methods
210+
template<class T>
211+
T GetProperty(const char *name)
212+
{
213+
try
214+
{
215+
return GetNetworkProperty<T>(name);
216+
}
217+
catch (...)
218+
{
219+
if (!PyErr_ExceptionMatches(PyExc_ValueError))
220+
throw_error_already_set();
221+
222+
PyErr_Clear();
223+
return GetDatamapProperty<T>(name);
224+
}
225+
}
226+
227+
const char* GetPropertyStringArray(const char* name)
228+
{
229+
try
230+
{
231+
return GetNetworkPropertyStringArray(name);
232+
}
233+
catch (...)
234+
{
235+
if (!PyErr_ExceptionMatches(PyExc_ValueError))
236+
throw_error_already_set();
237+
238+
PyErr_Clear();
239+
return GetDatamapPropertyStringArray(name);
240+
}
241+
}
242+
243+
template<class T>
244+
void SetProperty(const char *name, T value)
245+
{
246+
try
247+
{
248+
// Let's first lookup a networked property so we update its state, etc.
249+
SetNetworkProperty<T>(name, value);
250+
}
251+
catch (...)
252+
{
253+
if (!PyErr_ExceptionMatches(PyExc_ValueError))
254+
throw_error_already_set();
255+
256+
PyErr_Clear();
257+
SetDatamapProperty<T>(name, value);
258+
}
259+
}
260+
261+
void SetPropertyStringArray(const char* name, const char* value)
262+
{
263+
try
264+
{
265+
// Let's first lookup a networked property so we update its state, etc.
266+
SetNetworkPropertyStringArray(name, value);
267+
}
268+
catch (...)
269+
{
270+
if (!PyErr_ExceptionMatches(PyExc_ValueError))
271+
throw_error_already_set();
272+
273+
PyErr_Clear();
274+
SetDatamapPropertyStringArray(name, value);
275+
}
276+
}
277+
209278
// KeyValue methods
210279
void GetKeyValueStringRaw(const char* szName, char* szOut, int iLength);
211280
str GetKeyValueString(const char* szName);

‎src/core/modules/entities/entities_entity_wrap.cpp‎

Lines changed: 266 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,13 @@ void export_base_entity(scope _entity)
742742
":rtype: Quaternion"
743743
);
744744

745+
BaseEntity.def("get_datamap_property_edict",
746+
&CBaseEntityWrapper::GetDatamapProperty<edict_t *>,
747+
return_by_value_policy(),
748+
"Return the value of the given data map field name.\n\n"
749+
":rtype: Edict"
750+
);
751+
745752
// Datamap setter methods
746753
BaseEntity.def("set_datamap_property_bool",
747754
&CBaseEntityWrapper::SetDatamapProperty<bool>,
@@ -843,6 +850,11 @@ void export_base_entity(scope _entity)
843850
"Set the value of the given data map field name."
844851
);
845852

853+
BaseEntity.def("set_datamap_property_edict",
854+
&CBaseEntityWrapper::SetDatamapProperty<edict_t *>,
855+
"Set the value of the given data map field name."
856+
);
857+
846858
// Network property getters
847859
BaseEntity.def("get_network_property_bool",
848860
&CBaseEntityWrapper::GetNetworkProperty<bool>,
@@ -965,6 +977,13 @@ void export_base_entity(scope _entity)
965977
":rtype: Quaternion"
966978
);
967979

980+
BaseEntity.def("get_network_property_edict",
981+
&CBaseEntityWrapper::GetNetworkProperty<edict_t *>,
982+
return_by_value_policy(),
983+
"Return the value of the given server class field name.\n\n"
984+
":rtype: Edict"
985+
);
986+
968987
// Network property setters
969988
BaseEntity.def("set_network_property_bool",
970989
&CBaseEntityWrapper::SetNetworkProperty<bool>,
@@ -1067,6 +1086,253 @@ void export_base_entity(scope _entity)
10671086
"Set the value of the given server class field name."
10681087
);
10691088

1089+
BaseEntity.def("set_network_property_edict",
1090+
&CBaseEntityWrapper::SetNetworkProperty<edict_t *>,
1091+
"Set the value of the given server class field name."
1092+
);
1093+
1094+
// Generic property getters
1095+
BaseEntity.def("get_property_bool",
1096+
&CBaseEntityWrapper::GetProperty<bool>,
1097+
"Return the value of the given field name.\n\n"
1098+
":rtype: bool"
1099+
);
1100+
1101+
BaseEntity.def("get_property_char",
1102+
&CBaseEntityWrapper::GetProperty<char>,
1103+
"Return the value of the given field name.\n\n"
1104+
":rtype: str"
1105+
);
1106+
1107+
BaseEntity.def("get_property_uchar",
1108+
&CBaseEntityWrapper::GetProperty<unsigned char>,
1109+
"Return the value of the given field name.\n\n"
1110+
":rtype: int"
1111+
);
1112+
1113+
BaseEntity.def("get_property_short",
1114+
&CBaseEntityWrapper::GetProperty<short>,
1115+
"Return the value of the given field name.\n\n"
1116+
":rtype: int"
1117+
);
1118+
1119+
BaseEntity.def("get_property_ushort",
1120+
&CBaseEntityWrapper::GetProperty<unsigned short>,
1121+
"Return the value of the given field name.\n\n"
1122+
":rtype: int"
1123+
);
1124+
1125+
BaseEntity.def("get_property_int",
1126+
&CBaseEntityWrapper::GetProperty<int>,
1127+
"Return the value of the given field name.\n\n"
1128+
":rtype: int"
1129+
);
1130+
1131+
BaseEntity.def("get_property_uint",
1132+
&CBaseEntityWrapper::GetProperty<unsigned int>,
1133+
"Return the value of the given field name.\n\n"
1134+
":rtype: int"
1135+
);
1136+
1137+
BaseEntity.def("get_property_long",
1138+
&CBaseEntityWrapper::GetProperty<long>,
1139+
"Return the value of the given field name.\n\n"
1140+
":rtype: int"
1141+
);
1142+
1143+
BaseEntity.def("get_property_ulong",
1144+
&CBaseEntityWrapper::GetProperty<unsigned long>,
1145+
"Return the value of the given field name.\n\n"
1146+
":rtype: int"
1147+
);
1148+
1149+
BaseEntity.def("get_property_long_long",
1150+
&CBaseEntityWrapper::GetProperty<long long>,
1151+
"Return the value of the given field name.\n\n"
1152+
":rtype: int"
1153+
);
1154+
1155+
BaseEntity.def("get_property_ulong_long",
1156+
&CBaseEntityWrapper::GetProperty<unsigned long long>,
1157+
"Return the value of the given field name.\n\n"
1158+
":rtype: int"
1159+
);
1160+
1161+
BaseEntity.def("get_property_float",
1162+
&CBaseEntityWrapper::GetProperty<float>,
1163+
"Return the value of the given field name.\n\n"
1164+
":rtype: float"
1165+
);
1166+
1167+
BaseEntity.def("get_property_double",
1168+
&CBaseEntityWrapper::GetProperty<double>,
1169+
"Return the value of the given field name.\n\n"
1170+
":rtype: float"
1171+
);
1172+
1173+
BaseEntity.def("get_property_string_pointer",
1174+
&CBaseEntityWrapper::GetProperty<const char*>,
1175+
"Return the value of the given field name.\n\n"
1176+
":rtype: str"
1177+
);
1178+
1179+
BaseEntity.def("get_property_string_array",
1180+
&CBaseEntityWrapper::GetPropertyStringArray,
1181+
"Return the value of the given field name.\n\n"
1182+
":rtype: str"
1183+
);
1184+
1185+
// Backward compatibility
1186+
BaseEntity.attr("get_property_string") = BaseEntity.attr("get_property_string_array");
1187+
1188+
BaseEntity.def("get_property_pointer",
1189+
&CBaseEntityWrapper::GetProperty<void*>,
1190+
return_by_value_policy(),
1191+
"Return the value of the given field name.\n\n"
1192+
":rtype: Pointer"
1193+
);
1194+
1195+
BaseEntity.def("get_property_vector",
1196+
&CBaseEntityWrapper::GetProperty<Vector>,
1197+
"Return the value of the given field name.\n\n"
1198+
":rtype: Vector"
1199+
);
1200+
1201+
BaseEntity.def("get_property_color",
1202+
&CBaseEntityWrapper::GetProperty<Color>,
1203+
"Return the value of the given field name.\n\n"
1204+
":rtype: Color"
1205+
);
1206+
1207+
BaseEntity.def("get_property_interval",
1208+
&CBaseEntityWrapper::GetProperty<interval_t>,
1209+
"Return the value of the given field name.\n\n"
1210+
":rtype: Interval"
1211+
);
1212+
1213+
BaseEntity.def("get_property_quaternion",
1214+
&CBaseEntityWrapper::GetProperty<Quaternion>,
1215+
"Return the value of the given field name.\n\n"
1216+
":rtype: Quaternion"
1217+
);
1218+
1219+
BaseEntity.def("get_property_edict",
1220+
&CBaseEntityWrapper::GetProperty<edict_t *>,
1221+
return_by_value_policy(),
1222+
"Return the value of the given field name.\n\n"
1223+
":rtype: Edict"
1224+
);
1225+
1226+
// Generic property setters
1227+
BaseEntity.def("set_property_bool",
1228+
&CBaseEntityWrapper::SetProperty<bool>,
1229+
"Set the value of the given field name."
1230+
);
1231+
1232+
BaseEntity.def("set_property_char",
1233+
&CBaseEntityWrapper::SetProperty<char>,
1234+
"Set the value of the given field name."
1235+
);
1236+
1237+
BaseEntity.def("set_property_uchar",
1238+
&CBaseEntityWrapper::SetProperty<unsigned char>,
1239+
"Set the value of the given field name."
1240+
);
1241+
1242+
BaseEntity.def("set_property_short",
1243+
&CBaseEntityWrapper::SetProperty<short>,
1244+
"Set the value of the given field name."
1245+
);
1246+
1247+
BaseEntity.def("set_property_ushort",
1248+
&CBaseEntityWrapper::SetProperty<unsigned short>,
1249+
"Set the value of the given field name."
1250+
);
1251+
1252+
BaseEntity.def("set_property_int",
1253+
&CBaseEntityWrapper::SetProperty<int>,
1254+
"Set the value of the given field name."
1255+
);
1256+
1257+
BaseEntity.def("set_property_uint",
1258+
&CBaseEntityWrapper::SetProperty<unsigned int>,
1259+
"Set the value of the given field name."
1260+
);
1261+
1262+
BaseEntity.def("set_property_long",
1263+
&CBaseEntityWrapper::SetProperty<long>,
1264+
"Set the value of the given field name."
1265+
);
1266+
1267+
BaseEntity.def("set_property_ulong",
1268+
&CBaseEntityWrapper::SetProperty<unsigned long>,
1269+
"Set the value of the given field name."
1270+
);
1271+
1272+
BaseEntity.def("set_property_long_long",
1273+
&CBaseEntityWrapper::SetProperty<long long>,
1274+
"Set the value of the given field name."
1275+
);
1276+
1277+
BaseEntity.def("set_property_ulong_long",
1278+
&CBaseEntityWrapper::SetProperty<unsigned long long>,
1279+
"Set the value of the given field name."
1280+
);
1281+
1282+
BaseEntity.def("set_property_float",
1283+
&CBaseEntityWrapper::SetProperty<float>,
1284+
"Set the value of the given field name."
1285+
);
1286+
1287+
BaseEntity.def("set_property_double",
1288+
&CBaseEntityWrapper::SetProperty<double>,
1289+
"Set the value of the given field name."
1290+
);
1291+
1292+
BaseEntity.def("set_property_string_pointer",
1293+
&CBaseEntityWrapper::SetProperty<const char*>,
1294+
"Set the value of the given field name."
1295+
);
1296+
1297+
BaseEntity.def("set_property_string_array",
1298+
&CBaseEntityWrapper::SetPropertyStringArray,
1299+
"Set the value of the given field name."
1300+
);
1301+
1302+
// Backward compatibility
1303+
BaseEntity.attr("set_property_string") = BaseEntity.attr("set_property_string_array");
1304+
1305+
BaseEntity.def("set_property_pointer",
1306+
&CBaseEntityWrapper::SetProperty<void*>,
1307+
return_by_value_policy(),
1308+
"Set the value of the given field name."
1309+
);
1310+
1311+
BaseEntity.def("set_property_vector",
1312+
&CBaseEntityWrapper::SetProperty<Vector>,
1313+
"Set the value of the given field name."
1314+
);
1315+
1316+
BaseEntity.def("set_property_color",
1317+
&CBaseEntityWrapper::SetProperty<Color>,
1318+
"Set the value of the given field name."
1319+
);
1320+
1321+
BaseEntity.def("set_property_interval",
1322+
&CBaseEntityWrapper::SetProperty<interval_t>,
1323+
"Set the value of the given field name."
1324+
);
1325+
1326+
BaseEntity.def("set_property_quaternion",
1327+
&CBaseEntityWrapper::SetProperty<Quaternion>,
1328+
"Set the value of the given field name."
1329+
);
1330+
1331+
BaseEntity.def("set_property_edict",
1332+
&CBaseEntityWrapper::SetProperty<edict_t *>,
1333+
"Set the value of the given field name."
1334+
);
1335+
10701336
// Add memory tools...
10711337
BaseEntity ADD_MEM_TOOLS_WRAPPER(CBaseEntityWrapper, CBaseEntity);
10721338

0 commit comments

Comments
 (0)