Skip to content

First step - adding new WheelSlot params #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VzhelevVector merged 1 commit into from
Jun 17, 2026
Merged

First step - adding new WheelSlot params #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/GDTFManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,10 @@ GdtfWheelSlot::GdtfWheelSlot(GdtfWheel* parent)
fWheelParent = parent;
fFilter = nullptr;
fAnimationSystem = nullptr;
fDuration = 0.0;
fWidth = 0;
fHeight = 0;
fFPS = 0;
}

GdtfWheelSlot::GdtfWheelSlot(const TXString& name, GdtfWheel* parent)
Expand All @@ -1161,6 +1165,10 @@ GdtfWheelSlot::GdtfWheelSlot(const TXString& name, GdtfWheel* parent)
fWheelParent = parent;
fFilter = nullptr;
fAnimationSystem = nullptr;
fDuration = 0.0;
fWidth = 0;
fHeight = 0;
fFPS = 0;
}


Expand Down Expand Up @@ -1270,6 +1278,10 @@ void GdtfWheelSlot::OnPrintToFile(IXMLFileNodePtr pNode)
pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotColor, GdtfConverter::ConvertColor(fColor));
if(fGobo != "") { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotPicture, fGobo); }
if(fFilter) { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotFilter, fFilter->GetNodeReference()); }
if(fDuration != 0.0) { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotDuration, GdtfConverter::ConvertDouble(fDuration)); }
if(fWidth != 0) { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotWidth, GdtfConverter::ConvertInteger(fWidth)); }
if(fHeight != 0) { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotHeight, GdtfConverter::ConvertInteger(fHeight)); }
if(fFPS != 0) { pNode->SetNodeAttributeValue(XML_GDTF_WheelSlotFPS, GdtfConverter::ConvertInteger(fFPS)); }

//------------------------------------------------------------------------------------
// Print the children
Expand Down Expand Up @@ -1311,6 +1323,16 @@ void GdtfWheelSlot::OnReadFromNode(const IXMLFileNodePtr& pNode)


pNode->GetNodeAttributeValue(XML_GDTF_WheelSlotFilter, fUnresolvedFilter);

TXString duration, width, height, fps;
pNode->GetNodeAttributeValue(XML_GDTF_WheelSlotDuration, duration);
pNode->GetNodeAttributeValue(XML_GDTF_WheelSlotWidth, width);
pNode->GetNodeAttributeValue(XML_GDTF_WheelSlotHeight, height);
pNode->GetNodeAttributeValue(XML_GDTF_WheelSlotFPS, fps);
if(!duration.IsEmpty()) { GdtfConverter::ConvertDouble(duration, pNode, fDuration); }
if(!width.IsEmpty()) { GdtfConverter::ConvertInteger(width, pNode, fWidth); }
if(!height.IsEmpty()) { GdtfConverter::ConvertInteger(height, pNode, fHeight); }
if(!fps.IsEmpty()) { GdtfConverter::ConvertInteger(fps, pNode, fFPS); }

//------------------------------------------------------------------------------------
// Read the wheel slots
Expand Down Expand Up @@ -1358,6 +1380,10 @@ void GdtfWheelSlot::OnErrorCheck(const IXMLFileNodePtr& pNode)
optional.push_back(XML_GDTF_WheelSlotColor);
optional.push_back(XML_GDTF_WheelSlotPicture);
optional.push_back(XML_GDTF_WheelSlotFilter);
optional.push_back(XML_GDTF_WheelSlotDuration);
optional.push_back(XML_GDTF_WheelSlotWidth);
optional.push_back(XML_GDTF_WheelSlotHeight);
optional.push_back(XML_GDTF_WheelSlotFPS);


//------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1390,6 +1416,16 @@ GdtfWheelSlotAnimationSystem* GdtfWheelSlot::GetAnimationSystem() const
return fAnimationSystem;
}

double GdtfWheelSlot::GetDuration() const { return fDuration; }
size_t GdtfWheelSlot::GetWidth() const { return fWidth; }
size_t GdtfWheelSlot::GetHeight() const { return fHeight; }
size_t GdtfWheelSlot::GetFPS() const { return fFPS; }

void GdtfWheelSlot::SetDuration(double duration) { fDuration = duration; }
void GdtfWheelSlot::SetWidth(size_t width) { fWidth = width; }
void GdtfWheelSlot::SetHeight(size_t height) { fHeight = height; }
void GdtfWheelSlot::SetFPS(size_t fps) { fFPS = fps; }

//------------------------------------------------------------------------------------
// GdtfModel
GdtfModel::GdtfModel(GdtfFixture* fixture)
Expand Down
12 changes: 12 additions & 0 deletions src/GDTFManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,10 @@ namespace SceneData
GdtfFilter* fFilter;
TXString fUnresolvedFilter;
GdtfWheelSlotAnimationSystem* fAnimationSystem;
double fDuration;
size_t fWidth;
size_t fHeight;
size_t fFPS;

public:
const TXString& GetGobo() const;
Expand All @@ -437,13 +441,21 @@ namespace SceneData
TGdtfWheelSlotPrismFacetArray GetPrismFacets();
GdtfFilter* GetFilter() const;
GdtfWheelSlotAnimationSystem* GetAnimationSystem() const;
double GetDuration() const;
size_t GetWidth() const;
size_t GetHeight() const;
size_t GetFPS() const;

void SetName(const TXString& name);
void SetGobo(const GdtfPNGFile& png);
void SetColor(const CCieColor& color);
void SetFilter(GdtfFilter* filter);
GdtfWheelSlotPrismFacet* AddPrismFacet();
GdtfWheelSlotAnimationSystem* AddAnimationSystem();
void SetDuration(double duration);
void SetWidth(size_t width);
void SetHeight(size_t height);
void SetFPS(size_t fps);

virtual TXString GetNodeReference();

Expand Down
56 changes: 56 additions & 0 deletions src/Implementation/CGdtfWheelSlot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,59 @@ VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::SetFilter (IGdtfFi

return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::GetDuration(double& outDuration)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
outDuration = fWheelSlot->GetDuration();
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::GetWidth(size_t& outWidth)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
outWidth = fWheelSlot->GetWidth();
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::GetHeight(size_t& outHeight)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
outHeight = fWheelSlot->GetHeight();
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::GetFPS(size_t& outFPS)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
outFPS = fWheelSlot->GetFPS();
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::SetDuration(double duration)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
fWheelSlot->SetDuration(duration);
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::SetWidth(size_t width)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
fWheelSlot->SetWidth(width);
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::SetHeight(size_t height)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
fWheelSlot->SetHeight(height);
return kVCOMError_NoError;
}

VectorworksMVR::VCOMError VectorworksMVR::CGdtfWheelSlotImpl::SetFPS(size_t fps)
{
if(!fWheelSlot) return kVCOMError_NotInitialized;
fWheelSlot->SetFPS(fps);
return kVCOMError_NoError;
}
9 changes: 9 additions & 0 deletions src/Implementation/CGdtfWheelSlot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ namespace VectorworksMVR

virtual VCOMError VCOM_CALLTYPE GetAnimationSystem(IGdtfWheelSlotAnimationSystem** outAnimationSystem);
virtual VCOMError VCOM_CALLTYPE CreateAnimationSystem(double p1_X, double p1_Y, double p2_X, double p2_Y, double p3_X, double p3_Y, double radius, IGdtfWheelSlotAnimationSystem** outAnimationSystem);

virtual VCOMError VCOM_CALLTYPE GetDuration(double& outDuration);
virtual VCOMError VCOM_CALLTYPE GetWidth(size_t& outWidth);
virtual VCOMError VCOM_CALLTYPE GetHeight(size_t& outHeight);
virtual VCOMError VCOM_CALLTYPE GetFPS(size_t& outFPS);
virtual VCOMError VCOM_CALLTYPE SetDuration(double duration);
virtual VCOMError VCOM_CALLTYPE SetWidth(size_t width);
virtual VCOMError VCOM_CALLTYPE SetHeight(size_t height);
virtual VCOMError VCOM_CALLTYPE SetFPS(size_t fps);

virtual VCOMError VCOM_CALLTYPE BindToObject(void* objAddr);
virtual void* VCOM_CALLTYPE GetBoundObject();
Expand Down
10 changes: 10 additions & 0 deletions src/Include/IMediaRessourceVectorInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,16 @@ namespace VectorworksMVR
//GDTF 1.1
virtual VCOMError VCOM_CALLTYPE GetAnimationSystem(IGdtfWheelSlotAnimationSystem** outAnimationSystem) = 0;
virtual VCOMError VCOM_CALLTYPE CreateAnimationSystem(double p1_X, double p1_Y, double p2_X, double p2_Y, double p3_X, double p3_Y, double radius, IGdtfWheelSlotAnimationSystem** outAnimationSystem) = 0;

// Spec PR #305 - Media content attributes
virtual VCOMError VCOM_CALLTYPE GetDuration(double& outDuration) = 0;
virtual VCOMError VCOM_CALLTYPE GetWidth(size_t& outWidth) = 0;
virtual VCOMError VCOM_CALLTYPE GetHeight(size_t& outHeight) = 0;
virtual VCOMError VCOM_CALLTYPE GetFPS(size_t& outFPS) = 0;
virtual VCOMError VCOM_CALLTYPE SetDuration(double duration) = 0;
virtual VCOMError VCOM_CALLTYPE SetWidth(size_t width) = 0;
virtual VCOMError VCOM_CALLTYPE SetHeight(size_t height) = 0;
virtual VCOMError VCOM_CALLTYPE SetFPS(size_t fps) = 0;
};
typedef VCOMPtr<IGdtfWheelSlot> IGdtfWheelSlotPtr;

Expand Down
4 changes: 4 additions & 0 deletions src/Prefix/CommonPrefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,10 @@ const Sint32 kGDTF_CurrentMinorVersion = 2;
#define XML_GDTF_WheelSlotColor "Color"
#define XML_GDTF_WheelSlotPicture "MediaFileName"
#define XML_GDTF_WheelSlotFilter "Filter"
#define XML_GDTF_WheelSlotDuration "Duration"
#define XML_GDTF_WheelSlotWidth "Width"
#define XML_GDTF_WheelSlotHeight "Height"
#define XML_GDTF_WheelSlotFPS "FPS"

#define XML_GDTF_PrismFacetNodeName "Facet"
#define XML_GDTF_PrismFacetColor "Color"
Expand Down
17 changes: 17 additions & 0 deletions unittest/GdtfUnittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ void GdtfUnittest::WriteFile()
IGdtfWheelSlotAnimationSystemPtr gdtfAnimationSystem;
__checkVCOM(wheelSlotContainer->CreateAnimationSystem(1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0 /*radius*/, &gdtfAnimationSystem));

// Set media content attributes (Spec PR #305)
__checkVCOM(wheelSlotContainer->SetDuration(12.345));
__checkVCOM(wheelSlotContainer->SetWidth(1920));
__checkVCOM(wheelSlotContainer->SetHeight(1080));
__checkVCOM(wheelSlotContainer->SetFPS(30));

// Set Filter link
__checkVCOM(wheelSlotContainer->SetFilter(gdtfFilter));
Expand Down Expand Up @@ -671,6 +676,18 @@ void GdtfUnittest::ReadFile()

}

// Media content attributes (Spec PR #305)
double duration = 0.0;
size_t width = 0, height = 0, fps = 0;
__checkVCOM(gdtfSlot->GetDuration(duration));
__checkVCOM(gdtfSlot->GetWidth(width));
__checkVCOM(gdtfSlot->GetHeight(height));
__checkVCOM(gdtfSlot->GetFPS(fps));
this->checkifEqual("GetWheelSlotDuration ", duration, 12.345);
this->checkifEqual("GetWheelSlotWidth ", width, size_t(1920));
this->checkifEqual("GetWheelSlotHeight ", height, size_t(1080));
this->checkifEqual("GetWheelSlotFPS ", fps, size_t(30));

} // WheelSlot loop
}
} // Wheels loop
Expand Down
Loading