1
0
Fork 0
This commit is contained in:
coaljoe 2020-09-12 20:09:31 +03:00
parent 4b9ce44766
commit 9633952cd2
5 changed files with 34 additions and 12 deletions

View File

@ -5,7 +5,7 @@ fn new_stone_bit() &Object {
//println("new_stone_bit")
mut ob := new_object()
ob.elem = bits_ctx.elem_lib["stone"]
//ob.elem = bits_ctx.elem_lib["stone"]
return ob
}

View File

@ -125,7 +125,7 @@ pub fn bits_main() {
println("new bits volume: ${ob.bits_volume()}")
println("new volume: ${ob.volume()}")
println("new elem name: ${ob.elem.name}")
//println("new elem name: ${ob.elem.name}")
//e4.generic_processor0 = gcp
@ -157,7 +157,7 @@ pub fn bits_main() {
mut ob2 := new_object()
ob2.name = "pipe" // Reinforced-concrete pipe, a 3d object
ob2.elem = e_concrete
//ob2.elem = e_concrete
println("done")
}

View File

@ -54,7 +54,8 @@ fn (mi &MaterialInfo) get_elem_name(elem_name string) &MaterialElem {
return me
}
fn (mut mi MaterialInfo) add_elem_from_size(size [3]f32, elem &Elem) {
//fn (mut mi MaterialInfo) add_elem_from_size(size [3]f32, elem &Elem) {
fn (mut mi MaterialInfo) add_elem_from_size(size []f32, elem &Elem) {
mx := size[0]
my := size[1]
mz := size[2]
@ -65,4 +66,15 @@ fn (mut mi MaterialInfo) add_elem_from_size(size [3]f32, elem &Elem) {
println("vol: $vol, vol_bits: $vol_bits")
mi.add_elem(vol_bits, elem)
}
}
fn (mi &MaterialInfo) elems_list() []&MaterialElem {
mut ret := []&MaterialElem
for k in mi.elems.keys() {
v := mi.elems[k]
ret << v
}
return ret
}

View File

@ -28,19 +28,28 @@ fn (p &Processor) process(mut o Object) {
println("processor process")
new_elem := p.out_elem
new_bits_size := int(o.bits_size * p.output_factor)
if isnil(new_elem) {
println("error: new_elem cannot be nil")
exit(2)
}
println("new_elem: ${isnil(new_elem)}")
println("new_elem: $new_elem")
println("new_bits_size: $new_bits_size")
// Process all elems
for me in o.mat_info.elems_list() {
o.elem = new_elem
o.bits_size = new_bits_size
if me.elem == p.in_elem {
println("process for ${me.elem}")
new_bits_size := int(me.bits_size * p.output_factor)
println("new_elem: ${isnil(new_elem)}")
println("new_elem: $new_elem")
println("new_bits_size: $new_bits_size")
me.elem = new_elem
me.bits_size = new_bits_size
}
}
println("done processing")
}

View File

@ -10,4 +10,5 @@ echo -n > log
#v run main.v
#v run .
#v --enable-globals -g -cg run . |& tee log
stdbuf -o 0 v --enable-globals -g -cg run . 2>&1 | tee log
#stdbuf -o 0 v --enable-globals -g -cg run . 2>&1 | tee log
unbuffer v --enable-globals -g -cg run . 2>&1 | tee log