TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 15:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sequence timing options.

Browse source 
This commit deals with the problem that the keyframe timestamps are not standardized. Seconds, milliseconds and ticks are used depending on the import format. There is no metadata or property that specifies the format used, so the option is exposed to the user as part of the import options gui.
This commit is contained in:
OTHGMars 2019-04-22 06:52:59 -04:00
parent a75116e6aa
commit 98c22d0f1b
6 changed files with 263 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

116
Templates/BaseGame/game/tools/gui/assimpImport.ed.gui
View file

@ -393,6 +393,107 @@
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Animation Timing:";
maxLength = "1024";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "ToolsGuiTextRightProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "10 311";
Extent = "85 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
new GuiPopUpMenuCtrl() {
maxPopupHeight = "200";
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
maxLength = "1024";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "100 310";
Extent = "86 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Select the timing units used in the animation data.";
hovertime = "1000";
internalName = "animTiming";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "FPS:";
maxLength = "1024";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "ToolsGuiTextRightProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "200 311";
Extent = "20 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
new GuiTextEditCtrl() {
historySize = "0";
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
passwordMask = "*";
text = "2";
maxLength = "1024";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "225 310";
Extent = "26 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Frames per second for all animations when Animation Timing type is Frames (5 - 60)";
hovertime = "1000";
internalName = "animFPS";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "LOD";
maxLength = "1024";
@ -665,6 +766,10 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd)
$Assimp::FindDegenerates = true;
$Assimp::FindInvalidData = true;
$Assimp::JoinIdenticalVertices = true;
$Assimp::FlipNormals = false;
$Assimp::AnimTiming = 1; // Seconds
$Assimp::AnimFPS = 30; // Framerate when timing is frames.
}
%this-->upAxis.clear();
@ -678,9 +783,15 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd)
%this-->lodType.add("SingleSize", 1);
%this-->lodType.add("TrailingNumber", 2);
%this-->lodType.setSelected($Assimp::lodType);
%this-->singleDetailSize.text = $Assimp::singleDetailSize;
%this-->animTiming.clear();
%this-->animTiming.add("Frames", 0);
%this-->animTiming.add("Seconds", 1);
%this-->animTiming.add("Milliseconds", 1000);
%this-->animTiming.setSelected($Assimp::AnimTiming);
%this-->animFPS.text = $Assimp::AnimFPS;
//Triangulate is a default(currently mandatory) behavior
$Assimp::Triangulate = true;
@ -703,6 +814,9 @@ function AssimpImportDlg::onOK(%this)
$Assimp::lodType = %this-->lodType.getSelected();
$Assimp::singleDetailSize = %this-->singleDetailSize.getText();
$Assimp::AnimTiming = %this-->animTiming.getSelected();
$Assimp::AnimFPS = %this-->animFPS.getText();
// Load the shape (always from the DAE)
$assimp::forceLoad = true;
eval(%this.cmd);