3.0.0-beta2

Add more bindings, make use of new viable #[skip] option, remove derive_more as a dependency (bloat)

Author: vurvdev

examples/interfaces/src/lib.rs

@@ -1,5 +1,5 @@
 use rglua::prelude::*;
-use rglua::interface;
+use rglua::interface::{self, NetChannel, CNetChan};
 
 #[lua_function]
 fn reload_textures(_l: LuaState) -> Result<i32, interface::Error> {
@@ -9,6 +9,22 @@ fn reload_textures(_l: LuaState) -> Result<i32, interface::Error> {
 	Ok(0)
 }
 
+#[lua_function]
+fn disconnect(l: LuaState) -> Result<i32, interface::Error> {
+	let msg = luaL_checkstring(l, 1);
+	let engine = iface!(EngineClient)?;
+
+	let chan = engine.GetNetChannelInfo() as *mut CNetChan;
+	let chan = unsafe { chan.as_mut() }
+		.ok_or(interface::Error::AsMut)?;
+
+	printgm!(l, "{:?}", try_rstr!(chan.GetAddress()));
+
+	chan.Clear();
+	chan.Shutdown(msg);
+	return Ok(0);
+}
+
 #[gmod_open]
 fn open(l: LuaState) -> Result<i32, interface::Error> {
 	// Access the lua state when you aren't directly given it.
@@ -21,7 +37,8 @@ fn open(l: LuaState) -> Result<i32, interface::Error> {
 	printgm!(client.base as _, "Hello from ILuaShared!");
 
 	let lib = reg! [
-		"reloadTextures" => reload_textures
+		"reloadTextures" => reload_textures,
+		"disconnect" => disconnect
 	];
 
 	luaL_register(l, cstr!("interfaces"), lib.as_ptr());

rglua/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rglua"
 description = "Toolkit for garrysmod development with the source sdk and luajit api"
-version = "3.0.0-beta"
+version = "3.0.0-beta2"
 authors = ["Vurv <[email protected]>"]
 keywords = ["glua", "garrysmod", "lua", "gmod"]
 categories = ["api-bindings", "external-ffi-bindings", "development-tools::ffi", "game-development", "accessibility"]
@@ -18,12 +18,9 @@ once_cell = "1.8.0"
 thiserror = "1.0.30"
 
 rglua-macros = { version = "0.2.0", path = "../rglua-macros" }
-derive_more = { version = "0.99.17", optional = true }
 
-viable = { version = "0.1", optional = true }
+viable = { version = "0.2", optional = true }
 
 [features]
-default = ["interfaces", "userdata"]
-
-interfaces = ["viable"]
-userdata = ["derive_more"]
+default = ["interfaces"]
+interfaces = ["viable"]

rglua/src/interface/client/mod.rs

@@ -0,0 +1,49 @@
+use super::{prelude::*, net::{NetChannelHandler, NetChannel, NetMessage}};
+#[vtable]
+/// Client retrieved from Server interface.
+pub struct Client {
+	base: *mut *mut NetChannelHandler,
+
+	#[skip(1)] // Skip destructor
+	Connect: extern "C" fn(name: *const c_char, userid: c_int, chan: *mut NetChannel, fakeply: bool, challenge: c_int) -> bool,
+	Inactivate: extern "C" fn(),
+	Reconnect: extern "C" fn(),
+
+	// Variadics don't work so..
+	Disconnect: extern "C" fn(reason: *const c_char, ...),
+	GetPlayerSlot: extern "C" fn() -> c_int,
+	GetUserID: extern "C" fn() -> c_int,
+	// GetNetworkID: extern "C" fn() -> UserID,
+
+	#[skip(1)]
+	GetClientName: extern "C" fn() -> *const c_char,
+	GetNetChannel: extern "C" fn() -> *mut NetChannel,
+	// GetServer: extern "C" fn() -> *mut Server,
+
+	#[skip(1)]
+	GetUserSetting: extern "C" fn(cvar: *const c_char) -> *const c_char,
+	GetNetworkIDString: extern "C" fn() -> *const c_char,
+
+	SetRate: extern "C" fn(rate: c_int, force: bool),
+	GetRate: extern "C" fn() -> c_int,
+
+	SetUpdateRate: extern "C" fn(rate: c_int, force: bool),
+	GetUpdateRate: extern "C" fn() -> c_int,
+
+	Clear: extern "C" fn(),
+	GetMaxAckTickCount: extern "C" fn() -> c_int,
+	ExecuteStringCommand: extern "C" fn(command: *const c_char) -> bool,
+	SendNetMsg: extern "C" fn(msg: &mut NetMessage, force_reliable: bool),
+	ClientPrint: extern "C" fn(msg: *const c_char, ...),
+	IsConnected: extern "C" fn() -> bool,
+	IsSpawned: extern "C" fn() -> bool,
+	IsActive: extern "C" fn() -> bool,
+	IsFakeClient: extern "C" fn() -> bool,
+	IsHLTV: extern "C" fn() -> bool,
+
+	// IsReplay ?
+
+	IsHearingClient: extern "C" fn(id: c_int) -> bool,
+	IsProximityHearingClient: extern "C" fn(id: c_int) -> bool,
+	SetMaxRoutablePayloadSize: extern "C" fn(size: c_int),
+}

rglua/src/interface/common.rs

@@ -175,3 +175,10 @@ impl ButtonCode {
 	pub const KeyLAST: Self = Self::KeySCROLLLOCKTOGGLE;
 	pub const KeyCOUNT: i32 = (Self::KeyLAST as i32 - Self::KeyFIRST as i32 + 1);
 }
+
+#[repr(C)]
+pub enum SkyboxVisibility {
+	NotVisible,
+	Visible3D,
+	Visible2D
+}

rglua/src/interface/engine/client.rs

@@ -1,3 +1,4 @@
+use crate::interface::common::SkyboxVisibility;
 use crate::interface::{MaterialSystem, NetChannelInfo};
 
 use super::common::ButtonCode;
@@ -33,10 +34,10 @@ pub struct ClientTextMessage {
 #[vtable]
 pub struct EngineClient {
 	#[offset(1)]
-	#[cfg(feature = "userdata")]
+	
 	pub GetLightForPoint: extern "C" fn(pos: &Vector, bClamp: bool) -> Vector,
 
-	#[cfg(feature = "userdata")]
+	
 	pub TraceLineMaterialAndLighting: extern "C" fn(
 		start: &Vector,
 		end: &Vector,
@@ -114,35 +115,47 @@ pub struct EngineClient {
 	pub SaveAllocMemory: extern "C" fn(num: usize, size: usize) -> *mut c_void,
 	pub SaveFreeMemory: extern "C" fn(pSaveMem: *mut c_void),
 
-	#[offset(72)]
+	#[check(72)]
 	pub GetNetChannelInfo: extern "C" fn() -> *mut NetChannelInfo,
-
-	#[offset(76)]
+	#[skip(1)]
+	pub CheckPoint: extern "C" fn(pname: *const c_char),
+	pub DrawPortals: extern "C" fn(),
+	#[check(76)]
 	pub IsPlayingDemo: extern "C" fn() -> bool,
 	pub IsRecordingDemo: extern "C" fn() -> bool,
-
-	#[offset(84)]
+	pub IsPlayingTimeDemo: extern "C" fn() -> bool,
+	pub GetDemoRecordingTick: extern "C" fn() -> c_int,
+	pub GetDemoPlaybackTick: extern "C" fn() -> c_int,
+	pub GetDemoPlaybackStartTick: extern "C" fn() -> c_int,
+	pub GetDemoPlaybackTimeScale: extern "C" fn() -> c_float,
+	pub GetDemoPlaybackTotalTicks: extern "C" fn() -> c_int,
+	#[check(84)]
 	pub IsPaused: extern "C" fn() -> bool,
 	pub IsTakingScreenshot: extern "C" fn() -> bool,
 	pub IsHLTV: extern "C" fn() -> bool,
 	pub IsLevelMainMenuBackground: extern "C" fn() -> bool,
 	pub GetMainMenuBackgroundName: extern "C" fn(dest: *mut c_char, destlen: c_int),
 
-	#[offset(91)]
+	#[skip(2)]
+	#[check(91)]
 	pub GetUILanguage: extern "C" fn(dest: *mut c_char, destlen: c_int),
-
-	#[offset(94)]
+	pub IsSkyboxVisibleFromPoint: extern "C" fn(vecPoint: &Vector) -> SkyboxVisibility,
+	pub GetMapEntitiesString: extern "C" fn() -> *const c_char,
 	pub IsInEditMode: extern "C" fn() -> bool,
 	pub GetScreenAspectRatio: extern "C" fn() -> c_float,
 
-	#[offset(101)]
+	#[skip(2)]
+	pub GetEngineBuildNumber: extern "C" fn() -> c_uint,
+	pub GetProductVersionString: extern "C" fn() -> *const c_char,
+	pub GrabPreColorCorrectedFrame: extern "C" fn(x: c_int, y: c_int, width: c_int, height: c_int),
+	#[check(101)]
 	pub IsHammerRunning: extern "C" fn() -> bool,
 	/// This is NOT checked against the FCVAR_CLIENTCMD_CAN_EXECUTE vars
 	pub ExecuteClientCmd: extern "C" fn(cmd: *const c_char),
 	pub MapHasHDRLighting: extern "C" fn() -> bool,
 	pub GetAppID: extern "C" fn() -> c_int,
 
-	#[cfg(feature = "userdata")]
+	
 	pub GetLightForPointFast: extern "C" fn(pos: &Vector, bClamp: bool) -> Vector,
 
 	#[offset(106)]

rglua/src/interface/lua/shared.rs

@@ -4,7 +4,7 @@ use super::prelude::*;
 /// This doesn't work on x86. =(
 #[vtable]
 pub struct LuaShared {
-	#[offset(2)] // 2
+	#[skip(2)] // ~LuaShared, Init
 	pub Shutdown: extern "C" fn(),
 	pub DumpStats: extern "C" fn(),
 	pub CreateLuaInterface: extern "C" fn(realm: c_uchar, b: bool) -> *mut LuaInterface,
@@ -14,10 +14,14 @@ pub struct LuaShared {
 	/// 1 - Server
 	/// 2 - Menu
 	pub GetLuaInterface: extern "C" fn(realm: c_uchar) -> *mut LuaInterface,
-
-	#[offset(9)]
+	#[skip(2)] // LoadFile, GetCache
 	pub MountLua: extern "C" fn(l: *const c_char),
 	pub MountLuaAdd: extern "C" fn(l: *const c_char, l2: *const c_char),
 	pub UnMountLua: extern "C" fn(l: *const c_char),
-	pub SetFileContents: extern "C" fn(l: *const c_char, c: *const c_char)
+	pub SetFileContents: extern "C" fn(l: *const c_char, c: *const c_char),
+	pub SetLuaFindHook: extern "C" fn(p: *mut c_void),
+	#[skip(1)] // FindScripts
+	pub GetStackTraces: extern "C" fn() -> *const c_char,
+	#[skip(1)] // InvalidateCache
+	pub EmptyCache: extern "C" fn(),
 }

rglua/src/interface/materials.rs

@@ -12,7 +12,7 @@ pub struct Material {
 	pub IsAlphaTested: extern "C" fn() -> bool,
 	pub IsVertexLit: extern "C" fn() -> bool,
 
-	#[cfg(feature = "userdata")]
+	
 	#[offset(31)]
 	pub GetReflectivity: extern "C" fn(reflect: &mut Vector),
 

rglua/src/interface/mod.rs

@@ -7,8 +7,6 @@ pub(crate) mod prelude {
 	pub(crate) use std::os::raw::{
 		c_char, c_double, c_float, c_int, c_long, c_uchar, c_uint, c_ushort, c_void
 	};
-
-	#[cfg(feature = "userdata")]
 	pub(crate) use crate::userdata::Vector;
 }
 
@@ -20,14 +18,16 @@ mod materials;
 mod mdl;
 mod net;
 mod panel;
+mod client;
 
 pub use cvar::{CVar, ConVar};
 pub use engine::{EngineClient, EngineServer};
 pub use lua::{LuaInterface, LuaObject, LuaShared};
 pub use materials::MaterialSystem;
 pub use mdl::{MdlCache, MdlCacheNotify};
-pub use net::NetChannelInfo;
+pub use net::{NetChannelInfo, NetChannel, NetChannelHandler, NetMessage, CNetChan};
 pub use panel::Panel;
+pub use client::Client;
 
 use crate::try_cstr;
 use libloading::{Library, Symbol};