Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
5c490b9
Updated LICENSE to Apache 2.
May 14, 2015
a4a0be4
Merged changes from LD32 (mostly Emscripten audio among other things)…
Jun 11, 2015
e870e4d
Greatly improved logging for most types, and added colour to logging …
Jun 12, 2015
12740c9
Changed Sparky-core to build as a static library, added Sandbox proje…
Jun 13, 2015
81e5e78
Deleted floating Sandbox.exe in wrong folder.
Jun 13, 2015
e6f6e53
Added masking, added ShaderFactory, added creating shaders from strin…
Jul 1, 2015
eacbc73
Added proper OpenAL dll files.
Jul 2, 2015
e25c072
Added resource embedding support and embedded default font. Also you …
Jul 2, 2015
9a5f9e5
Rewrote masking to actual be good. Also minor fixes and improvements.
Jul 2, 2015
e8620db
Added logging to_string for unsigned char const* (for OpenGL strings …
Jul 10, 2015
e7a776c
Added Framebuffer support and render targets to BatchRenderer2D
Jul 15, 2015
4e1fffd
The great refactoring of mid-2015. Also introduced platforms.
Jul 16, 2015
2803b94
Created the Application class, currently with Win32 support; switched…
Aug 18, 2015
1954e54
Fix for file names (1/2)
Aug 19, 2015
d337ab1
Fix for file names (2/2)
Aug 19, 2015
d7da311
- Added post effects
Sep 15, 2015
347afe0
Added semi-minimal port of ChernoCraft as example project, along with…
Sep 26, 2015
6e32e1a
Added Box2D to Solution.
Sep 26, 2015
93c639d
- Added Event system
Oct 15, 2015
78509ab
- Separated OpenGL calls into platform
Nov 25, 2015
6cd4c25
Refactoring: "sparky" namespace is now "sp". All std::string replaced…
Nov 25, 2015
6a20cd6
Faster string split function.
Nov 26, 2015
27c773a
Rewrote shader system to use single shader files. ShaderFactory also …
Nov 26, 2015
23021d3
- Sparky now supports 3D Rendering!
Dec 4, 2015
a724a51
Added basic OBJ model loading into Model class.
Dec 7, 2015
55d768d
Implemented Material Instances. Example in Sandbox (Test3D).
Dec 7, 2015
a42325a
- Added component-based Entity system, along with many 3D renderer ch…
Dec 15, 2015
9bc7533
Renamed logging macros, and rewrote SP_ASSERT macro.
Dec 15, 2015
65e4a8c
Restructured entire project:
Dec 20, 2015
da7f3ba
Deleted old files from last commit.
Dec 20, 2015
bca1b1a
Deleted some old projects.
Dec 20, 2015
3d902e2
Deleted Debug directory from root folder.
Dec 20, 2015
2781ac9
Made Sandbox the default startup project.
Dec 21, 2015
54feaa1
Updated gitignore and added Cube and Sphere model files.
Dec 21, 2015
811f104
Added planes to MeshFactory, and Quaternions can now convert to Euler…
Dec 21, 2015
2a9c7e5
Updated Test3D, removed 'Solution Items' from solution explorer, and …
Dec 21, 2015
49d4a59
Setup Sparky-core project filters properly + general project clean up.
Dec 22, 2015
f99607d
- Added overlay layers
Dec 22, 2015
026d95f
Making the Event System actually work, plus some DebugLayer beginnings.
Dec 26, 2015
c072b85
Fixed CreateBuffer() OpenGL function.
Dec 26, 2015
00e18e6
More events and debug layer stuff.
Dec 26, 2015
02c660a
- Rewrote Input system
Jan 4, 2016
a0de3f6
More Debug Menu initial stuff.
Jan 5, 2016
e59b1dd
- Added UI system
Jan 9, 2016
ff3e771
Added Sparky logo images and updated readme.
Jan 11, 2016
612f7ca
Added Lights and LightSetups (WIP). Test3D now contains a little ligh…
Jan 19, 2016
1b6f738
Sparky March 2016 Release (Alpha)
Mar 31, 2016
c7b0345
Fix AdvancedLighting shader compilation error
tgsm Apr 1, 2016
95a4985
Merge pull request #71 from tgsm/shader-fix
Apr 1, 2016
b4e2fc8
Sponza scene
klukule Apr 4, 2016
06fb955
- Updated Sandbox project
Apr 5, 2016
001fcf1
Fixed Test3D.
Apr 5, 2016
e1f1441
Delete ipch
tgsm Apr 6, 2016
34751a5
Added dynamic shader reloading to DirectX.
Ilohama Apr 6, 2016
fbf1b52
Changed integer typedefs to C++ standard.
TheChernoProj Apr 10, 2016
4370021
Fixed an error where xcopy fails due to a space in $(SolutionDir) (#86)
jannisj1 Apr 11, 2016
86713a2
Merged from vfs branch.
Apr 13, 2016
15ea981
Merge branch 'master' of http://github.com/TheCherno/Sparky
Apr 13, 2016
b895a2e
Fixed normal map sampling comedy in PBR shader for DirectX.
Apr 13, 2016
3a83bba
Updated DXTexture2D.cpp to support Mip Mapping (#89)
tstr Apr 13, 2016
443093f
Fixed Win32FileSystem file handle not being closed.
Apr 15, 2016
48833ba
Win32FileSystem improvements.
Apr 15, 2016
d47c713
Fixed Win32FileSystem not closing file handle AGAIN.
Apr 15, 2016
aa2d8f7
Added font metrics. Debug Menu now chooses a width based on its items.
Apr 15, 2016
42a8de8
OpenGL PBR shader fixes.
Apr 15, 2016
6b33d70
Added wide chars to Log.
Apr 18, 2016
88c76a2
DXRenderer now prints basic GPU info on initialization.
Apr 18, 2016
1a7f9d4
Visual Studio 2015 Update 2 fixes.
Apr 18, 2016
24cfcf9
- Build configuration and platform are now available at runtime via t…
Apr 18, 2016
5d05a2f
Debug Layer stats are now properly right-aligned when rendered.
Apr 20, 2016
19533e3
- Added vsync support to Sparky
Apr 20, 2016
730b45b
Fixed solution build configurations.
Apr 27, 2016
ddf6a4e
Added appveyor.yml for AppVeyor CI.
Apr 27, 2016
429f714
Updated .gitignore
Apr 27, 2016
e79a25d
Updated README with build status badge.
Apr 27, 2016
5dee93a
Changed build status in read me to only show master branch status.
May 11, 2016
f7e5e99
Removed notifications from AppVeyor CI (too many emails!)
May 17, 2016
8a49d87
D3D11 Debug Layer is now toggleable - enabled by default.
May 30, 2016
be694f9
Memory allocation/deallocation fixes.
Jun 15, 2016
9638b3d
Added Scene2D.
Jun 15, 2016
46c8ce8
Organised Sparky-core VS filters.
Jun 15, 2016
4decf4a
Fixed warning re-enabling in Memory.h
Jun 15, 2016
f203637
Fixed font atlases never being marked clean after being updated.
Jul 13, 2016
fe7a20f
Initial 2D physics work.
Jul 20, 2016
5ab7300
Added directories and paths to the Debug Menu.
Jul 20, 2016
1de156f
Less allocating.
Jul 20, 2016
69a89ca
- Added directory support to DebugMenu::Remove
Jul 21, 2016
c21f336
Partial merge from 'Physics2D'
Jul 21, 2016
6ccb02c
Added text alignment to Labels, and tidied up some code here and there.
Jul 21, 2016
b12a7f1
Added Custom Actions to the Debug Menu.
Jul 21, 2016
fbbc887
Missed a file...
Jul 21, 2016
f7de41b
Entity now stores components in a map.
Oct 11, 2016
fb19855
Test2D cleanup.
Oct 11, 2016
46b4c2b
BatcbRenderer2D is now Renderer2D.
Oct 11, 2016
be13109
Fixed incorrect application update timer.
Oct 11, 2016
a679d08
Fix mat4 rotation bug (#127)
Crisspl Dec 12, 2016
1c9872a
Updated projects target
L4ZZA Mar 17, 2019
6d33b2a
Fixed broken includes paths
L4ZZA Mar 17, 2019
e61b669
Updated git ignore
L4ZZA Mar 17, 2019
1af85b3
Temporary fix for CLI just to compile solution
L4ZZA Mar 17, 2019
a4a3296
Ignoring and stopped tracking filters
L4ZZA Mar 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 19 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
*.ilk
*.pdb
*.obj
*.log
*.idb
*.exp
*.iobj
*.ipdb
*.tlog
*.tlog/
*.lastbuildstate

*.sdf
*.user
*.user
*.suo

Intermediates/
ipch/

.vs/

# Intermediates
obj/

# Binaries
bin/*
!Web/*
!*.js
*.filters
184 changes: 184 additions & 0 deletions Dependencies/Box2D/Box2D.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" 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>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BCE9869C-CDE3-4935-99AB-4522493CE0B3}</ProjectGuid>
<RootNamespace>Box2D</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\$(Configuration)\Intermediates\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\$(Configuration)\Intermediates\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>src;</AdditionalIncludeDirectories>
<BrowseInformation>true</BrowseInformation>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Bscmake>
<PreserveSbr>true</PreserveSbr>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<AdditionalIncludeDirectories>src;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="src\Box2D.h" />
<ClInclude Include="src\Collision\b2BroadPhase.h" />
<ClInclude Include="src\Collision\b2Collision.h" />
<ClInclude Include="src\Collision\b2Distance.h" />
<ClInclude Include="src\Collision\b2DynamicTree.h" />
<ClInclude Include="src\Collision\b2TimeOfImpact.h" />
<ClInclude Include="src\Collision\Shapes\b2ChainShape.h" />
<ClInclude Include="src\Collision\Shapes\b2CircleShape.h" />
<ClInclude Include="src\Collision\Shapes\b2EdgeShape.h" />
<ClInclude Include="src\Collision\Shapes\b2PolygonShape.h" />
<ClInclude Include="src\Collision\Shapes\b2Shape.h" />
<ClInclude Include="src\Common\b2BlockAllocator.h" />
<ClInclude Include="src\Common\b2Draw.h" />
<ClInclude Include="src\Common\b2GrowableStack.h" />
<ClInclude Include="src\Common\b2Math.h" />
<ClInclude Include="src\Common\b2Settings.h" />
<ClInclude Include="src\Common\b2StackAllocator.h" />
<ClInclude Include="src\Common\b2Timer.h" />
<ClInclude Include="src\Dynamics\b2Body.h" />
<ClInclude Include="src\Dynamics\b2ContactManager.h" />
<ClInclude Include="src\Dynamics\b2Fixture.h" />
<ClInclude Include="src\Dynamics\b2Island.h" />
<ClInclude Include="src\Dynamics\b2TimeStep.h" />
<ClInclude Include="src\Dynamics\b2World.h" />
<ClInclude Include="src\Dynamics\b2WorldCallbacks.h" />
<ClInclude Include="src\Dynamics\Contacts\b2ChainAndCircleContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2CircleContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2Contact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2ContactSolver.h" />
<ClInclude Include="src\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
<ClInclude Include="src\Dynamics\Contacts\b2PolygonContact.h" />
<ClInclude Include="src\Dynamics\Joints\b2DistanceJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2FrictionJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2GearJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2Joint.h" />
<ClInclude Include="src\Dynamics\Joints\b2MotorJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2MouseJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2PrismaticJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2PulleyJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2RevoluteJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2RopeJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2WeldJoint.h" />
<ClInclude Include="src\Dynamics\Joints\b2WheelJoint.h" />
<ClInclude Include="src\Rope\b2Rope.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\Collision\b2BroadPhase.cpp" />
<ClCompile Include="src\Collision\b2CollideCircle.cpp" />
<ClCompile Include="src\Collision\b2CollideEdge.cpp" />
<ClCompile Include="src\Collision\b2CollidePolygon.cpp" />
<ClCompile Include="src\Collision\b2Collision.cpp" />
<ClCompile Include="src\Collision\b2Distance.cpp" />
<ClCompile Include="src\Collision\b2DynamicTree.cpp" />
<ClCompile Include="src\Collision\b2TimeOfImpact.cpp" />
<ClCompile Include="src\Collision\Shapes\b2ChainShape.cpp" />
<ClCompile Include="src\Collision\Shapes\b2CircleShape.cpp" />
<ClCompile Include="src\Collision\Shapes\b2EdgeShape.cpp" />
<ClCompile Include="src\Collision\Shapes\b2PolygonShape.cpp" />
<ClCompile Include="src\Common\b2BlockAllocator.cpp" />
<ClCompile Include="src\Common\b2Draw.cpp" />
<ClCompile Include="src\Common\b2Math.cpp" />
<ClCompile Include="src\Common\b2Settings.cpp" />
<ClCompile Include="src\Common\b2StackAllocator.cpp" />
<ClCompile Include="src\Common\b2Timer.cpp" />
<ClCompile Include="src\Dynamics\b2Body.cpp" />
<ClCompile Include="src\Dynamics\b2ContactManager.cpp" />
<ClCompile Include="src\Dynamics\b2Fixture.cpp" />
<ClCompile Include="src\Dynamics\b2Island.cpp" />
<ClCompile Include="src\Dynamics\b2World.cpp" />
<ClCompile Include="src\Dynamics\b2WorldCallbacks.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2CircleContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2Contact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2ContactSolver.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
<ClCompile Include="src\Dynamics\Contacts\b2PolygonContact.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2DistanceJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2FrictionJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2GearJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2Joint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2MotorJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2MouseJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2PrismaticJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2PulleyJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2RevoluteJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2RopeJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2WeldJoint.cpp" />
<ClCompile Include="src\Dynamics\Joints\b2WheelJoint.cpp" />
<ClCompile Include="src\Rope\b2Rope.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
68 changes: 68 additions & 0 deletions Dependencies/Box2D/src/Box2D.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*/

#ifndef BOX2D_H
#define BOX2D_H

/**
\mainpage Box2D API Documentation

\section intro_sec Getting Started

For documentation please see http://box2d.org/documentation.html

For discussion please visit http://box2d.org/forum
*/

// These include files constitute the main Box2D API

#include <Common/b2Settings.h>
#include <Common/b2Draw.h>
#include <Common/b2Timer.h>

#include <Collision/Shapes/b2CircleShape.h>
#include <Collision/Shapes/b2EdgeShape.h>
#include <Collision/Shapes/b2ChainShape.h>
#include <Collision/Shapes/b2PolygonShape.h>

#include <Collision/b2BroadPhase.h>
#include <Collision/b2Distance.h>
#include <Collision/b2DynamicTree.h>
#include <Collision/b2TimeOfImpact.h>

#include <Dynamics/b2Body.h>
#include <Dynamics/b2Fixture.h>
#include <Dynamics/b2WorldCallbacks.h>
#include <Dynamics/b2TimeStep.h>
#include <Dynamics/b2World.h>

#include <Dynamics/Contacts/b2Contact.h>

#include <Dynamics/Joints/b2DistanceJoint.h>
#include <Dynamics/Joints/b2FrictionJoint.h>
#include <Dynamics/Joints/b2GearJoint.h>
#include <Dynamics/Joints/b2MotorJoint.h>
#include <Dynamics/Joints/b2MouseJoint.h>
#include <Dynamics/Joints/b2PrismaticJoint.h>
#include <Dynamics/Joints/b2PulleyJoint.h>
#include <Dynamics/Joints/b2RevoluteJoint.h>
#include <Dynamics/Joints/b2RopeJoint.h>
#include <Dynamics/Joints/b2WeldJoint.h>
#include <Dynamics/Joints/b2WheelJoint.h>

#endif
Loading