Commit 84632744 authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

Fixed bug that caused the shadow buffer to be incorrectly applied in case the...

Fixed bug that caused the shadow buffer to be incorrectly applied in case the shadows were turned off at startup. Updated the Windows installer to include the new panel toggle icons.
parent 4f00822b
......@@ -981,10 +981,6 @@ void CalculateLightPos (VisPersist * psVisData) {
}
void RenderShadow (VisPersist * psVisData) {
/* Matrix4 * pmLightTransform;*/
/* int nCol;*/
/* int nRow;*/
CalculateLightPos (psVisData);
glLoadIdentity ();
......@@ -994,22 +990,9 @@ void RenderShadow (VisPersist * psVisData) {
glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
if (psVisData->boShadow) {
/* pmLightTransform = GetLightTransform (psVisData->psShadowData);*/
/* glGetFloatv (GL_MODELVIEW_MATRIX, psVisData->mModelShadow.afM);*/
/* glGetFloatv (GL_PROJECTION_MATRIX, psVisData->mProjectionShadow.afM);*/
/* MultMatrixMatrix4 (pmLightTransform, & psVisData->mProjectionShadow, & psVisData->mModelShadow);*/
/* for (nCol = 0; nCol < 4; nCol++) {*/
/* for (nRow = 0; nRow < 4; nRow++) {*/
/* pmLightTransform->aafM[nCol][nRow] = (nCol == nRow);*/
/* }*/
/* }*/
SetLightTransformMatrix (psVisData);
//glGetDoublev (GL_MODELVIEW_MATRIX, psVisData->afModel);
//glGetDoublev (GL_PROJECTION_MATRIX, psVisData->afProjection);
//glGetIntegerv (GL_VIEWPORT, psVisData->anViewPort);
SetLightTransformMatrix (psVisData);
if (psVisData->boShadow) {
// Draw the graph axes
if (psVisData->boDrawAxes) {
glDisable (GL_CULL_FACE);
......
......@@ -2,79 +2,85 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="FunctyAssetsFolder">
<Component Id="functy.ui" Guid="{3DE9B1F8-2B90-47B7-ABFF-995C0CC03B6F}">
<Component Id="functy.ui" Guid="{1718FABD-0105-4938-B8C6-71D7E8AA87CE}">
<File Id="functy.ui" KeyPath="yes" Source="$(var.AssetsDir)\functy.ui" />
</Component>
<Directory Id="icons" Name="icons">
<Component Id="export_anim.png" Guid="{B505173A-5B92-4918-834C-24D209E80A6F}">
<Component Id="export_anim.png" Guid="{47AF6037-4433-43D8-84F5-E77F1E6B7ABA}">
<File Id="export_anim.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-anim.png" />
</Component>
<Component Id="export_model.png" Guid="{7B2429BE-5F3B-43EB-9B05-25EB70C67EF0}">
<Component Id="export_model.png" Guid="{B0585285-E08A-4828-9647-3C3AAC853B09}">
<File Id="export_model.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-model.png" />
</Component>
<Component Id="functy.png" Guid="{5FE0B2FF-8A21-4EB3-84C4-BAD00203B5C5}">
<Component Id="functy.png" Guid="{C741C0A2-0416-4034-97B6-BECF85388C01}">
<File Id="functy.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\functy.png" />
</Component>
<Component Id="new_cartesian.png" Guid="{DF25B147-E778-44B2-9E52-FFD08038D8DC}">
<Component Id="new_cartesian.png" Guid="{664876C3-4211-4D6C-8F9A-12063B875805}">
<File Id="new_cartesian.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-cartesian.png" />
</Component>
<Component Id="new_curve.png" Guid="{2796F68E-9185-4DB5-832C-F4F40FD2659A}">
<Component Id="new_curve.png" Guid="{1CFF0F9E-A466-4361-ABAF-5028A16D01A2}">
<File Id="new_curve.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-curve.png" />
</Component>
<Component Id="new_spherical.png" Guid="{4629ACCD-7211-466B-9924-13959681D879}">
<Component Id="new_spherical.png" Guid="{3A4822CA-4AD4-4CD9-BAA2-D6678CA3D8F0}">
<File Id="new_spherical.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-spherical.png" />
</Component>
<Component Id="panel_bottom.png" Guid="{DE381319-47E9-4FC2-BC86-6C55C576A952}">
<File Id="panel_bottom.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\panel-bottom.png" />
</Component>
<Component Id="panel_left.png" Guid="{0D3B14F3-3F4E-4386-B0F4-FF63DF6D9D84}">
<File Id="panel_left.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\panel-left.png" />
</Component>
</Directory>
<Directory Id="shaders" Name="shaders">
<Component Id="cartesian_shadow.fs" Guid="{DEF2AB04-257F-427B-B7D3-D55CE5BAA291}">
<Component Id="cartesian_shadow.fs" Guid="{D43A5687-5D15-4FB7-9F19-27CB747EC498}">
<File Id="cartesian_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.fs" />
</Component>
<Component Id="cartesian_shadow.vs" Guid="{C20B6B3C-441A-4316-9C3B-5F4D49B12449}">
<Component Id="cartesian_shadow.vs" Guid="{7DAC6BF0-AF8C-40D6-A76C-9D323060E29F}">
<File Id="cartesian_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.vs" />
</Component>
<Component Id="cartesian.fs" Guid="{64C24C10-200C-431D-9FF6-BC71DDC8B0F5}">
<Component Id="cartesian.fs" Guid="{62ACC012-D17A-4B70-A0B2-D1A531977818}">
<File Id="cartesian.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.fs" />
</Component>
<Component Id="cartesian.vs" Guid="{45BCBE9C-E24F-4A45-8336-2F0BAE151106}">
<Component Id="cartesian.vs" Guid="{A1CFA491-5AC5-4832-BDFB-B191EB45E2FA}">
<File Id="cartesian.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.vs" />
</Component>
<Component Id="curve_shadow.fs" Guid="{7797E015-A921-4155-9A8F-EA57735B4C6E}">
<Component Id="curve_shadow.fs" Guid="{8A34A407-19A9-4307-9E2B-107A7BC0D8D8}">
<File Id="curve_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.fs" />
</Component>
<Component Id="curve_shadow.vs" Guid="{9238464E-A0A3-40CE-900F-C93963F2FBBE}">
<Component Id="curve_shadow.vs" Guid="{B6CC05B2-3026-4D69-AD19-0845F177299B}">
<File Id="curve_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.vs" />
</Component>
<Component Id="curve.fs" Guid="{018F3A9A-CA4A-431E-B644-F3D45EDCDB65}">
<Component Id="curve.fs" Guid="{D80E51E3-C3B0-48D1-A019-E031874C0FC4}">
<File Id="curve.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.fs" />
</Component>
<Component Id="curve.vs" Guid="{C7DC18F8-A083-49BD-A9DF-C518DFC57DC2}">
<Component Id="curve.vs" Guid="{A89ABAAA-8EF2-452E-8194-C2CF50BB5E22}">
<File Id="curve.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.vs" />
</Component>
<Component Id="depth.fs" Guid="{947B178D-BD71-4FFA-BCFC-35842D926191}">
<Component Id="depth.fs" Guid="{D5251F94-7CB3-4E20-AC13-0623FD4AF4F2}">
<File Id="depth.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.fs" />
</Component>
<Component Id="depth.vs" Guid="{38EED069-C47E-4A85-970F-B26B1402C689}">
<Component Id="depth.vs" Guid="{7DE9ED08-4374-4658-B3CE-F1A8B6B3C880}">
<File Id="depth.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.vs" />
</Component>
<Component Id="screen.fs" Guid="{CFFB9C5A-24B9-4A1C-B5D2-7D7908F593A0}">
<Component Id="screen.fs" Guid="{A4129AA1-5352-47E0-A63C-3B71CC97EB93}">
<File Id="screen.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.fs" />
</Component>
<Component Id="screen.vs" Guid="{3CD2C201-A2BA-4656-8DD5-94D972242D6F}">
<Component Id="screen.vs" Guid="{E11FB62F-6EBE-4A8A-8037-DDB4E45A77CC}">
<File Id="screen.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.vs" />
</Component>
<Component Id="spherical_shadow.fs" Guid="{53B63729-6E47-4752-9159-CE57C6B8BCEC}">
<Component Id="spherical_shadow.fs" Guid="{69909A17-D7DD-4709-A4F1-C76F026C8ECC}">
<File Id="spherical_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.fs" />
</Component>
<Component Id="spherical_shadow.vs" Guid="{3195C549-D32A-4808-92A0-2E238B438528}">
<Component Id="spherical_shadow.vs" Guid="{79E82100-6E54-467B-8B9A-4BAE97B606AA}">
<File Id="spherical_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.vs" />
</Component>
<Component Id="spherical.fs" Guid="{4739BA0F-ADA0-4028-9FCC-6030A071CC1C}">
<Component Id="spherical.fs" Guid="{B24AE53C-B092-4239-84A5-559636D95E0D}">
<File Id="spherical.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.fs" />
</Component>
<Component Id="spherical.vs" Guid="{50B124FD-86AE-49B1-975D-64273283C50B}">
<Component Id="spherical.vs" Guid="{24ABD582-9499-4967-B376-05FE41C13E35}">
<File Id="spherical.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.vs" />
</Component>
</Directory>
......@@ -91,6 +97,8 @@
<ComponentRef Id="new_cartesian.png" />
<ComponentRef Id="new_curve.png" />
<ComponentRef Id="new_spherical.png" />
<ComponentRef Id="panel_bottom.png" />
<ComponentRef Id="panel_left.png" />
<ComponentRef Id="cartesian_shadow.fs" />
<ComponentRef Id="cartesian_shadow.vs" />
<ComponentRef Id="cartesian.fs" />
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment