Skip to content
This repository has been archived by the owner on Dec 3, 2023. It is now read-only.

Commit

Permalink
Use Atlas 0.7.
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikogenvik
erikogenvik committed Jun 4, 2015
1 parent 84bee5a commit d3b9d17
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 55 deletions.
12 changes: 6 additions & 6 deletions aiclient/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ CLIENT_LIBS = \
/usr/lib/libskstream-0.3.a \
/usr/lib/libvarconf-1.0.a \
/usr/lib/libwfmath-0.3.a \
/usr/lib/libAtlasObjects-0.6.a \
/usr/lib/libAtlasNet-0.6.a \
/usr/lib/libAtlasCodecs-0.6.a \
/usr/lib/libAtlasFilters-0.6.a \
/usr/lib/libAtlasMessage-0.6.a \
/usr/lib/libAtlas-0.6.a \
/usr/lib/libAtlasObjects-0.7.a \
/usr/lib/libAtlasNet-0.7.a \
/usr/lib/libAtlasCodecs-0.7.a \
/usr/lib/libAtlasFilters-0.7.a \
/usr/lib/libAtlasMessage-0.7.a \
/usr/lib/libAtlas-0.7.a \
/usr/lib/libsigc-2.0.a \
$(PYTHON_LIBS) \
/usr/lib/libutil.a \
Expand Down
12 changes: 6 additions & 6 deletions client/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ CLIENT_LIBS = \
/usr/lib/libmercator-0.2.a \
/usr/lib/libvarconf-1.0.a \
/usr/lib/libwfmath-0.3.a \
/usr/lib/libAtlasObjects-0.6.a \
/usr/lib/libAtlasNet-0.6.a \
/usr/lib/libAtlasCodecs-0.6.a \
/usr/lib/libAtlasFilters-0.6.a \
/usr/lib/libAtlasMessage-0.6.a \
/usr/lib/libAtlas-0.6.a \
/usr/lib/libAtlasObjects-0.7.a \
/usr/lib/libAtlasNet-0.7.a \
/usr/lib/libAtlasCodecs-0.7.a \
/usr/lib/libAtlasFilters-0.7.a \
/usr/lib/libAtlasMessage-0.7.a \
/usr/lib/libAtlas-0.7.a \
/usr/lib/libsigc-2.0.a \
$(PYTHON_LIBS) \
/usr/lib/libutil.a \
Expand Down
43 changes: 21 additions & 22 deletions common/custom.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,69 +28,68 @@ void installCustomOperations()
Atlas::Objects::Factories * atlas_factories = Atlas::Objects::Factories::instance();

i.addChild(atlasOpDefinition("add", "set"));
Atlas::Objects::Operation::ADD_NO = atlas_factories->addFactory("add", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::ADD_NO = atlas_factories->addFactory("add", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("burn", "affect"));
Atlas::Objects::Operation::BURN_NO = atlas_factories->addFactory("burn", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::BURN_NO = atlas_factories->addFactory("burn", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("connect", "set"));
Atlas::Objects::Operation::CONNECT_NO = atlas_factories->addFactory("connect", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::CONNECT_NO = atlas_factories->addFactory("connect", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("eat", "action"));
Atlas::Objects::Operation::EAT_NO = atlas_factories->addFactory("eat", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::EAT_NO = atlas_factories->addFactory("eat", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("monitor", "set"));
Atlas::Objects::Operation::MONITOR_NO = atlas_factories->addFactory("monitor", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::MONITOR_NO = atlas_factories->addFactory("monitor", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("nourish", "affect"));
Atlas::Objects::Operation::NOURISH_NO = atlas_factories->addFactory("nourish", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::NOURISH_NO = atlas_factories->addFactory("nourish", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("setup", "root_operation"));
Atlas::Objects::Operation::SETUP_NO = atlas_factories->addFactory("setup", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::SETUP_NO = atlas_factories->addFactory("setup", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("tick", "root_operation"));
Atlas::Objects::Operation::TICK_NO = atlas_factories->addFactory("tick", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::TICK_NO = atlas_factories->addFactory("tick", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("unseen", "perception"));
Atlas::Objects::Operation::UNSEEN_NO = atlas_factories->addFactory("unseen", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::UNSEEN_NO = atlas_factories->addFactory("unseen", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("attack", "action"));
Atlas::Objects::Operation::ATTACK_NO = atlas_factories->addFactory("attack", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::ATTACK_NO = atlas_factories->addFactory("attack", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("pickup", "action"));
Atlas::Objects::Operation::PICKUP_NO = atlas_factories->addFactory("pickup", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::PICKUP_NO = atlas_factories->addFactory("pickup", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("drop", "action"));
Atlas::Objects::Operation::DROP_NO = atlas_factories->addFactory("drop", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::DROP_NO = atlas_factories->addFactory("drop", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("update", "tick"));
Atlas::Objects::Operation::UPDATE_NO = atlas_factories->addFactory("update", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::UPDATE_NO = atlas_factories->addFactory("update", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("actuate", "action"));
Atlas::Objects::Operation::ACTUATE_NO = atlas_factories->addFactory("actuate", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::ACTUATE_NO = atlas_factories->addFactory("actuate", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("thought", "communicate"));
Atlas::Objects::Operation::THOUGHT_NO = atlas_factories->addFactory("thought", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::THOUGHT_NO = atlas_factories->addFactory("thought", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("goal_info", "communicate"));
Atlas::Objects::Operation::GOAL_INFO_NO = atlas_factories->addFactory("goal_info", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::GOAL_INFO_NO = atlas_factories->addFactory("goal_info", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("teleport", "action"));
Atlas::Objects::Operation::TELEPORT_NO = atlas_factories->addFactory("teleport", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::TELEPORT_NO = atlas_factories->addFactory("teleport", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("commune", "get"));
Atlas::Objects::Operation::COMMUNE_NO = atlas_factories->addFactory("commune", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::COMMUNE_NO = atlas_factories->addFactory("commune", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("think", "set"));
Atlas::Objects::Operation::THINK_NO = atlas_factories->addFactory("think", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::THINK_NO = atlas_factories->addFactory("think", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

//The relay operation is used when an operation needs to be sent from one router to another, and there's no natural way of doing it.
i.addChild(atlasOpDefinition("relay", "root_operation"));
Atlas::Objects::Operation::RELAY_NO = atlas_factories->addFactory("relay", &Atlas::Objects::generic_factory);
Atlas::Objects::Operation::RELAY_NO = atlas_factories->addFactory("relay", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

i.addChild(atlasOpDefinition("possess", "set"));
Atlas::Objects::Operation::POSSESS_NO = atlas_factories->addFactory("possess", &Atlas::Objects::generic_factory);

Atlas::Objects::Operation::POSSESS_NO = atlas_factories->addFactory("possess", &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);
}

void installCustomEntities()
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ dnl CPPFLAGS="$CPPFLAGS $MONO_CFLAGS"
dnl COMMON_LIBS="$COMMON_LIBS $MONO_LIBS"
dnl ])

PKG_CHECK_MODULES(DEPS, atlascpp-0.6 >= 0.6.4 varconf-1.0 >= 0.6.4,
PKG_CHECK_MODULES(DEPS, atlascpp-0.7 >= 0.7.0 varconf-1.0 >= 0.6.4,
[
CPPFLAGS="$CPPFLAGS $DEPS_CFLAGS"
COMMON_LIBS="$COMMON_LIBS $DEPS_LIBS"
Expand Down
12 changes: 6 additions & 6 deletions server/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ SERVER_LIBS = \
/usr/lib/libmercator-0.2.a \
/usr/lib/libvarconf-1.0.a \
/usr/lib/libwfmath-0.3.a \
/usr/lib/libAtlasObjects-0.6.a \
/usr/lib/libAtlasNet-0.6.a \
/usr/lib/libAtlasCodecs-0.6.a \
/usr/lib/libAtlasFilters-0.6.a \
/usr/lib/libAtlasMessage-0.6.a \
/usr/lib/libAtlas-0.6.a \
/usr/lib/libAtlasObjects-0.7.a \
/usr/lib/libAtlasNet-0.7.a \
/usr/lib/libAtlasCodecs-0.7.a \
/usr/lib/libAtlasFilters-0.7.a \
/usr/lib/libAtlasMessage-0.7.a \
/usr/lib/libAtlas-0.7.a \
/usr/lib/libsigc-2.0.a \
/usr/lib/libpq.a \
/usr/lib/libldap.a \
Expand Down
2 changes: 1 addition & 1 deletion server/OpRuleHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int OpRuleHandler::installOpDefinition(const std::string & class_name,
return -1;
}

Atlas::Objects::Factories::instance()->addFactory(class_name, &Atlas::Objects::generic_factory);
Atlas::Objects::Factories::instance()->addFactory(class_name, &Atlas::Objects::generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Inheritancetest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Inheritancetest::Inheritancetest()
{
if (SQUIGGLYMUFF_NO == OP_INVALID) {
SQUIGGLYMUFF_NO = Factories::instance()->addFactory("squigglymuff",
&generic_factory);
&generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);
}

ADD_TEST(Inheritancetest::test_builtins);
Expand Down
24 changes: 12 additions & 12 deletions tools/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ if LINK_STATIC

TOOL_LIBS = \
/usr/lib/libvarconf-1.0.a \
/usr/lib/libAtlasObjects-0.6.a \
/usr/lib/libAtlasNet-0.6.a \
/usr/lib/libAtlasCodecs-0.6.a \
/usr/lib/libAtlasFilters-0.6.a \
/usr/lib/libAtlasMessage-0.6.a \
/usr/lib/libAtlas-0.6.a \
/usr/lib/libAtlasObjects-0.7.a \
/usr/lib/libAtlasNet-0.7.a \
/usr/lib/libAtlasCodecs-0.7.a \
/usr/lib/libAtlasFilters-0.7.a \
/usr/lib/libAtlasMessage-0.7.a \
/usr/lib/libAtlas-0.7.a \
/usr/lib/libsigc-2.0.a \
$(STATIC_LIBSTDCPP) \
$(STATIC_LIBGCC) \
-lc -lm -lgcc_s

DBTOOL_LIBS = \
/usr/lib/libvarconf-1.0.a \
/usr/lib/libAtlasObjects-0.6.a \
/usr/lib/libAtlasNet-0.6.a \
/usr/lib/libAtlasCodecs-0.6.a \
/usr/lib/libAtlasFilters-0.6.a \
/usr/lib/libAtlasMessage-0.6.a \
/usr/lib/libAtlas-0.6.a \
/usr/lib/libAtlasObjects-0.7.a \
/usr/lib/libAtlasNet-0.7.a \
/usr/lib/libAtlasCodecs-0.7.a \
/usr/lib/libAtlasFilters-0.7.a \
/usr/lib/libAtlasMessage-0.7.a \
/usr/lib/libAtlas-0.7.a \
/usr/lib/libsigc-2.0.a \
/usr/lib/libpq.a \
/usr/lib/libldap.a \
Expand Down

0 comments on commit d3b9d17

Please sign in to comment.