OSDN Git Service
(root)
/
dennco
/
denncoCreator.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acbad07
)
[denncoCreator] integrated the change of dennco engine.
author
tkawata
<tkawata@users.sourceforge.jp>
Wed, 23 Jan 2013 14:59:03 +0000
(23:59 +0900)
committer
tkawata
<tkawata@users.sourceforge.jp>
Wed, 23 Jan 2013 14:59:03 +0000
(23:59 +0900)
Source/dccontainer.cpp
patch
|
blob
|
history
Source/engine/layer1/TKContainer.cpp
patch
|
blob
|
history
Source/engine/layer1/TKContainer.h
patch
|
blob
|
history
Source/engine/versioninfo.h
patch
|
blob
|
history
diff --git
a/Source/dccontainer.cpp
b/Source/dccontainer.cpp
index
3eabf24
..
dd506f2
100644
(file)
--- a/
Source/dccontainer.cpp
+++ b/
Source/dccontainer.cpp
@@
-591,6
+591,8
@@
QList<QString> DCContainer::getAvailableCellTypes() const
list.append(QString::fromStdString(TKContainer::CELLTYPE_BASICSTORAGE));
list.append(QString::fromStdString(TKContainer::CELLTYPE_IN));
list.append(QString::fromStdString(TKContainer::CELLTYPE_OUT));
list.append(QString::fromStdString(TKContainer::CELLTYPE_BASICSTORAGE));
list.append(QString::fromStdString(TKContainer::CELLTYPE_IN));
list.append(QString::fromStdString(TKContainer::CELLTYPE_OUT));
+ list.append(QString::fromStdString(TKContainer::CELLTYPE_PLUGIN_IN));
+ list.append(QString::fromStdString(TKContainer::CELLTYPE_PLUGIN_OUT));
return list;
}
return list;
}
@@
-625,6
+627,14
@@
bool DCContainer::getIsScriptable(const QString& type) const
{
return false;
}
{
return false;
}
+ else if (t == TKContainer::CELLTYPE_PLUGIN_IN)
+ {
+ return false;
+ }
+ else if (t == TKContainer::CELLTYPE_PLUGIN_OUT)
+ {
+ return false;
+ }
return false;
}
return false;
}
@@
-650,6
+660,14
@@
bool DCContainer::getIsReceptorAvailable(const QString& type) const
{
return true;
}
{
return true;
}
+ else if (t == TKContainer::CELLTYPE_PLUGIN_IN)
+ {
+ return false;
+ }
+ else if (t == TKContainer::CELLTYPE_PLUGIN_OUT)
+ {
+ return true;
+ }
return false;
}
return false;
}
diff --git
a/Source/engine/layer1/TKContainer.cpp
b/Source/engine/layer1/TKContainer.cpp
index
e001b25
..
8cf1e6d
100644
(file)
--- a/
Source/engine/layer1/TKContainer.cpp
+++ b/
Source/engine/layer1/TKContainer.cpp
@@
-29,6
+29,8
@@
const std::string TKContainer::CELLTYPE_JSBASIC = "B";
const std::string TKContainer::CELLTYPE_OUT = "O";
const std::string TKContainer::CELLTYPE_IN = "I";
const std::string TKContainer::CELLTYPE_BASICSTORAGE = "BS";
const std::string TKContainer::CELLTYPE_OUT = "O";
const std::string TKContainer::CELLTYPE_IN = "I";
const std::string TKContainer::CELLTYPE_BASICSTORAGE = "BS";
+const std::string TKContainer::CELLTYPE_PLUGIN_IN = "PI";
+const std::string TKContainer::CELLTYPE_PLUGIN_OUT = "PO";
const std::string TKContainer::CELLCODENAME_EMPTY = "_DNEMPTY";
TKContainer::TKContainer() : mStorage(NULL), mEmptyCellClass(NULL)
const std::string TKContainer::CELLCODENAME_EMPTY = "_DNEMPTY";
TKContainer::TKContainer() : mStorage(NULL), mEmptyCellClass(NULL)
@@
-160,6
+162,16
@@
TKCell* TKContainer::addCell(std::string theLocation, std::string theName, std::
{
cell = cellFactory(theLocation, theName, type, false, false);
}
{
cell = cellFactory(theLocation, theName, type, false, false);
}
+ else if (type == CELLTYPE_PLUGIN_IN)
+ {
+ cell = cellFactory(theLocation, theName, type, true, false);
+ noScript = true;
+ }
+ else if (type == CELLTYPE_PLUGIN_OUT)
+ {
+ cell = cellFactory(theLocation, theName, type, false, true);
+ noScript = true;
+ }
else
{
std::string message = std::string("Failed to construct cell '").append(theLocation).append("#").append(theName);
else
{
std::string message = std::string("Failed to construct cell '").append(theLocation).append("#").append(theName);
diff --git
a/Source/engine/layer1/TKContainer.h
b/Source/engine/layer1/TKContainer.h
index
c9a2c80
..
36b704c
100644
(file)
--- a/
Source/engine/layer1/TKContainer.h
+++ b/
Source/engine/layer1/TKContainer.h
@@
-42,6
+42,8
@@
public:
static const std::string CELLTYPE_OUT;
static const std::string CELLTYPE_IN;
static const std::string CELLTYPE_BASICSTORAGE;
static const std::string CELLTYPE_OUT;
static const std::string CELLTYPE_IN;
static const std::string CELLTYPE_BASICSTORAGE;
+ static const std::string CELLTYPE_PLUGIN_IN;
+ static const std::string CELLTYPE_PLUGIN_OUT;
static const std::string CELLCODENAME_EMPTY;
static const std::string CELLCODENAME_EMPTY;
diff --git
a/Source/engine/versioninfo.h
b/Source/engine/versioninfo.h
index
153681a
..
31b27e6
100644
(file)
--- a/
Source/engine/versioninfo.h
+++ b/
Source/engine/versioninfo.h
@@
-1,7
+1,7
@@
#ifndef VERSIONINFO_H
#define VERSIONINFO_H
#ifndef VERSIONINFO_H
#define VERSIONINFO_H
-#define CONTAINER_VERSION "alpha 2.
0
"
-#define ENGINE_VERSION "alpha 2.
0
"
+#define CONTAINER_VERSION "alpha 2.
1d
"
+#define ENGINE_VERSION "alpha 2.
1d
"
#endif // VERSIONINFO_H
#endif // VERSIONINFO_H