Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Resources/shapefusion.rc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
1 VERSIONINFO
FILEVERSION 0, 5, 0, 0
PRODUCTVERSION 0, 5, 0, 0
FILEVERSION 0, 7, 0, 0
PRODUCTVERSION 0, 7, 0, 0
FILEFLAGSMASK 0
FILEOS 0x40000
FILETYPE 1
Expand Down
9 changes: 5 additions & 4 deletions Shapes/ShapesElements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1336,11 +1336,12 @@ BigEndianBuffer& ShapesChunk::SaveObject(BigEndianBuffer& buffer)
sequence_count = SequenceCount(),
i;
long sequence_table_offset,
sequence_offsets[sequence_count],
frame_table_offset,
frame_offsets[frame_count],
bitmap_table_offset,
bitmap_offsets[bitmap_count];
bitmap_table_offset;

std::vector<long> sequence_offsets(sequence_count);
std::vector<long> frame_offsets(frame_count);
std::vector<long> bitmap_offsets(bitmap_count);

// skip the collection definition, we'll fill it at the end
buffer.Position(SIZEOF_collection_definition);
Expand Down
2 changes: 1 addition & 1 deletion Shapes/ShapesView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,7 @@ void ShapesView::EditSequenceFields(wxCommandEvent &e)
if (v != sel_seq->FramesPerView()) {
int real_nov = ActualNumberOfViews(sel_seq->NumberOfViews()),
old_fpv = sel_seq->FramesPerView();
short old_indexes[real_nov * old_fpv];
std::vector<short> old_indexes(real_nov * old_fpv);

for (int i = 0; i < real_nov * old_fpv; i++)
old_indexes[i] = sel_seq->mFrameIndexes[i];
Expand Down
6 changes: 6 additions & 0 deletions VisualStudio/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.vs
*.vcxproj.user
Debug/
Release/
x64/
vcpkg_installed/
31 changes: 31 additions & 0 deletions VisualStudio/ShapesFusion.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31410.357
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShapesFusion", "ShapesFusion.vcxproj", "{DDD18372-3233-45FB-AFD7-8777CF441E87}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x64.ActiveCfg = Debug|x64
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x64.Build.0 = Debug|x64
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x86.ActiveCfg = Debug|Win32
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x86.Build.0 = Debug|Win32
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x64.ActiveCfg = Release|x64
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x64.Build.0 = Release|x64
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x86.ActiveCfg = Release|Win32
{DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B1D98722-2F72-4980-BEE1-1F0BD5FD48E8}
EndGlobalSection
EndGlobal
247 changes: 247 additions & 0 deletions VisualStudio/ShapesFusion.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{ddd18372-3233-45fb-afd7-8777cf441e87}</ProjectGuid>
<RootNamespace>ShapesFusion</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>true</VcpkgEnableManifest>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<VcpkgUseStatic>true</VcpkgUseStatic>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgUseStatic>true</VcpkgUseStatic>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgUseStatic>true</VcpkgUseStatic>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgUseStatic>true</VcpkgUseStatic>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\BigEndianBuffer.h" />
<ClInclude Include="..\DefaultNames.h" />
<ClInclude Include="..\GenericEndianBuffer.h" />
<ClInclude Include="..\LittleEndianBuffer.h" />
<ClInclude Include="..\Physics\PhysicsDocument.h" />
<ClInclude Include="..\Physics\PhysicsElements.h" />
<ClInclude Include="..\Physics\PhysicsTreeItemData.h" />
<ClInclude Include="..\Physics\PhysicsView.h" />
<ClInclude Include="..\Resources\resource.h" />
<ClInclude Include="..\ShapeFusionApp.h" />
<ClInclude Include="..\ShapeFusionDocManager.h" />
<ClInclude Include="..\ShapeFusionMain.h" />
<ClInclude Include="..\ShapeFusionMenus.h" />
<ClInclude Include="..\Shapes\BitmapBrowser.h" />
<ClInclude Include="..\Shapes\BitmapView.h" />
<ClInclude Include="..\Shapes\CTBrowser.h" />
<ClInclude Include="..\Shapes\CTView.h" />
<ClInclude Include="..\Shapes\FrameBrowser.h" />
<ClInclude Include="..\Shapes\FrameView.h" />
<ClInclude Include="..\Shapes\SequenceView.h" />
<ClInclude Include="..\Shapes\ShapesDocument.h" />
<ClInclude Include="..\Shapes\ShapesElements.h" />
<ClInclude Include="..\Shapes\ShapesTreeItemData.h" />
<ClInclude Include="..\Shapes\ShapesView.h" />
<ClInclude Include="..\Shapes\utilities.h" />
<ClInclude Include="..\Sounds\SoundsDocument.h" />
<ClInclude Include="..\Sounds\SoundsElements.h" />
<ClInclude Include="..\Sounds\SoundsView.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\BigEndianBuffer.cpp" />
<ClCompile Include="..\DefaultNames.cpp" />
<ClCompile Include="..\GenericEndianBuffer.cpp" />
<ClCompile Include="..\LittleEndianBuffer.cpp" />
<ClCompile Include="..\Physics\PhysicsDocument.cpp" />
<ClCompile Include="..\Physics\PhysicsEditor.cpp" />
<ClCompile Include="..\Physics\PhysicsElements.cpp" />
<ClCompile Include="..\Physics\PhysicsTreeItemData.cpp" />
<ClCompile Include="..\Physics\PhysicsView.cpp" />
<ClCompile Include="..\ShapeFusionApp.cpp" />
<ClCompile Include="..\ShapeFusionDocManager.cpp" />
<ClCompile Include="..\ShapeFusionMain.cpp" />
<ClCompile Include="..\ShapeFusionMenus.cpp" />
<ClCompile Include="..\Shapes\BitmapBrowser.cpp" />
<ClCompile Include="..\Shapes\BitmapView.cpp" />
<ClCompile Include="..\Shapes\CTBrowser.cpp" />
<ClCompile Include="..\Shapes\CTView.cpp" />
<ClCompile Include="..\Shapes\FrameBrowser.cpp" />
<ClCompile Include="..\Shapes\FrameView.cpp" />
<ClCompile Include="..\Shapes\SequenceView.cpp" />
<ClCompile Include="..\Shapes\ShapesDocument.cpp" />
<ClCompile Include="..\Shapes\ShapesElements.cpp" />
<ClCompile Include="..\Shapes\ShapesTreeItemData.cpp" />
<ClCompile Include="..\Shapes\ShapesView.cpp" />
<ClCompile Include="..\Shapes\utilities.cpp" />
<ClCompile Include="..\Sounds\SoundsDocument.cpp" />
<ClCompile Include="..\Sounds\SoundsElements.cpp" />
<ClCompile Include="..\Sounds\SoundsView.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Resources\shapefusion.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\Resources\shapefusion.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading