2.0.0

* Export all lua c api functions as real functions rather than lazy cells (Get function pointers from LUA_SHARED_RAW instead..)

* Add [NOREF] [REFNIL] constants for the ref system

* Add linux/osx support to finding lua_shared ( I still have no way to test this out yet, so as of now I am assuming it works fine. Create an issue if there's problems)
* Added iface! macro to easily get access to interfaces. Updated the iengine example accordingly.

Author: vurvdev

README.md

@@ -22,19 +22,18 @@ Here's a comparison and why you could use this one.
 
 | Library                           | [rglua] | [rust-glua-sys] | [gmod-rs]   | [gmrs] |
 |-----------------------------------|---------|-----------------|-------------|--------|
-| *Full* Lua C Api Bindings         | ✔️     | ➖*             | ❌         | ❌    |
+| *Full* Lua C Api Bindings         | ✔️     | ❌              | ❌         | ❌    |
 | On Crates.io                      | ✔️     | ❌              | ✔️         | ❌    |
 | Proc Macros                       | ✔️     | ❌              | ✔️         | ✔️    |
 | Interfacing w/  Source SDK        | ✔️     | ❌              | ❌         | ❌    |
 | Returning Result<> from functions | ✔️	 | ❌              | ❌         | ✔️    |
 | Can be used on stable             | ✔️     | ✔️              | ❌         | ✔️    |
-| Real world examples               | ✔️     | ❌              | ✔️         | ❌    |
+| Real world examples               | ✔️     | ❌              | 〰️         | ❌    |
+| Linux / OSX Support               | ✔️     | ❌              | ✔️         | ✔️    |
 | Github Stars                      | 😢     | 👍              | 👑         | 🤷‍♂️    |
 
 __*You can help with that last one 😉*__
 
-\* They technically do, but they depend on autogenerated bindings which is inaccurate for gmod, leading to missing functions. (See lua_resume_real)
-
 ## Acknowledgements
 ### [garrysmod_common](https://github.com/danielga/garrysmod_common)
 This is heavily based off of garrysmod_common, in how we export the lua_shared functions and trying to replicate everything from the Lua C Api.

examples/engine/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gmod_engine"
 description = "Binary module that accesses engine.dll"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 publish = false
 
@@ -10,4 +10,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rglua = { path = "../../rglua" }
-anyhow = "1.0.51"

examples/engine/src/lib.rs

@@ -1,101 +1,69 @@
-use rglua::interface::{get_from_interface, get_interface_handle, EngineClient};
+use rglua::interface::{EngineClient};
 use rglua::prelude::*;
 
-use anyhow::bail;
-
-fn get_iface() -> anyhow::Result<&'static EngineClient> {
-	let handle = unsafe { get_interface_handle("engine.dll")? };
-	let iface = get_from_interface("VEngineClient015", handle)? as *mut EngineClient;
-	match unsafe { iface.as_ref() } {
-		Some(iface) => Ok(iface),
-		None => bail!("Failed to get interface"),
-	}
+fn get_iface() -> Option<&'static EngineClient> {
+	let iface: *mut EngineClient = iface!("engine", "VEngineClient015")?;
+	unsafe { iface.as_ref() }
 }
 
 #[lua_function]
 fn concmd(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => {
-			iface.ExecuteClientCmd( luaL_checklstring(l, 1, 0) );
-		}
-		Err(e) => printgm!(l, "{}", e)
+	if let Some(iface) = get_iface() {
+		iface.ExecuteClientCmd( luaL_checklstring(l, 1, 0) );
 	}
 	0
 }
 
 #[lua_function]
 fn get_resolution(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => unsafe {
-			let (w, h): (*mut _, *mut _) = (&mut 0, &mut 0);
-			iface.GetScreenSize(w, h);
+	if let Some(iface) = get_iface() {
+		let (w, h): (*mut _, *mut _) = (&mut 0, &mut 0);
+		iface.GetScreenSize(w, h);
+		unsafe {
 			lua_pushinteger(l, *w as isize);
 			lua_pushinteger(l, *h as isize);
-			return 2;
-		},
-		Err(e) => {
-			printgm!(l, "Failed to get interface: {}", e);
 		}
+		return 2;
 	}
 	0
 }
 
 #[lua_function]
 fn get_directory(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => {
-			let dir = iface.GetGameDirectory();
-			lua_pushstring(l, dir);
-			return 1;
-		},
-		Err(e) => {
-			printgm!(l, "Failed to get interface: {}", e);
-		}
+	if let Some(iface) = get_iface() {
+		let dir = iface.GetGameDirectory();
+		lua_pushstring(l, dir);
+		return 1;
 	}
 	0
 }
 
 #[lua_function]
 fn get_level(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => {
-			let level = iface.GetLevelName();
-			lua_pushstring(l, level);
-			return 1;
-		},
-		Err(e) => {
-			printgm!(l, "Failed to get interface: {}", e);
-		}
+	if let Some(iface) = get_iface() {
+		let level = iface.GetLevelName();
+		lua_pushstring(l, level);
+		return 1;
 	}
 	0
 }
 
 #[lua_function]
 fn is_recording(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => {
-			let demo = iface.IsRecordingDemo();
-			lua_pushboolean(l, demo as i32);
-			return 1;
-		},
-		Err(e) => {
-			printgm!(l, "Failed to get interface: {}", e);
-		}
+	if let Some(iface) = get_iface() {
+		let demo = iface.IsRecordingDemo();
+		lua_pushboolean(l, demo as i32);
+		return 1;
 	}
 	0
 }
 
 #[lua_function]
 fn is_paused(l: LuaState) -> i32 {
-	match get_iface() {
-		Ok(iface) => {
-			let paused = iface.IsPaused();
-			lua_pushboolean(l, paused as i32);
-			return 1;
-		},
-		Err(e) => {
-			printgm!(l, "Failed to get interface: {}", e);
-		}
+	if let Some(iface) = get_iface() {
+		let paused = iface.IsPaused();
+		lua_pushboolean(l, paused as i32);
+		return 1;
 	}
 	0
 }

rglua/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rglua"
 description = "Toolkit for garrysmod development with the source sdk and luajit api"
-version = "2.0.0-beta"
+version = "2.0.0"
 authors = ["Vurv <vurvdevelops@gmail.com>"]
 keywords = ["glua", "garrysmod", "lua", "gmod"]
 categories = ["api-bindings", "external-ffi-bindings", "development-tools::ffi", "game-development", "accessibility"]

rglua/src/interface/cvar.rs

@@ -10,9 +10,9 @@ pub struct ConCommandBase {
 	pub flags: c_int,               // 20
 }
 
-iface! {
+interfaces! {
 	#[version("VEngineCvar007")]
-	#[file("vstdlib.dll")]
+	#[file("vstdlib")]
 	pub abstract struct ICVar {};
 }
 

rglua/src/interface/engine.rs

@@ -3,9 +3,9 @@ use super::prelude::*;
 
 use std::os::raw::c_char;
 
-iface! {
+interfaces! {
 	#[version("VEngineClient015")]
-	#[file("engine.dll")]
+	#[file("engine")]
 	pub abstract struct EngineClient {};
 }
 

rglua/src/interface/lua/mod.rs

@@ -1,6 +1,6 @@
-pub(crate) use super::prelude::{self, iface, VTable};
+pub(crate) use super::prelude::{self, interfaces, VTable};
 
-iface! {
+interfaces! {
 	#[version("")]
 	#[file("")]
 	/// <https://github.com/danielga/garrysmod_common/blob/9981d4aaee15452a9b0f53436c1aa807f81f3fd6/include/GarrysMod/Lua/LuaObject.h#L24>

rglua/src/interface/materials.rs

@@ -1,6 +1,6 @@
 use super::prelude::*;
 
-iface! {
+interfaces! {
 	#[version("")]
 	#[file("")]
 	/// You do not get this through creating an interface, it is instead exported by other interface functions.

rglua/src/interface/mdl.rs

@@ -1,9 +1,9 @@
 use super::common::StudioHdr;
 use super::prelude::*;
 
-iface! {
+interfaces! {
 	#[version("MDLCache004")]
-	#[file("datacache.dll")]
+	#[file("datacache")]
 	pub abstract struct IMdlCache {};
 
 	#[version("")]

rglua/src/interface/mod.rs

@@ -10,7 +10,7 @@ pub(crate) mod prelude {
 	#[cfg(feature = "userdata")]
 	pub(crate) use crate::userdata::Vector;
 
-	macro_rules! iface {
+	macro_rules! interfaces {
 		(
 			#[ version ( $ver:literal ) ]
 			#[ file ( $file:literal ) ]
@@ -24,12 +24,12 @@ pub(crate) mod prelude {
 			$vis struct $iface {
 				pub vtable: usize
 			}
-			iface!( $($rest)* );
+			interfaces!( $($rest)* );
 		};
 		() => ();
 	}
 
-	pub(crate) use iface;
+	pub(crate) use interfaces;
 }
 
 mod common;
@@ -70,9 +70,9 @@ pub type CreateInterfaceFn =
 /// ```
 pub unsafe fn get_interface_handle(file: &str) -> Result<CreateInterfaceFn, libloading::Error> {
 	let lib = Library::new(file)?;
-	let sym: Symbol<CreateInterfaceFn> = lib.get(b"CreateInterface\0")?;
+	let sym: Symbol<CreateInterfaceFn> = lib.get(b"CreateInterface\0".as_ref())?;
 
-	Ok(std::mem::transmute(sym))
+	Ok(*sym)
 }
 
 use thiserror::Error;
@@ -124,7 +124,6 @@ pub fn get_from_interface(
 	let mut status = 0;
 
 	let iface = try_cstr!(iface)?;
-
 	let result = factory(iface.as_ptr(), &mut status);
 
 	if status == 0 && !result.is_null() {