split out rbxasset

src/lib.rs

@@ -7,6 +7,9 @@ mod roblox;
 #[cfg(feature="source")]
 mod source;
 
+#[cfg(any(feature="roblox",feature="legacy"))]
+pub mod rbxassetid;
+
 pub mod texture;
 #[cfg(any(feature="source",feature="legacy"))]
 pub mod valve_mesh;

src/rbxassetid.rs

@@ -0,0 +1,34 @@
+#[derive(Hash,Eq,PartialEq)]
+pub struct RobloxAssetId(pub u64);
+#[derive(Debug)]
+#[allow(dead_code)]
+pub enum RobloxAssetIdParseErr{
+	Url(url::ParseError),
+	UnknownScheme(String),
+	ParseInt(std::num::ParseIntError),
+	MissingAssetId(String),
+}
+impl std::str::FromStr for RobloxAssetId{
+	type Err=RobloxAssetIdParseErr;
+	fn from_str(s:&str)->Result<Self,Self::Err>{
+		let url=url::Url::parse(s).map_err(RobloxAssetIdParseErr::Url)?;
+		let parsed_asset_id=match url.scheme(){
+			"rbxassetid"=>url.domain().ok_or_else(||RobloxAssetIdParseErr::MissingAssetId(s.to_owned()))?.parse(),
+			"http"|"https"=>{
+				let (_,asset_id)=url.query_pairs()
+				.find(|(id,_)|
+					id.to_lowercase()=="id"
+				).ok_or_else(||RobloxAssetIdParseErr::MissingAssetId(s.to_owned()))?;
+				asset_id.parse()
+			},
+			_=>Err(RobloxAssetIdParseErr::UnknownScheme(s.to_owned()))?,
+		};
+		Ok(Self(parsed_asset_id.map_err(RobloxAssetIdParseErr::ParseInt)?))
+	}
+}
+impl std::fmt::Display for RobloxAssetIdParseErr{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for RobloxAssetIdParseErr{}

src/roblox_legacy.rs

@@ -3,41 +3,7 @@ use std::collections::HashMap;
 use crate::roblox_mesh;
 use crate::texture::{RenderConfigs,Texture};
 use strafesnet_common::model::{MeshId,RenderConfig,RenderConfigId,TextureId};
-
+use crate::rbxassetid::RobloxAssetId;
-#[derive(Hash,Eq,PartialEq)]
-struct RobloxAssetId(u64);
-#[derive(Debug)]
-#[allow(dead_code)]
-pub enum RobloxAssetIdParseErr{
-	Url(url::ParseError),
-	UnknownScheme(String),
-	ParseInt(std::num::ParseIntError),
-	MissingAssetId(String),
-}
-impl std::str::FromStr for RobloxAssetId{
-	type Err=RobloxAssetIdParseErr;
-	fn from_str(s:&str)->Result<Self,Self::Err>{
-		let url=url::Url::parse(s).map_err(RobloxAssetIdParseErr::Url)?;
-		let parsed_asset_id=match url.scheme(){
-			"rbxassetid"=>url.domain().ok_or_else(||RobloxAssetIdParseErr::MissingAssetId(s.to_owned()))?.parse(),
-			"http"|"https"=>{
-				let (_,asset_id)=url.query_pairs()
-				.find(|(id,_)|
-					id.to_lowercase()=="id"
-				).ok_or_else(||RobloxAssetIdParseErr::MissingAssetId(s.to_owned()))?;
-				asset_id.parse()
-			},
-			_=>Err(RobloxAssetIdParseErr::UnknownScheme(s.to_owned()))?,
-		};
-		Ok(Self(parsed_asset_id.map_err(RobloxAssetIdParseErr::ParseInt)?))
-	}
-}
-impl std::fmt::Display for RobloxAssetIdParseErr{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for RobloxAssetIdParseErr{}
 
 #[derive(Default)]
 pub struct RenderConfigLoader{