[gephex-devel] gephex--main--0.5--patch-15
gephex at sonnenland.kexbox.org
gephex at sonnenland.kexbox.org
Thu Apr 21 21:29:13 CEST 2005
Archive: gephex at gephex.org--2004
New revision: gephex--main--0.5--patch-15
--
Revision: gephex--main--0.5--patch-15
Archive: gephex at gephex.org--2004
Creator: The Gephex Source Archive <gephex at gephex.org>
Date: Thu Apr 21 21:25:26 CEST 2005
Standard-date: 2005-04-21 19:25:26 GMT
Removed-files: .arch-ids/ChangeLog.id
.arch-ids/Makefile.am.id .arch-ids/README.id
.arch-ids/bootstrap.sh.id .arch-ids/configure.ac.id
ChangeLog Makefile.am README bootstrap.sh configure.ac
gphxcore/.arch-ids/Makefile.am.id gphxcore/Makefile.am
gphxcore/include/.arch-ids/Makefile.am.id
gphxcore/include/Makefile.am
gphxcore/src/.arch-ids/Makefile.am.id
gphxcore/src/Makefile.am
gphxcore/src/tests/.arch-ids/Makefile.am.id
gphxcore/src/tests/Makefile.am
gphxsdk/.arch-ids/Makefile.am.id gphxsdk/Makefile.am
gphxsdk/include/.arch-ids/Makefile.am.id
gphxsdk/include/Makefile.am
gphxsdk/src/.arch-ids/Makefile.am.id
gphxsdk/src/Makefile.am
gphxutils/.arch-ids/Makefile.am.id
gphxutils/Makefile.am
gphxutils/include/.arch-ids/Makefile.am.id
gphxutils/include/Makefile.am
gphxutils/src/.arch-ids/Makefile.am.id
gphxutils/src/Makefile.am
gphxutils/src/tests/.arch-ids/Makefile.am.id
gphxutils/src/tests/Makefile.am
konsolenphex/.arch-ids/Makefile.am.id
konsolenphex/Makefile.am
konsolenphex/src/.arch-ids/Makefile.am.id
konsolenphex/src/Makefile.am
konsolenphex/tests/.arch-ids/Makefile.am.id
konsolenphex/tests/Makefile.am
misc/.arch-ids/Makefile.am.id misc/Makefile.am
misc/src/.arch-ids/Makefile.am.id misc/src/Makefile.am
misc/src/libscale/.arch-ids/Makefile.am.id
misc/src/libscale/Makefile.am
pluc/.arch-ids/Makefile.am.id pluc/Makefile.am
pluc/src/.arch-ids/Makefile.am.id pluc/src/Makefile.am
plugins/.arch-ids/Makefile.am.id plugins/Makefile.am
plugins/src/.arch-ids/Makefile.am.id
plugins/src/Makefile.am
plugins/src/core/.arch-ids/Makefile.am.id
plugins/src/core/Makefile.am
plugins/src/freeframe_loader/.arch-ids/Makefile.am.id
plugins/src/freeframe_loader/Makefile.am
tester/.arch-ids/Makefile.am.id tester/Makefile.am
tester/src/.arch-ids/Makefile.am.id
tester/src/Makefile.am
Modified-files: INSTALL SConstruct gphxcore/include/core.h
gphxcore/src/core.cpp
New-patches: georg at gephex.org--2004-home/gephex--cleanup--0.5--base-0
georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-1
georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-2
georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-3
gephex at gephex.org--2004/gephex--main--0.5--patch-15
Summary: [MERGE-REQUEST] Removed some uneeded stuff (old automake files, subsctription stuff in core, ...)
Keywords:
Patches applied:
* georg at gephex.org--2004-home/gephex--cleanup--0.5--base-0
tag of gephex at gephex.org--2004/gephex--main--0.5--patch-14
* georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-1
Removed autoconf and automake files
* georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-2
Removed some more unneeded files
* georg at gephex.org--2004-home/gephex--cleanup--0.5--patch-3
Removed subscription stuff
* added directories
{arch}/gephex/gephex--cleanup
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home/patch-log
* removed files
.arch-ids/ChangeLog.id
.arch-ids/Makefile.am.id
.arch-ids/README.id
.arch-ids/bootstrap.sh.id
.arch-ids/configure.ac.id
ChangeLog
Makefile.am
README
bootstrap.sh
configure.ac
gphxcore/.arch-ids/Makefile.am.id
gphxcore/Makefile.am
gphxcore/include/.arch-ids/Makefile.am.id
gphxcore/include/Makefile.am
gphxcore/src/.arch-ids/Makefile.am.id
gphxcore/src/Makefile.am
gphxcore/src/tests/.arch-ids/Makefile.am.id
gphxcore/src/tests/Makefile.am
gphxsdk/.arch-ids/Makefile.am.id
gphxsdk/Makefile.am
gphxsdk/include/.arch-ids/Makefile.am.id
gphxsdk/include/Makefile.am
gphxsdk/src/.arch-ids/Makefile.am.id
gphxsdk/src/Makefile.am
gphxutils/.arch-ids/Makefile.am.id
gphxutils/Makefile.am
gphxutils/include/.arch-ids/Makefile.am.id
gphxutils/include/Makefile.am
gphxutils/src/.arch-ids/Makefile.am.id
gphxutils/src/Makefile.am
gphxutils/src/tests/.arch-ids/Makefile.am.id
gphxutils/src/tests/Makefile.am
konsolenphex/.arch-ids/Makefile.am.id
konsolenphex/Makefile.am
konsolenphex/src/.arch-ids/Makefile.am.id
konsolenphex/src/Makefile.am
konsolenphex/tests/.arch-ids/Makefile.am.id
konsolenphex/tests/Makefile.am
misc/.arch-ids/Makefile.am.id
misc/Makefile.am
misc/src/.arch-ids/Makefile.am.id
misc/src/Makefile.am
misc/src/libscale/.arch-ids/Makefile.am.id
misc/src/libscale/Makefile.am
pluc/.arch-ids/Makefile.am.id
pluc/Makefile.am
pluc/src/.arch-ids/Makefile.am.id
pluc/src/Makefile.am
plugins/.arch-ids/Makefile.am.id
plugins/Makefile.am
plugins/src/.arch-ids/Makefile.am.id
plugins/src/Makefile.am
plugins/src/core/.arch-ids/Makefile.am.id
plugins/src/core/Makefile.am
plugins/src/freeframe_loader/.arch-ids/Makefile.am.id
plugins/src/freeframe_loader/Makefile.am
tester/.arch-ids/Makefile.am.id
tester/Makefile.am
tester/src/.arch-ids/Makefile.am.id
tester/src/Makefile.am
* added files
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home/patch-log/base-0
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home/patch-log/patch-1
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home/patch-log/patch-2
{arch}/gephex/gephex--cleanup/gephex--cleanup--0.5/georg at gephex.org--2004-home/patch-log/patch-3
{arch}/gephex/gephex--main/gephex--main--0.5/gephex at gephex.org--2004/patch-log/patch-15
* modified files
--- orig/INSTALL
+++ mod/INSTALL
@@ -1,17 +1,3 @@
To install GePhex, perform the following steps:
-1. Type "./configure" (you may choose a different installation prefix
- with --prefix=<your prefix here>, default is /usr/)
-
-2. Type make
-
-3. Type make install
-
-4. Go into <your chosen prefix>/bin and start engine and gui (in that order).
-
-5. Have fun!!!
-
-
-For a more detailed documentation see:
- http://www.gephex.org
-
+TODO: describe scons build stuff
--- orig/SConstruct
+++ mod/SConstruct
@@ -49,9 +49,9 @@
pluc/src/main.cpp \
pluc/src/spec.cpp \
pluc/src/pluc_scanner.cpp \
- pluc/src/pluc_parser.tab.cpp'))
+ pluc/src/pluc_parser.tab.cpp'), SHLIBPREFIX='')
-env.Library(target = 'core', source = Split('\
+env.SharedLibrary(target = 'core', source = Split('\
plugins/src/core/number.cpp \
plugins/src/core/kalkulon.cpp \
plugins/src/core/core.cpp'))
--- orig/gphxcore/include/core.h
+++ mod/gphxcore/include/core.h
@@ -1,6 +1,6 @@
/* This source file is a part of the GePhex Project.
-Copyright (C) 2001-2003
+Copyright (C) 2001-20035
Georg Seidel <georg at gephex.org>
Martin Bayer <martin at gephex.org>
@@ -254,36 +254,6 @@
void core_detach(Core& c, ConnectionHandle* connection);
-#if 0
- /**
- * Creates a subscription on a link.
- * This means that the value of this link will be returned by
- * the fetch_subscription() method.
- *
- * \param lid the link whose value is of interest
- * hrows std::invalid_argument if here is already a
- * subscription on lid
- */
- void subscribe_link_value(LinkHandle& lid) throw(std::invalid_argument);
-
- /**
- * Removes a subscription from a link.
- *
- * \param lid the link whose value is no longer of interest
- * hrows std::invalid_argument if there is no subscription on lid
- */
- void unsubscribe_link_value(LinkHandle& lid) throw(std::invalid_argument);
-
- /**
- * Pushes the values of subscribed links onto the stream.
- * Pushes only those values that have changed since time.
- *
- * \param time the time starting from which all changes are sent
- */
- void fetch_subscription(double time /*TODO: some kind of stream*/)
- const throw();
-#endif
-
//---------------------------------------------------------------------------
}
--- orig/gphxcore/src/core.cpp
+++ mod/gphxcore/src/core.cpp
@@ -20,11 +20,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
-/**
- * TODO:
- *
- */
-
#include "core.h"
#include <memory>
@@ -63,8 +58,6 @@
: m_renderer(new Renderer()) {}
std::auto_ptr<Renderer> m_renderer;
- //typedef std::list<LinkHandleImpl*> SubscriptionList;
- //SubscriptionList m_subscriptions;
};
//-------------------------------------------------------------------------
@@ -391,7 +384,7 @@
if (lf_id != ph->m_id.type())
{
std::cerr << "Link and Port have different link-type: '" << lf_id
- << "' cannot connect to '" << ph->id().type() << "'";
+ << "' cannot connect to '" << ph->id().type() << "'";
error = TYPE_ERROR;
return 0;
@@ -427,50 +420,6 @@
c.m_renderer->detach(*ch);
}
-#if 0
- void core_subscribe_link_value(LinkHandle& lid) throw(std::invalid_argument)
- {
- LinkHandle* lhi = safe_cast<LinkHandle*>(&lid);
-
- if (std::find(m_subscriptions.begin(),
- m_subscriptions.end(),
- lhi) != m_subscriptions.end())
- throw std::invalid_argument("Link already subscribed");
-
- m_subscriptions.push_back(lhi);
- }
-
- void Core::unsubscribe_link_value(LinkHandle& lid)
- throw(std::invalid_argument)
- {
- LinkHandle* lhi = safe_cast<LinkHandle*>(&lid);
-
- SubscriptionList::iterator
- it = std::find(m_subscriptions.begin(),
- m_subscriptions.end(),
- lhi);
- if (it == m_subscriptions.end())
- throw std::invalid_argument("Link not subscribed");
-
- m_subscriptions.erase(it);
- }
-
- void Core::fetch_subscription(double time /*TODO: some kind of stream*/)
- const throw()
- {
- for (SubscriptionList::const_iterator it = m_subscriptions.begin();
- it != m_subscriptions.end(); ++it)
- {
- LinkHandle* lhi = *it;
- //Link* l = lhi->link;
- if (lhi->timestamp() < time)
- continue;
-
- // TODO: serialize l into the stream
- }
- }
-
-#endif
}
//----------------------------------------------------------------------------
More information about the gephex-devel
mailing list