lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

added support for Shot in the script system

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2011-11-14 12:23:32 +00:00
parent 23753cfd17
commit 4f7bcaea66
5 changed files with 195 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/script_system/meshlabfilterXMLspecificationformat.xsd
View File

@ -67,6 +67,7 @@
<xs:element ref='SLIDER_GUI'/>
<xs:element ref='ENUM_GUI'/>
<xs:element ref='MESH_GUI'/>
<xs:element ref='SHOT_GUI'/>
</xs:choice>
</xs:sequence>
<xs:attribute name='parType' use='required'>
@ -78,6 +79,7 @@
<xs:pattern value='Vec3'/>
<xs:pattern value='Color'/>
<xs:pattern value='Mesh'/>
<xs:pattern value='Shot'/>
<xs:pattern value='Enum \{(\s*\S+\s*\:\s*\d+\s*(\|)?)+\}'/>
</xs:restriction>
</xs:simpleType>
@ -145,6 +147,12 @@
</xs:complexType>
</xs:element>
<xs:element name='SHOT_GUI'>
<xs:complexType>
<xs:attribute name='guiLabel' type='xs:string' use='required'/>
</xs:complexType>
</xs:element>
<xs:simpleType name="ArityType">
<xs:restriction base="xs:string">
<xs:enumeration value="SingleMesh"/>

168
src/common/scriptinterface.cpp
View File

@ -373,12 +373,12 @@ Q_INVOKABLE float MeshModelSI::bboxDiag() const
Q_INVOKABLE QVector<float> MeshModelSI::bboxMin() const
{
return ScriptInterfaceUtilities::vcgPointToVector(mm.cm.bbox.min);
return ScriptInterfaceUtilities::vcgPoint3ToVector3(mm.cm.bbox.min);
}
Q_INVOKABLE QVector<float> MeshModelSI::bboxMax() const
{
return ScriptInterfaceUtilities::vcgPointToVector(mm.cm.bbox.max);
return ScriptInterfaceUtilities::vcgPoint3ToVector3(mm.cm.bbox.max);
}
Q_INVOKABLE int MeshModelSI::id() const
@ -428,7 +428,7 @@ Q_INVOKABLE Point3Vector MeshModelSI::getVertPosArray()
Point3Vector pv;
for(unsigned int ii = 0; ii < mm.cm.vn;++ii)
{
Point3 p;
QVector<float> p;
p << mm.cm.vert[ii].P().X() << mm.cm.vert[ii].P().Y() << mm.cm.vert[ii].P().Z();
pv << p;
}
@ -452,7 +452,7 @@ Q_INVOKABLE Point3Vector MeshModelSI::getVertNormArray()
Point3Vector pv;
for(unsigned int ii = 0; ii < mm.cm.vn;++ii)
{
Point3 p;
QVector<float> p;
p << mm.cm.vert[ii].N().X() << mm.cm.vert[ii].N().Y() << mm.cm.vert[ii].N().Z();
pv << p;
}
@ -466,9 +466,9 @@ Q_INVOKABLE Point3Vector MeshModelSI::getVertNormArray()
//}
Q_INVOKABLE Point3 VCGVertexSI::getP()
Q_INVOKABLE QVector<float> VCGVertexSI::getP()
{
return ScriptInterfaceUtilities::vcgPointToVector(vv.P());
return ScriptInterfaceUtilities::vcgPoint3ToVector3(vv.P());
}
Q_INVOKABLE void VCGVertexSI::setPC( const float x,const float y,const float z )
@ -476,15 +476,15 @@ Q_INVOKABLE void VCGVertexSI::setPC( const float x,const float y,const float z )
vv.P() = vcg::Point3f(x,y,z);
}
Q_INVOKABLE void VCGVertexSI::setP( const Point3& p )
Q_INVOKABLE void VCGVertexSI::setP( const QVector<float>& p )
{
for (int ii = 0; ii < 3;++ii)
vv.P()[ii] = p[ii];
}
Q_INVOKABLE Point3 VCGVertexSI::getN()
Q_INVOKABLE QVector<float> VCGVertexSI::getN()
{
return ScriptInterfaceUtilities::vcgPointToVector(vv.N());
return ScriptInterfaceUtilities::vcgPoint3ToVector3(vv.N());
}
Q_INVOKABLE void VCGVertexSI::setN( const float x,const float y,const float z )
@ -736,10 +736,17 @@ QString EnvWrap::evalString( const QString& nm )
return result.toString();
}
//vcg::Shotf EnvWrap::evalShot( const QString& nm )
//{
// return vcg::Shot
//}
vcg::Shotf EnvWrap::evalShot( const QString& nm )
{
QScriptValue result = evalExp(nm);
ShotSI* shot = qscriptvalue_cast<ShotSI*>(result);
if (shot != NULL)
return shot->shot;
else
throw ExpressionHasNotThisTypeException("Shotf",nm);
return vcg::Shotf();
}
Q_DECLARE_METATYPE(EnvWrap)
Q_DECLARE_METATYPE(EnvWrap*)
@ -750,10 +757,55 @@ QScriptValue Env_ctor( QScriptContext */*context*/,QScriptEngine *engine )
return engine->newQObject(env, QScriptEngine::ScriptOwnership);
}
QScriptValue ShotSI_ctor( QScriptContext* c,QScriptEngine* e )
{
if (c->argumentCount() != 8)
return e->nullValue();
ShotSI* shot = new ShotSI();
QVector<float> m = qscriptvalue_cast< QVector<float> >(c->argument(0));
if (m.size() != 16)
return e->nullValue();
QVector<float> tr = qscriptvalue_cast< QVector<float> >(c->argument(1));
if (tr.size() != 3)
return e->nullValue();
float focal(c->argument(2).toNumber());
QVector<float> pixelsize = qscriptvalue_cast< QVector<float> >(c->argument(3));
if (pixelsize.size() != 2)
return e->nullValue();
QVector<float> centerpx = qscriptvalue_cast< QVector<float> >(c->argument(4));
if (centerpx.size() != 2)
return e->nullValue();
QVector<float> viewportpx = qscriptvalue_cast< QVector<float> >(c->argument(5));
if (viewportpx.size() != 2)
return e->nullValue();
QVector<float> distpx = qscriptvalue_cast< QVector<float> >(c->argument(6));
if (distpx.size() != 2)
return e->nullValue();
QVector<float> k = qscriptvalue_cast< QVector<float> >(c->argument(7));
if (k.size() != 4)
return e->nullValue();
vcg::Matrix44f mat = ScriptInterfaceUtilities::vector16ToVcgMatrix44(m);
shot->shot.Extrinsics.SetRot(mat);
vcg::Point3f tra = ScriptInterfaceUtilities::vector3ToVcgPoint3(tr);
shot->shot.Extrinsics.SetTra(tra);
shot->shot.Intrinsics.FocalMm = focal;
vcg::Point2f pxsize = ScriptInterfaceUtilities::vector2ToVcgPoint2(pixelsize);
shot->shot.Intrinsics.PixelSizeMm = pxsize;
vcg::Point2f cent = ScriptInterfaceUtilities::vector2ToVcgPoint2(centerpx);
shot->shot.Intrinsics.CenterPx = cent;
vcg::Point2i vw = ScriptInterfaceUtilities::vector2ToVcgPoint2i(viewportpx);
shot->shot.Intrinsics.ViewportPx = vw;
vcg::Point2f d = ScriptInterfaceUtilities::vector2ToVcgPoint2(distpx);
shot->shot.Intrinsics.DistorCenterPx = d;
for (int ii = 0; ii < 4; ++ii)
shot->shot.Intrinsics.k[ii] = k[ii];
return e->newQObject(shot, QScriptEngine::ScriptOwnership);
}
Env::Env()
{
qScriptRegisterSequenceMetaType<Point3>(this);
qScriptRegisterSequenceMetaType<QVector<float>>(this);
qScriptRegisterSequenceMetaType<Point3Vector>(this);
qScriptRegisterSequenceMetaType<QVector<VCGVertexSI*> >(this);
qScriptRegisterMetaType(this,MeshModelScriptInterfaceToScriptValue,MeshModelScriptInterfaceFromScriptValue);
@ -780,6 +832,8 @@ Env::Env()
setDefaultPrototype(qMetaTypeId<VCGPoint3SI>(), point_ctor.property("prototype"));
globalObject().setProperty("VCGPoint3", point_ctor);
//qScriptRegisterMetaType(this,Point3fToScriptValue,Point3fFromScriptValue);
QScriptValue shot_ctor = newFunction(ShotSI_ctor);
globalObject().setProperty("Shot", shot_ctor);
}
void Env::insertExpressionBinding( const QString& nm,const QString& exp )
@ -800,23 +854,99 @@ void Env::appendOutput( const QString& output )
out = out + output;
}
ShotSI::ShotSI( const vcg::Shotf& st )
:shot()
{
shot.Intrinsics = st.Intrinsics;
shot.Extrinsics = st.Extrinsics;
}
ShotSI::ShotSI( vcg::Shotf& st )
:shot(st)
ShotSI::ShotSI()
:shot()
{
}
vcg::Shotf ShotSI::getShot()
Q_INVOKABLE ShotSI* ShotSI::itSelf()
{
return shot;
return this;
}
QVector<float> ScriptInterfaceUtilities::vcgPoint2ToVector2( const vcg::Point2f& p )
{
QVector<float> vfl(2);
for (int ii = 0;ii < 2;++ii)
vfl[ii] = p[ii];
return vfl;
}
vcg::Point2f ScriptInterfaceUtilities::vector2ToVcgPoint2( const QVector<float>& v )
{
vcg::Point2f p;
for (int ii = 0;ii < 2;++ii)
p[ii] = v[ii];
return p;
}
QVector<float> ScriptInterfaceUtilities::vcgPointToVector( const vcg::Point3f& p )
QVector<float> ScriptInterfaceUtilities::vcgPoint3ToVector3( const vcg::Point3f& p )
{
QVector<float> vfl(3);
for (int ii = 0;ii < 3;++ii)
vfl[ii] = p[ii];
return vfl;
}
vcg::Point3f ScriptInterfaceUtilities::vector3ToVcgPoint3( const QVector<float>& v )
{
vcg::Point3f p;
for (int ii = 0;ii < 3;++ii)
p[ii] = v[ii];
return p;
}
QVector<float> ScriptInterfaceUtilities::vcgPoint4ToVector4( const vcg::Point4f& p )
{
QVector<float> vfl(4);
for (int ii = 0;ii < 4;++ii)
vfl[ii] = p[ii];
return vfl;
}
vcg::Point4f ScriptInterfaceUtilities::vector4ToVcgPoint4( const QVector<float>& v )
{
vcg::Point4f p;
for (int ii = 0;ii < 4;++ii)
p[ii] = v[ii];
return p;
}
QVector<float> ScriptInterfaceUtilities::vcgMatrix44ToVector16( const vcg::Matrix44f& m )
{
QVector<float> vfl(16);
for (int ii = 0;ii < 16;++ii)
vfl[ii] = m[ii / 4][ii % 4];
return vfl;
}
vcg::Matrix44f ScriptInterfaceUtilities::vector16ToVcgMatrix44( const QVector<float>& v )
{
vcg::Matrix44f m;
for (int ii = 0;ii < 4;++ii)
for (int jj = 0;jj < 4;++jj)
m[ii][jj] = v[ii * 4 + jj];
return m;
}
vcg::Point2i ScriptInterfaceUtilities::vector2ToVcgPoint2i( const QVector<float>& v )
{
vcg::Point2i p;
for (int ii = 0;ii < 2;++ii)
p[ii] = int(v[ii]);
return p;
}

44
src/common/scriptinterface.h
View File

@ -59,10 +59,23 @@ QScriptValue IRichParameterSet_ctor(QScriptContext* c,QScriptEngine* e);
QScriptValue myprint (QScriptContext* sc, QScriptEngine* se);
typedef vcg::Point3f VCGPoint3SI;
typedef QVector<QVector<float>> Point3Vector;
class ScriptInterfaceUtilities
{
public:
static QVector<float> vcgPointToVector(const vcg::Point3f& p);
static QVector<float> vcgPoint2ToVector2(const vcg::Point2f& p);
static vcg::Point2f vector2ToVcgPoint2(const QVector<float>& v);
static vcg::Point2i vector2ToVcgPoint2i(const QVector<float>& v);
static QVector<float> vcgPoint3ToVector3(const vcg::Point3f& p);
static vcg::Point3f vector3ToVcgPoint3(const QVector<float>& v);
static QVector<float> vcgPoint4ToVector4(const vcg::Point4f& p);
static vcg::Point4f vector4ToVcgPoint4(const QVector<float>& v);
static QVector<float> vcgMatrix44ToVector16(const vcg::Matrix44f& m);
static vcg::Matrix44f vector16ToVcgMatrix44(const QVector<float>& v);
};
//class VCGPoint3fSI : public QObject
@ -81,10 +94,6 @@ public:
typedef vcg::Point3f VCGPoint3SI;
typedef QVector<float> Point3;
typedef QVector<Point3> Point3Vector;
class VCGVertexSI : public QObject
{
Q_OBJECT
@ -92,12 +101,12 @@ public:
VCGVertexSI(CMeshO::VertexType& v);
//Q_INVOKABLE vcg::Point3f* p();
Q_INVOKABLE Point3 getP();
Q_INVOKABLE QVector<float> getP();
Q_INVOKABLE VCGPoint3SI getPoint();
Q_INVOKABLE void setPC(const float x,const float y,const float z);
Q_INVOKABLE void setP(const Point3& p);
Q_INVOKABLE void setP(const QVector<float>& p);
Q_INVOKABLE void setPoint(const VCGPoint3SI& p);
Q_INVOKABLE Point3 getN();
Q_INVOKABLE QVector<float> getN();
Q_INVOKABLE VCGPoint3SI getNormal();
Q_INVOKABLE void setNormal(const VCGPoint3SI& p);
Q_INVOKABLE void setN(const float x,const float y,const float z);
@ -173,8 +182,8 @@ QScriptValue VCGVertexScriptInterfaceToScriptValue(QScriptEngine* eng,VCGVertexS
void VCGVertexScriptInterfaceFromScriptValue(const QScriptValue& val,VCGVertexSI*& out);
Q_DECLARE_METATYPE(Point3)
Q_DECLARE_METATYPE(QVector<float>)
Q_DECLARE_METATYPE(QVector<float>*)
Q_DECLARE_METATYPE(Point3Vector)
Q_DECLARE_METATYPE(QVector<VCGVertexSI*>)
@ -221,28 +230,31 @@ public:
QString evalString(const QString& nm);
int evalEnum( const QString& nm );
MeshModel* evalMesh(const QString& nm);
//vcg::Shotf evalShot(const QString& nm);
vcg::Shotf evalShot(const QString& nm);
};
QScriptValue EnvWrap_ctor(QScriptContext* c,QScriptEngine* e);
class ShotSI : public QObject
{
Q_OBJECT
public:
ShotSI(vcg::Shotf& st);
ShotSI();
ShotSI(const vcg::Shotf& st);
~ShotSI() {};
//only for c++
vcg::Shotf getShot();
Q_INVOKABLE ShotSI* itSelf();
private:
vcg::Shotf& shot;
vcg::Shotf shot;
};
Q_DECLARE_METATYPE(ShotSI*)
QScriptValue ShotScriptInterfaceToScriptValue(QScriptEngine* eng,ShotSI* const& in);
void ShotScriptInterfaceFromScriptValue(const QScriptValue& val,ShotSI*& out);
QScriptValue ShotSI_ctor(QScriptContext* c,QScriptEngine* e);
inline QScriptValue VCGPoint3SI_addV3(QScriptContext * c,QScriptEngine *e )

8
src/common/xmlfilterinfo.cpp
View File

@ -63,8 +63,9 @@ QString MLXMLPluginInfo::guiTypeSwitchQueryText(const QString& var)
QString caseSLIDER("case element (" + MLXMLElNames::sliderWidgetTag + ") return <p>" + floatGuiInfo(MLXMLElNames::sliderWidgetTag,var) + "</p>/string()");
QString caseENUM("case element (" + MLXMLElNames::enumWidgetTag + ") return <p>" + defaultGuiInfo(MLXMLElNames::enumWidgetTag,var) + "</p>/string()");
QString caseMESH("case element (" + MLXMLElNames::meshWidgetTag + ") return <p>" + defaultGuiInfo(MLXMLElNames::meshWidgetTag,var) + "</p>/string()");
QString caseSHOT("case element (" + MLXMLElNames::shotWidgetTag + ") return <p>" + defaultGuiInfo(MLXMLElNames::shotWidgetTag,var) + "</p>/string()");
QString errorMsg = "default return \"" + MLXMLPluginInfo::guiErrorMsg() + "\"";
return base + " " + caseABS + " " + caseBOOL + " " + caseEDIT + " " + caseVEC + " " + caseCOLOR + " " + caseSLIDER + " " + caseENUM + " " + caseMESH + " " + errorMsg;
return base + " " + caseABS + " " + caseBOOL + " " + caseEDIT + " " + caseVEC + " " + caseCOLOR + " " + caseSLIDER + " " + caseENUM + " " + caseMESH + " " + caseSHOT + " " + errorMsg;
}
QStringList MLXMLPluginInfo::filterNames() const
@ -722,6 +723,7 @@ void MLXMLElNames::initMLXMLTypeList( QStringList& ls )
ls << MLXMLElNames::vec3Type;
ls << MLXMLElNames::enumType;
ls << MLXMLElNames::meshType;
ls << MLXMLElNames::shotType;
}
void MLXMLElNames::initMLXMLGUITypeList( QStringList& ls )
@ -734,6 +736,7 @@ void MLXMLElNames::initMLXMLGUITypeList( QStringList& ls )
ls << MLXMLElNames::meshWidgetTag;
ls << MLXMLElNames::colorWidgetTag;
ls << MLXMLElNames::enumWidgetTag;
ls << MLXMLElNames::shotWidgetTag;
}
void MLXMLElNames::initMLXMLArityValuesList( QStringList& ls )
@ -775,6 +778,9 @@ void MLXMLElNames::initMLXMLGUIListForType( const QString& mlxmltype,QStringList
if (mlxmltype == MLXMLElNames::enumType)
ls << MLXMLElNames::enumWidgetTag;
if (mlxmltype == MLXMLElNames::shotType)
ls << MLXMLElNames::shotWidgetTag;
}
void MLXMLElNames::initMLXMLTreeTag( QStringList& ls )

4
src/common/xmlfilterinfo.h
View File

@ -67,7 +67,8 @@ namespace MLXMLElNames
const QString sliderWidgetTag("SLIDER_GUI");
const QString enumWidgetTag("ENUM_GUI");
const QString meshWidgetTag("MESH_GUI");
const QString shotWidgetTag("SHOT_GUI");
const QString mfiVersion("mfiVersion");
const QString pluginScriptName("pluginName");
@ -106,6 +107,7 @@ namespace MLXMLElNames
const QString colorType("Color");
const QString enumType("Enum");
const QString meshType("Mesh");
const QString shotType("Shot");
//ariety values
const QString singleMeshArity("SingleMesh");