Changeset 80 for cpp/gdk/conv_f1.cpp

Timestamp:

02/08/13 03:22:37 (12 years ago)

Author:

Maciej Komosinski

Message:

• new properties in Parts and Joints: visual red, green, blue, thickness
• updated list of Neurons and their properties

File:

• cpp/gdk/conv_f1.cpp (modified) (6 diffs)

cpp/gdk/conv_f1.cpp

@@ -4 +4 @@
 
 #include "conv_f1.h"
-#include "nonstd.h"
+#include "nonstd_stl.h"
 #include "framsg.h"
 #include "multirange.h"
@@ -12 +12 @@
 //#define v1f1COMPATIBLE
 
-F1Props stdprops={1, 0, 1, 0.4, 0.25, 0.25, 0.25, 0.25, 0.0, 1.0, 1.0, 1 };
+F1Props stdprops={1, 0, 1, 0.4, 0.25, 0.25, 0.25, 0.25, 0.0, 1.0, 1.0, 1,
+                 0.2, 0.5,0.5,0.5 };
 
 class Builder
@@ -141 +142 @@
         case 'E': c.energ+=(10.0-c.energ)*0.1;  break;
         case 'e': c.energ-=c.energ*0.1;         break;
+
+        case 'D': c.cred+=(1.0-c.cred)*0.25;break;
+        case 'd': c.cred+=(0.0-c.cred)*0.25;break;
+        case 'G': c.cgreen+=(1.0-c.cgreen)*0.25;break;
+        case 'g': c.cgreen+=(0.0-c.cgreen)*0.25;break;
+        case 'B': c.cblue+=(1.0-c.cblue)*0.25;break;
+        case 'b': c.cblue+=(0.0-c.cblue)*0.25;break;
+        case 'H': c.grub+=(0.7-c.grub)*0.25;break;
+        case 'h': c.grub+=(0.05-c.grub)*0.25;break;
+
         case '[': //neuron
 //              setdebug(g-(char*)geny,DEBUGNEURO | !l_neu);
@@ -181 +192 @@
                 // oslabianie cech wzdluz struktury
                 c.dlug=0.5*c.dlug+0.5*stdprops.dlug;
+                c.grub=0.5*c.grub+0.5*stdprops.grub;
                 c.skr=0.66*c.skr;
                 c.rot=0.66*c.rot;
@@ -251 +263 @@
 {
 double len=min(2.0,c.dlug);
-sprintf(tmp,"j:p1=%ld,p2=%ld,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg",
-        part1,part2,len,angle.x,angle.y,angle.z,c.odpor);
+sprintf(tmp,"j:p1=%ld,p2=%ld,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
+        part1,part2,len,angle.x,angle.y,angle.z,c.odpor, c.cred,c.cgreen,c.cblue);
 lastjoint_muscle_power=c.ruch;
 return model.singleStepBuild(tmp,makeRange(g));
@@ -259 +271 @@
 int Builder::growPart(F1Props &c,const char *g)
 {
-sprintf(tmp,"p:m=1,dn=%lg,fr=%lg,ing=%lg,as=%lg",
-        1.0/c.masa,c.tarcie,c.wchl,c.asym);
+sprintf(tmp,"p:m=1,dn=%lg,fr=%lg,ing=%lg,as=%lg,vs=%g,vr=%g,vg=%g,vb=%g",
+        1.0/c.masa,c.tarcie,c.wchl,c.asym, c.grub, c.cred,c.cgreen,c.cblue);
 return model.singleStepBuild(tmp,makeRange(g));
 }