Changeset 288
- Timestamp:
- 01/06/15 01:47:03 (10 years ago)
- Location:
- cpp/frams
- Files:
-
- 4 edited
- 12 moved
-
Makefile-SDK (moved) (moved from cpp/frams/Makefile-GDK) (2 diffs)
-
Makefile-SDK-files (moved) (moved from cpp/frams/Makefile-GDK-files) (1 diff)
-
_demos/genomanipulation.cpp (moved) (moved from cpp/frams/_demos/gdk_test.cpp) (3 diffs)
-
_demos/neuro_test.cpp (modified) (1 diff)
-
config/f0-SDK.def (moved) (moved from cpp/frams/config/f0-GDK.def)
-
config/sdk_build_config.h (moved) (moved from cpp/frams/config/gdk_build_config.h) (2 diffs)
-
genetics/gen-config-SDK.h (moved) (moved from cpp/frams/genetics/gen-config-GDK.h)
-
model/defassign-f0-SDK.h (moved) (moved from cpp/frams/model/defassign-f0-GDK.h)
-
model/f0-SDK-classes.h (moved) (moved from cpp/frams/model/f0-GDK-classes.h)
-
model/modelparts.cpp (modified) (2 diffs)
-
neuro/impl/neuroimpl-body-sdk.h (moved) (moved from cpp/frams/neuro/impl/neuroimpl-body-gdk.h)
-
neuro/neurocls-f0-SDK-factory.h (moved) (moved from cpp/frams/neuro/neurocls-f0-GDK-factory.h)
-
neuro/neurocls-f0-SDK-library.h (moved) (moved from cpp/frams/neuro/neurocls-f0-GDK-library.h)
-
neuro/neuroimpl.cpp (modified) (7 diffs)
-
neuro/neuroimplfiles-SDK.h (moved) (moved from cpp/frams/neuro/neuroimplfiles-GDK.h) (1 diff)
-
param/syntparam.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/Makefile-SDK
r269 r288 1 1 # 2 # Framsticks GDK makefile2 # Framsticks SDK makefile 3 3 # 4 4 5 include frams/Makefile- GDK-files5 include frams/Makefile-SDK-files 6 6 7 GDK_TESTS=genoconv_test gdk_testgeno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test7 SDK_TESTS=genoconv_test genomanipulation geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test 8 8 9 gdk_tests: $(GDK_TESTS)9 sdk_tests: $(SDK_TESTS) 10 10 11 GDK_BUILD_CONFIG= -include frams/config/gdk_build_config.h12 CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $( GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g11 SDK_BUILD_CONFIG= -include frams/config/sdk_build_config.h 12 CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(SDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g 13 13 14 14 ############################################# 15 15 16 g dk_test: $(GDK_TEST_OBJS)17 $(CXX) $(G DK_TEST_OBJS) $(LDFLAGS) -o $@16 genomanipulation: $(GENOMANIPULATION_OBJS) 17 $(CXX) $(GENOMANIPULATION_OBJS) $(LDFLAGS) -o $@ 18 18 19 19 genoconv_test: $(GENOCONV_TEST_OBJS) … … 71 71 ############################################# 72 72 73 ALL_OBJS=$(G DK_TEST_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS)73 ALL_OBJS=$(GENOMANIPULATION_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS) 74 74 75 75 include frams/Makefile-maintain 76 76 77 77 full_clean: clean 78 rm -f $( GDK_TESTS)78 rm -f $(SDK_TESTS) -
cpp/frams/Makefile-SDK-files
r269 r288 14 14 CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o 15 15 16 GENOCONV_ GDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)17 GENMAN_ GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)16 GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) 17 GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT) 18 18 19 19 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o 20 20 21 GDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o21 SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o 22 22 23 23 GEOMETRY_OBJS=frams/model/geometry/meshbuilder.o frams/model/geometry/modelgeometryinfo.o frams/model/geometry/geometryutils.o 24 24 25 #### gdk_tests25 #### sdk_tests 26 26 27 G DK_TEST_OBJS= frams/_demos/gdk_test.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)27 GENOMANIPULATION_OBJS= frams/_demos/genomanipulation.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 28 28 29 MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)29 MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 30 30 31 F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS)31 F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) 32 32 33 LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS)33 LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) 34 34 35 GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS)35 GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) 36 36 37 GENO_TEST_OBJS= frams/_demos/geno_test.o frams/virtfile/virtfile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)37 GENO_TEST_OBJS= frams/_demos/geno_test.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 38 38 39 GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)39 GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 40 40 41 GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o frams/virtfile/virtfile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS) $(GENMAN_FT)41 GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) $(GENMAN_FT) 42 42 43 43 NEURO_TEST_OBJS= frams/_demos/neuro_test.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o \ 44 44 frams/neuro/neuroimpl.o frams/neuro/neurofactory.o frams/neuro/impl/neuroimpl-simple.o frams/neuro/impl/neuroimpl-channels.o \ 45 frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)45 frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 46 46 47 FULL_PROPS_OBJS= frams/_demos/full_props.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)47 FULL_PROPS_OBJS= frams/_demos/full_props.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 48 48 49 SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)49 SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) 50 50 51 SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS)51 SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) 52 52 53 PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS)53 PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) 54 54 55 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o55 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o 56 56 57 GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)57 GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS) 58 58 59 GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)59 GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS) 60 60 61 GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)61 GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS) 62 62 63 GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $( GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)63 GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS) -
cpp/frams/_demos/genomanipulation.cpp
r287 r288 22 22 void printNiceBanner(const char* title) 23 23 { 24 printf(" ######################################## \n"25 " ## ##\n"26 " ## %-3 2s ##\n"27 " ## ##\n"28 " ######################################## \n",title);24 printf(" #############################################\n" 25 " ## ##\n" 26 " ## %-37s ##\n" 27 " ## ##\n" 28 " #############################################\n",title); 29 29 } 30 30 void printProperties(Param &pi) … … 268 268 { 269 269 srand(time(0)); 270 printNiceBanner("Welcome to Genotype manipulation test application!");270 printNiceBanner("Welcome to Genotype Manipulation App!"); 271 271 272 272 findingConverters(); … … 347 347 printf("\n######### THE END ###########\n\n" 348 348 "Hints:\n" 349 " 1. You can redirect output: g dk_test>filename.txt\n"349 " 1. You can redirect output: genomanipulation >filename.txt\n" 350 350 " 2. Each run can yield different results, because some\n" 351 351 " values are randomly generated.\n" 352 352 " 3. This application will use custom genotype passed as\n" 353 " a commandline parameter: g dk_testXX\n"353 " a commandline parameter: genomanipulation XX\n" 354 354 "\n"); 355 355 return 0; -
cpp/frams/_demos/neuro_test.cpp
r286 r288 16 16 */ 17 17 18 #ifndef GDK_WITHOUT_FRAMS18 #ifndef SDK_WITHOUT_FRAMS 19 19 #include <frams/mech/creatmechobj.h> 20 20 int CreatMechObject::modeltags_id=0; -
cpp/frams/config/sdk_build_config.h
r286 r288 3 3 // See LICENSE.txt for details. 4 4 5 #ifndef _ GDK_BUILD_CONFIG_H_6 #define _ GDK_BUILD_CONFIG_H_5 #ifndef _SDK_BUILD_CONFIG_H_ 6 #define _SDK_BUILD_CONFIG_H_ 7 7 8 8 #include "version.h" … … 10 10 #define NOCREATUREOBJECT 11 11 #define EASYMAPDEBUG 12 #define GDK_WITHOUT_FRAMS12 #define SDK_WITHOUT_FRAMS 13 13 #define NO_BARRIER 14 14 #define NO_VMACHINE 15 15 16 #define NEURO_IMPL_FILES "neuroimplfiles- GDK.h"17 #define NEURO_CLS_FACTORY "neurocls-f0- GDK-factory.h"18 #define NEURO_CLS_LIBRARY "neurocls-f0- GDK-library.h"19 #define F0_DEFASSIGN_FILE "defassign-f0- GDK.h"20 #define F0_CLASSES_FILE "f0- GDK-classes.h"21 #define GEN_CONFIG_FILE "gen-config- GDK.h"16 #define NEURO_IMPL_FILES "neuroimplfiles-SDK.h" 17 #define NEURO_CLS_FACTORY "neurocls-f0-SDK-factory.h" 18 #define NEURO_CLS_LIBRARY "neurocls-f0-SDK-library.h" 19 #define F0_DEFASSIGN_FILE "defassign-f0-SDK.h" 20 #define F0_CLASSES_FILE "f0-SDK-classes.h" 21 #define GEN_CONFIG_FILE "gen-config-SDK.h" 22 22 23 23 #endif -
cpp/frams/model/modelparts.cpp
r286 r288 25 25 #include F0_DEFASSIGN_FILE 26 26 27 #ifndef GDK_WITHOUT_FRAMS27 #ifndef SDK_WITHOUT_FRAMS 28 28 #include <frams/neuro/neuroclsobject.h> 29 29 #endif … … 539 539 void Neuro::get_classObject(PARAMGETARGS) 540 540 { 541 #ifndef GDK_WITHOUT_FRAMS541 #ifndef SDK_WITHOUT_FRAMS 542 542 NeuroClassExt::makeStaticObject(ret,getClass()); 543 543 #endif -
cpp/frams/neuro/neuroimpl.cpp
r286 r288 7 7 #include <frams/util/rndutil.h> 8 8 #include <common/nonstd_math.h> 9 #ifndef GDK_WITHOUT_FRAMS9 #ifndef SDK_WITHOUT_FRAMS 10 10 #include <frams/simul/creature.h> 11 11 #include <frams/mech/creatmechobj.h> … … 463 463 Creature* NeuroImpl::getCreature() 464 464 { 465 #ifndef GDK_WITHOUT_FRAMS465 #ifndef SDK_WITHOUT_FRAMS 466 466 CreatMechObject *cmo=(CreatMechObject *)neuro->owner->userdata[CreatMechObject::modeltags_id]; 467 467 return cmo->creature; … … 473 473 void NeuroImpl::get_creature(ExtValue *ret) 474 474 { 475 #ifndef GDK_WITHOUT_FRAMS475 #ifndef SDK_WITHOUT_FRAMS 476 476 ret->setObject(ExtObject(&creature_param,getCreature())); 477 477 #endif … … 480 480 void NeuroImpl::get_part(ExtValue *ret) 481 481 { 482 #ifndef GDK_WITHOUT_FRAMS482 #ifndef SDK_WITHOUT_FRAMS 483 483 Part *pa; 484 484 if (pa=neuro->getPart()) … … 491 491 void NeuroImpl::get_joint(ExtValue *ret) 492 492 { 493 #ifndef GDK_WITHOUT_FRAMS493 #ifndef SDK_WITHOUT_FRAMS 494 494 Joint *jo; 495 495 if (jo=neuro->getJoint()) … … 502 502 bool NeuroImpl::getPosition(Pt3D &pos) 503 503 { 504 #ifndef GDK_WITHOUT_FRAMS504 #ifndef SDK_WITHOUT_FRAMS 505 505 Part *pa; Joint *jo; 506 506 if (pa=neuro->getPart()) … … 548 548 void NeuroImpl::get_classObject(ExtValue *ret) 549 549 { 550 #ifndef GDK_WITHOUT_FRAMS550 #ifndef SDK_WITHOUT_FRAMS 551 551 NeuroClassExt::makeStaticObject(ret,neuroclass); 552 552 #endif -
cpp/frams/neuro/neuroimplfiles-SDK.h
r286 r288 6 6 #include "impl/neuroimpl-channels.h" 7 7 #include "impl/neuroimpl-fuzzy.h" 8 #ifdef GDK_WITHOUT_FRAMS9 #include "impl/neuroimpl-body- gdk.h"8 #ifdef SDK_WITHOUT_FRAMS 9 #include "impl/neuroimpl-body-sdk.h" 10 10 #else 11 11 #include "impl/neuroimpl-test.h" -
cpp/frams/param/syntparam.h
r286 r288 15 15 on Models and Genotypes). 16 16 17 See also: g dktest.cpp17 See also: genomanipulation.cpp 18 18 */ 19 19 class SyntParam: public Param
Note: See TracChangeset
for help on using the changeset viewer.
