TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles

Browse source 
Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
This commit is contained in:
Azaezel 2014-12-16 18:48:28 -06:00
commit 98048fd974
11 changed files with 179 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Templates/Empty/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -442,7 +442,7 @@ $PE_guielement_ext_colorpicker = "18 18";
text = "";
};
};
new GuiControl(){ // Spacer ----------------------------
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
@ -543,6 +543,33 @@ $PE_guielement_ext_colorpicker = "18 18";
altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_EmitterEditor.updateAmountFields( true, $ThisControl.getValue() );";
};
};
new GuiControl(){ // Particle glow
isContainer = "1";
HorizSizing = "width";
VertSizing = "bottom";
Position = $PE_guielement_pos_single_container ;
Extent = $PE_guielement_ext_single_container ;
new GuiTextCtrl() {
Profile = "ToolsGuiTextProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = $PE_guielement_pos_name;
Extent = $PE_guielement_ext_checkbox_name;
text = "Glow";
};
new GuiCheckBoxCtrl() {
internalName = "PEE_glow";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = $PE_guielement_pos_checkbox;
Extent = $PE_guielement_ext_checkbox;
Command = "PE_EmitterEditor.updateEmitter( \"glow\", $ThisControl.getValue());";
text = "";
};
};
};// end stack
}; // end "basic" rollout
new GuiRolloutCtrl() {

2
Templates/Empty/game/tools/particleEditor/particleEmitterEditor.ed.cs
View file

@ -100,6 +100,8 @@ function PE_EmitterEditor::guiSync( %this )
PE_EmitterEditor-->PEE_reverseOrder.setValue( %data.reverseOrder );
PE_EmitterEditor-->PEE_useEmitterSizes.setValue( %data.useEmitterSizes );
PE_EmitterEditor-->PEE_useEmitterColors.setValue( %data.useEmitterColors );
PE_EmitterEditor-->PEE_glow.setValue( %data.glow );
// Sync up particle selectors.

29
Templates/Full/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -442,7 +442,7 @@ $PE_guielement_ext_colorpicker = "18 18";
text = "";
};
};
new GuiControl(){ // Spacer ----------------------------
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
@ -543,6 +543,33 @@ $PE_guielement_ext_colorpicker = "18 18";
altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_EmitterEditor.updateAmountFields( true, $ThisControl.getValue() );";
};
};
new GuiControl(){ // Particle glow
isContainer = "1";
HorizSizing = "width";
VertSizing = "bottom";
Position = $PE_guielement_pos_single_container ;
Extent = $PE_guielement_ext_single_container ;
new GuiTextCtrl() {
Profile = "ToolsGuiTextProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = $PE_guielement_pos_name;
Extent = $PE_guielement_ext_checkbox_name;
text = "Glow";
};
new GuiCheckBoxCtrl() {
internalName = "PEE_glow";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = $PE_guielement_pos_checkbox;
Extent = $PE_guielement_ext_checkbox;
Command = "PE_EmitterEditor.updateEmitter( \"glow\", $ThisControl.getValue());";
text = "";
};
};
};// end stack
}; // end "basic" rollout
new GuiRolloutCtrl() {

2
Templates/Full/game/tools/particleEditor/particleEmitterEditor.ed.cs
View file

@ -100,6 +100,8 @@ function PE_EmitterEditor::guiSync( %this )
PE_EmitterEditor-->PEE_reverseOrder.setValue( %data.reverseOrder );
PE_EmitterEditor-->PEE_useEmitterSizes.setValue( %data.useEmitterSizes );
PE_EmitterEditor-->PEE_useEmitterColors.setValue( %data.useEmitterColors );
PE_EmitterEditor-->PEE_glow.setValue( %data.glow );
// Sync up particle selectors.