summaryrefslogtreecommitdiff
path: root/src/assemblage.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-02-08 19:22:00 +0100
committertroido <troido@protonmail.com>2020-02-08 19:22:00 +0100
commitb56add981c2f520789b97d1ee6f71dae41e8c900 (patch)
treedca7d8795c2a51f56173153c286c4dadcf8daff4 /src/assemblage.rs
parent3ebe9e6f792a0457c6f3b37b6e9d92c83f8694e2 (diff)
no templates in the world; only pre-entities
Diffstat (limited to 'src/assemblage.rs')
-rw-r--r--src/assemblage.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/assemblage.rs b/src/assemblage.rs
index 879cd3e..a4179dd 100644
--- a/src/assemblage.rs
+++ b/src/assemblage.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
use serde_json::{Value, json};
use super::componentparameter::ComponentParameter;
use super::parameter::{Parameter, ParameterType};
-use super::componentwrapper::{ComponentWrapper, ComponentType};
+use super::componentwrapper::{ComponentWrapper, ComponentType, PreEntity};
#[derive(Debug, PartialEq, Clone)]
pub struct Assemblage {
@@ -92,7 +92,7 @@ impl Assemblage {
Ok(arguments)
}
- pub fn instantiate(&self, args: &Vec<Parameter>, kwargs: &HashMap<String, Parameter>) -> Result<Vec<ComponentWrapper>, &'static str>{
+ pub fn instantiate(&self, args: &Vec<Parameter>, kwargs: &HashMap<String, Parameter>) -> Result<PreEntity, &'static str>{
let mut components: Vec<ComponentWrapper> = Vec::new();
let arguments = self.prepare_arguments(args, kwargs)?;
for (comptype, compparams) in &self.components {