lolengine
/
lol
mirror of https://github.com/lolengine/lol
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

gpu: fix the Direct3D version of most rendering functions.

legacy
Sam Hocevar sam 11 years ago
parent
5f72c16f60
commit
068a328651
5 changed files with 335 additions and 322 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +14
    -14
      src/gpu/renderer.cpp
  2. +5
    -3
      src/gpu/texture.cpp
  3. +2
    -2
      src/lol/gpu/renderer.h
  4. +298
    -299
      src/lolcore.vcxproj
  5. +16
    -4
      src/lolcore.vcxproj.filters

+ 14
- 14
src/gpu/renderer.cpp View File

@@ -114,9 +114,9 @@ Renderer::Renderer(ivec2 size)
d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;

HRESULT hr = VideoData::d3d_ctx->CreateDevice(0, D3DDEVTYPE_HAL, g_hwnd,
D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp, &m_data->m_d3d_dev);
HRESULT hr = m_data->m_d3d_ctx->CreateDevice(0, D3DDEVTYPE_HAL, g_hwnd,
D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp, &m_data->m_d3d_dev);
if (FAILED(hr))
{
Log::Error("cannot create D3D device\n");
@@ -157,7 +157,7 @@ Renderer::Renderer(ivec2 size)
SetDepthFunc(DepthFunc::LessOrEqual);

m_data->m_cull_mode = CullMode::Disabled;
SetCullMode(CullMode::CounterClockwise);
SetCullMode(CullMode::Clockwise);

m_data->m_polygon_mode = PolygonMode::Point;
SetPolygonMode(PolygonMode::Fill);
@@ -204,8 +204,8 @@ void Renderer::Clear(ClearMask mask)
vec3 tmp = 255.999f * GetClearColor().rgb;
D3DCOLOR clear_color = D3DCOLOR_XRGB((int)tmp.r, (int)tmp.g, (int)tmp.b);

if (FAILED(VideoData::d3d_dev->Clear(0, nullptr, m, clear_color,
g_renderer->GetClearDepth(), 0)))
if (FAILED(m_data->m_d3d_dev->Clear(0, nullptr, m, clear_color,
GetClearDepth(), 0)))
Abort();
#else
GLbitfield m = 0;
@@ -398,7 +398,7 @@ void Renderer::SetBlendFunc(BlendFunc src, BlendFunc dst)
return;

#if defined USE_D3D9 || defined _XBOX
enum D3DBLEND s1[2] = { D3DBLEND_ONE, D3DBLEND_ZERO };
D3DBLEND s1[2] = { D3DBLEND_ONE, D3DBLEND_ZERO };
BlendFunc s2[2] = { src, dst };

for (int i = 0; i < 2; ++i)
@@ -429,16 +429,16 @@ void Renderer::SetBlendFunc(BlendFunc src, BlendFunc dst)
s1[i] = D3DBLEND_INVDESTALPHA; break;
/* FiXME: these can be supported using D3DPBLENDCAPS_BLENDFACTOR */
case BlendFunc::ConstantColor:
assert(0, "BlendFunc::ConstantColor not supported");
ASSERT(0, "BlendFunc::ConstantColor not supported");
break;
case BlendFunc::OneMinusConstantColor:
assert(0, "BlendFunc::OneMinusConstantColor not supported");
ASSERT(0, "BlendFunc::OneMinusConstantColor not supported");
break;
case BlendFunc::ConstantAlpha:
assert(0, "BlendFunc::ConstantAlpha not supported");
ASSERT(0, "BlendFunc::ConstantAlpha not supported");
break;
case BlendFunc::OneMinusConstantAlpha:
assert(0, "BlendFunc::OneMinusConstantAlpha not supported");
ASSERT(0, "BlendFunc::OneMinusConstantAlpha not supported");
break;
}
}
@@ -630,12 +630,12 @@ void Renderer::SetCullMode(CullMode mode)
break;
case CullMode::Clockwise:
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
glCullFace(GL_FRONT);
glFrontFace(GL_CW);
break;
case CullMode::CounterClockwise:
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
glCullFace(GL_FRONT);
glFrontFace(GL_CCW);
break;
}
@@ -668,7 +668,7 @@ void Renderer::SetPolygonMode(PolygonMode mode)
m_data->m_d3d_dev->SetRenderState(D3DRS_FILLMODE, D3DFILL_WIREFRAME);
break;
case PolygonMode::Fill:
m_data->m_d3d_dev->SetRenderState(D3DRS_FILLMODE, D3DCULL_SOLID);
m_data->m_d3d_dev->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
break;
}
#elif defined __CELLOS_LV2__ || defined GL_VERSION_1_1


+ 5
- 3
src/gpu/texture.cpp View File

@@ -90,7 +90,7 @@ Texture::Texture(ivec2 size, PixelFormat format)
/* FIXME: this is all mixed up for the RGBA/ARGB combinations */
# if defined USE_D3D9
{ D3DFMT_R8G8B8, 3 }, /* RGB_8 */
{ D3DFMT_UNKNOWN, 0 }, /* RGBA_8 */
{ D3DFMT_A8R8G8B8, 4 }, /* RGBA_8 */
{ D3DFMT_A8R8G8B8, 4 }, /* ARGB_8 */
{ D3DFMT_UNKNOWN, 0 }, /* ABGR_8 */
{ D3DFMT_L8, 1 }, /* Y8 */
@@ -105,6 +105,8 @@ Texture::Texture(ivec2 size, PixelFormat format)
};

D3DFORMAT d3d_format = GET_CLAMPED(d3d_formats, format).format;
ASSERT(d3d_format != D3DFMT_UNKNOWN,
"unsupported texture format %d\n", format);
# if defined USE_D3D9
int d3d_usage = D3DUSAGE_DYNAMIC;
# else
@@ -112,8 +114,8 @@ Texture::Texture(ivec2 size, PixelFormat format)
# endif

m_data->m_dev->CreateTexture(m_data->m_size.x, m_data->m_size.y, 1,
d3d_usage, d3d_format,
D3DPOOL_DEFAULT, &m_data->m_texture, nullptr);
d3d_usage, d3d_format,
D3DPOOL_DEFAULT, &m_data->m_texture, nullptr);
m_data->m_bytes_per_elem = GET_CLAMPED(d3d_formats, format).bytes;
#else
static struct


+ 2
- 2
src/lol/gpu/renderer.h View File

@@ -154,11 +154,11 @@ private:
Renderer(ivec2 size);
~Renderer();

void *GetDevice();

public:
void Clear(ClearMask mask);

void *GetDevice();

public:
void SetViewport(ibox2 viewport);
ibox2 GetViewport() const;


+ 298
- 299
src/lolcore.vcxproj View File

@@ -1,299 +1,298 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Xbox 360">
<Configuration>Debug</Configuration>
<Platform>Xbox 360</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Xbox 360">
<Configuration>Release</Configuration>
<Platform>Xbox 360</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
<ConfigurationType>StaticLibrary</ConfigurationType>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(SolutionDir)\Lol.Core.Config.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
<Import Project="$(SolutionDir)\Lol.Fx.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)\Lol.Core.Vars.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="$(SolutionDir)\Lol.Core.Rules.props" />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="application\application.cpp" />
<ClCompile Include="audio.cpp" />
<ClCompile Include="camera.cpp" />
<ClCompile Include="base\assert.cpp" />
<ClCompile Include="base\hash.cpp" />
<ClCompile Include="base\log.cpp" />
<ClCompile Include="base\string.cpp" />
<ClCompile Include="debug\fps.cpp" />
<ClCompile Include="debug\lines.cpp" />
<ClCompile Include="debug\record.cpp" />
<ClCompile Include="debug\stats.cpp" />
<ClCompile Include="dict.cpp" />
<ClCompile Include="easymesh\csgbsp.cpp" />
<ClCompile Include="easymesh\easymesh-compiler.cpp" />
<ClCompile Include="easymesh\easymesh.cpp" />
<ClCompile Include="eglapp.cpp" />
<ClCompile Include="emitter.cpp" />
<ClCompile Include="entity.cpp" />
<ClCompile Include="font.cpp" />
<ClCompile Include="forge.cpp" />
<ClCompile Include="generated\easymesh-parser.cpp" />
<ClCompile Include="generated\easymesh-scanner.cpp" />
<ClCompile Include="generated\lolfx-parser.cpp" />
<ClCompile Include="generated\lolfx-scanner.cpp" />
<ClCompile Include="gpu\framebuffer.cpp" />
<ClCompile Include="gpu\indexbuffer.cpp" />
<ClCompile Include="gpu\lolfx-compiler.cpp" />
<ClCompile Include="gpu\lolfx.cpp" />
<ClCompile Include="gpu\rendercontext.cpp" />
<ClCompile Include="gpu\renderer.cpp" />
<ClCompile Include="gpu\shader.cpp" />
<ClCompile Include="gpu\texture.cpp" />
<ClCompile Include="gpu\vertexbuffer.cpp" />
<ClCompile Include="gradient.cpp" />
<ClCompile Include="image\codec\android-image.cpp" />
<ClCompile Include="image\codec\dummy-image.cpp" />
<ClCompile Include="image\codec\gdiplus-image.cpp" />
<ClCompile Include="image\codec\ios-image.cpp" />
<ClCompile Include="image\codec\ps3-image.cpp" />
<ClCompile Include="image\codec\sdl-image.cpp" />
<ClCompile Include="image\color\cie1931.cpp" />
<ClCompile Include="image\image.cpp" />
<ClCompile Include="input\input.cpp" />
<ClCompile Include="input\keyboard.cpp" />
<ClCompile Include="input\stick.cpp" />
<ClCompile Include="layer.cpp" />
<ClCompile Include="light.cpp" />
<ClCompile Include="map.cpp" />
<ClCompile Include="math\geometry.cpp" />
<ClCompile Include="math\half.cpp" />
<ClCompile Include="math\real.cpp" />
<ClCompile Include="math\trig.cpp" />
<ClCompile Include="math\vector.cpp" />
<ClCompile Include="mesh\mesh.cpp" />
<ClCompile Include="platform.cpp" />
<ClCompile Include="platform\d3d9\d3d9input.cpp" />
<ClCompile Include="platform\ps3\ps3app.cpp" />
<ClCompile Include="platform\ps3\ps3input.cpp" />
<ClCompile Include="platform\sdl\sdlapp.cpp" />
<ClCompile Include="platform\sdl\sdlinput.cpp" />
<ClCompile Include="platform\xbox\xboxapp.cpp" />
<ClCompile Include="platform\xbox\xboxinput.cpp" />
<ClCompile Include="profiler.cpp" />
<ClCompile Include="sample.cpp" />
<ClCompile Include="sampler.cpp" />
<ClCompile Include="scene.cpp" />
<ClCompile Include="sprite.cpp" />
<ClCompile Include="sys\file.cpp" />
<ClCompile Include="sys\init.cpp" />
<ClCompile Include="sys\timer.cpp" />
<ClCompile Include="text.cpp" />
<ClCompile Include="ticker.cpp" />
<ClCompile Include="tiler.cpp" />
<ClCompile Include="tileset.cpp" />
<ClCompile Include="video.cpp" />
<ClCompile Include="world.cpp" />
<ClCompile Include="worldentity.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="application\application.h" />
<ClInclude Include="audio.h" />
<ClInclude Include="camera.h" />
<ClInclude Include="core.h" />
<ClInclude Include="debug\fps.h" />
<ClInclude Include="debug\record.h" />
<ClInclude Include="debug\stats.h" />
<ClInclude Include="dict.h" />
<ClInclude Include="easymesh\csgbsp.h" />
<ClInclude Include="easymesh\easymesh-compiler.h" />
<ClInclude Include="easymesh\easymesh.h" />
<ClInclude Include="eglapp.h" />
<ClInclude Include="emitter.h" />
<ClInclude Include="entity.h" />
<ClInclude Include="font.h" />
<ClInclude Include="forge.h" />
<ClInclude Include="generated\easymesh-parser.h" />
<ClInclude Include="generated\location.hh" />
<ClInclude Include="generated\lolfx-parser.h" />
<ClInclude Include="generated\position.hh" />
<ClInclude Include="generated\stack.hh" />
<ClInclude Include="gpu\lolfx-compiler.h" />
<ClInclude Include="gradient.h" />
<ClInclude Include="image\image-private.h" />
<ClInclude Include="input\input.h" />
<ClInclude Include="input\keyboard.h" />
<ClInclude Include="input\stick.h" />
<ClInclude Include="layer.h" />
<ClInclude Include="light.h" />
<ClInclude Include="loldebug.h" />
<ClInclude Include="lolgl.h" />
<ClInclude Include="lol\base\all.h" />
<ClInclude Include="lol\base\array.h" />
<ClInclude Include="lol\base\assert.h" />
<ClInclude Include="lol\base\hash.h" />
<ClInclude Include="lol\base\log.h" />
<ClInclude Include="lol\base\map.h" />
<ClInclude Include="lol\base\string.h" />
<ClInclude Include="lol\base\types.h" />
<ClInclude Include="lol\debug\all.h" />
<ClInclude Include="lol\debug\lines.h" />
<ClInclude Include="lol\gpu\all.h" />
<ClInclude Include="lol\gpu\framebuffer.h" />
<ClInclude Include="lol\gpu\indexbuffer.h" />
<ClInclude Include="lol\gpu\lolfx.h" />
<ClInclude Include="lol\gpu\rendercontext.h" />
<ClInclude Include="lol\gpu\renderer.h" />
<ClInclude Include="lol\gpu\shader.h" />
<ClInclude Include="lol\gpu\texture.h" />
<ClInclude Include="lol\gpu\vertexbuffer.h" />
<ClInclude Include="lol\image\all.h" />
<ClInclude Include="lol\image\color.h" />
<ClInclude Include="lol\image\image.h" />
<ClInclude Include="lol\math\all.h" />
<ClInclude Include="lol\math\constants.h" />
<ClInclude Include="lol\math\functions.h" />
<ClInclude Include="lol\math\geometry.h" />
<ClInclude Include="lol\math\half.h" />
<ClInclude Include="lol\math\interp.h" />
<ClInclude Include="lol\math\rand.h" />
<ClInclude Include="lol\math\real.h" />
<ClInclude Include="lol\math\remez.h" />
<ClInclude Include="lol\math\vector.h" />
<ClInclude Include="lol\sys\all.h" />
<ClInclude Include="lol\sys\atomic.h" />
<ClInclude Include="lol\sys\file.h" />
<ClInclude Include="lol\sys\init.h" />
<ClInclude Include="lol\sys\sys.h" />
<ClInclude Include="lol\sys\thread.h" />
<ClInclude Include="lol\sys\timer.h" />
<ClInclude Include="lol\unit.h" />
<ClInclude Include="mesh\mesh.h" />
<ClInclude Include="map.h" />
<ClInclude Include="numeric.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="platform\d3d9\d3d9input.h" />
<ClInclude Include="platform\ps3\ps3app.h" />
<ClInclude Include="platform\ps3\ps3input.h" />
<ClInclude Include="platform\ps3\threadbase.h" />
<ClInclude Include="platform\sdl\sdlapp.h" />
<ClInclude Include="platform\sdl\sdlinput.h" />
<ClInclude Include="platform\xbox\xboxapp.h" />
<ClInclude Include="platform\xbox\xboxinput.h" />
<ClInclude Include="profiler.h" />
<ClInclude Include="sample.h" />
<ClInclude Include="sampler.h" />
<ClInclude Include="scene.h" />
<ClInclude Include="simd.h" />
<ClInclude Include="sprite.h" />
<ClInclude Include="sys\threadbase.h" />
<ClInclude Include="text.h" />
<ClInclude Include="ticker.h" />
<ClInclude Include="tiler.h" />
<ClInclude Include="tileset.h" />
<ClInclude Include="video.h" />
<ClInclude Include="world.h" />
<ClInclude Include="worldentity.h" />
</ItemGroup>
<ItemGroup>
<LolFxCompile Include="easymesh\shiny.lolfx" />
<LolFxCompile Include="easymesh\shinydebuglighting.lolfx" />
<LolFxCompile Include="easymesh\shinydebugnormal.lolfx" />
<LolFxCompile Include="easymesh\shinydebugUV.lolfx" />
<LolFxCompile Include="easymesh\shinydebugwireframe.lolfx" />
<LolFxCompile Include="easymesh\shiny_SK.lolfx" />
<LolFxCompile Include="gpu\defaultmaterial.lolfx" />
<LolFxCompile Include="gpu\emptymaterial.lolfx" />
<LolFxCompile Include="gpu\line.lolfx" />
<LolFxCompile Include="gpu\testmaterial.lolfx" />
<LolFxCompile Include="gpu\tile.lolfx" />
<LolFxCompile Include="gradient.lolfx" />
</ItemGroup>
<ItemGroup>
<None Include="easymesh\easymesh-parser.y" />
<None Include="easymesh\easymesh-scanner.l" />
<None Include="gpu\lolfx-parser.y" />
<None Include="gpu\lolfx-scanner.l" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="bullet\lolbullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference>
<ProjectReference Include="lua\lollua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\Lol.Fx.targets" />
</ImportGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|PS3">
<Configuration>Debug</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Xbox 360">
<Configuration>Debug</Configuration>
<Platform>Xbox 360</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|PS3">
<Configuration>Release</Configuration>
<Platform>PS3</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Xbox 360">
<Configuration>Release</Configuration>
<Platform>Xbox 360</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
<ConfigurationType>StaticLibrary</ConfigurationType>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(SolutionDir)\Lol.Core.Config.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
<Import Project="$(SolutionDir)\Lol.Fx.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)\Lol.Core.Vars.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="$(SolutionDir)\Lol.Core.Rules.props" />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="application\application.cpp" />
<ClCompile Include="audio.cpp" />
<ClCompile Include="camera.cpp" />
<ClCompile Include="base\assert.cpp" />
<ClCompile Include="base\hash.cpp" />
<ClCompile Include="base\log.cpp" />
<ClCompile Include="base\string.cpp" />
<ClCompile Include="debug\fps.cpp" />
<ClCompile Include="debug\lines.cpp" />
<ClCompile Include="debug\record.cpp" />
<ClCompile Include="debug\stats.cpp" />
<ClCompile Include="dict.cpp" />
<ClCompile Include="easymesh\csgbsp.cpp" />
<ClCompile Include="easymesh\easymesh-compiler.cpp" />
<ClCompile Include="easymesh\easymesh.cpp" />
<ClCompile Include="eglapp.cpp" />
<ClCompile Include="emitter.cpp" />
<ClCompile Include="entity.cpp" />
<ClCompile Include="font.cpp" />
<ClCompile Include="forge.cpp" />
<ClCompile Include="generated\easymesh-parser.cpp" />
<ClCompile Include="generated\easymesh-scanner.cpp" />
<ClCompile Include="generated\lolfx-parser.cpp" />
<ClCompile Include="generated\lolfx-scanner.cpp" />
<ClCompile Include="gpu\framebuffer.cpp" />
<ClCompile Include="gpu\indexbuffer.cpp" />
<ClCompile Include="gpu\lolfx-compiler.cpp" />
<ClCompile Include="gpu\lolfx.cpp" />
<ClCompile Include="gpu\rendercontext.cpp" />
<ClCompile Include="gpu\renderer.cpp" />
<ClCompile Include="gpu\shader.cpp" />
<ClCompile Include="gpu\texture.cpp" />
<ClCompile Include="gpu\vertexbuffer.cpp" />
<ClCompile Include="gradient.cpp" />
<ClCompile Include="image\codec\android-image.cpp" />
<ClCompile Include="image\codec\dummy-image.cpp" />
<ClCompile Include="image\codec\gdiplus-image.cpp" />
<ClCompile Include="image\codec\ios-image.cpp" />
<ClCompile Include="image\codec\ps3-image.cpp" />
<ClCompile Include="image\codec\sdl-image.cpp" />
<ClCompile Include="image\color\cie1931.cpp" />
<ClCompile Include="image\image.cpp" />
<ClCompile Include="input\input.cpp" />
<ClCompile Include="input\keyboard.cpp" />
<ClCompile Include="input\stick.cpp" />
<ClCompile Include="layer.cpp" />
<ClCompile Include="light.cpp" />
<ClCompile Include="map.cpp" />
<ClCompile Include="math\geometry.cpp" />
<ClCompile Include="math\half.cpp" />
<ClCompile Include="math\real.cpp" />
<ClCompile Include="math\trig.cpp" />
<ClCompile Include="math\vector.cpp" />
<ClCompile Include="mesh\mesh.cpp" />
<ClCompile Include="platform.cpp" />
<ClCompile Include="platform\d3d9\d3d9input.cpp" />
<ClCompile Include="platform\ps3\ps3app.cpp" />
<ClCompile Include="platform\ps3\ps3input.cpp" />
<ClCompile Include="platform\sdl\sdlapp.cpp" />
<ClCompile Include="platform\sdl\sdlinput.cpp" />
<ClCompile Include="platform\xbox\xboxapp.cpp" />
<ClCompile Include="platform\xbox\xboxinput.cpp" />
<ClCompile Include="profiler.cpp" />
<ClCompile Include="sample.cpp" />
<ClCompile Include="sampler.cpp" />
<ClCompile Include="scene.cpp" />
<ClCompile Include="sprite.cpp" />
<ClCompile Include="sys\file.cpp" />
<ClCompile Include="sys\init.cpp" />
<ClCompile Include="sys\timer.cpp" />
<ClCompile Include="text.cpp" />
<ClCompile Include="ticker.cpp" />
<ClCompile Include="tiler.cpp" />
<ClCompile Include="tileset.cpp" />
<ClCompile Include="video.cpp" />
<ClCompile Include="world.cpp" />
<ClCompile Include="worldentity.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="application\application.h" />
<ClInclude Include="audio.h" />
<ClInclude Include="camera.h" />
<ClInclude Include="core.h" />
<ClInclude Include="debug\fps.h" />
<ClInclude Include="debug\record.h" />
<ClInclude Include="debug\stats.h" />
<ClInclude Include="dict.h" />
<ClInclude Include="easymesh\csgbsp.h" />
<ClInclude Include="easymesh\easymesh-compiler.h" />
<ClInclude Include="easymesh\easymesh.h" />
<ClInclude Include="eglapp.h" />
<ClInclude Include="emitter.h" />
<ClInclude Include="entity.h" />
<ClInclude Include="font.h" />
<ClInclude Include="forge.h" />
<ClInclude Include="generated\easymesh-parser.h" />
<ClInclude Include="generated\location.hh" />
<ClInclude Include="generated\lolfx-parser.h" />
<ClInclude Include="generated\position.hh" />
<ClInclude Include="generated\stack.hh" />
<ClInclude Include="gpu\lolfx-compiler.h" />
<ClInclude Include="gradient.h" />
<ClInclude Include="image\image-private.h" />
<ClInclude Include="input\input.h" />
<ClInclude Include="input\keyboard.h" />
<ClInclude Include="input\stick.h" />
<ClInclude Include="layer.h" />
<ClInclude Include="light.h" />
<ClInclude Include="loldebug.h" />
<ClInclude Include="lolgl.h" />
<ClInclude Include="lol\base\all.h" />
<ClInclude Include="lol\base\array.h" />
<ClInclude Include="lol\base\assert.h" />
<ClInclude Include="lol\base\hash.h" />
<ClInclude Include="lol\base\log.h" />
<ClInclude Include="lol\base\map.h" />
<ClInclude Include="lol\base\string.h" />
<ClInclude Include="lol\base\types.h" />
<ClInclude Include="lol\debug\all.h" />
<ClInclude Include="lol\debug\lines.h" />
<ClInclude Include="lol\gpu\all.h" />
<ClInclude Include="lol\gpu\framebuffer.h" />
<ClInclude Include="lol\gpu\indexbuffer.h" />
<ClInclude Include="lol\gpu\lolfx.h" />
<ClInclude Include="lol\gpu\rendercontext.h" />
<ClInclude Include="lol\gpu\renderer.h" />
<ClInclude Include="lol\gpu\shader.h" />
<ClInclude Include="lol\gpu\texture.h" />
<ClInclude Include="lol\gpu\vertexbuffer.h" />
<ClInclude Include="lol\image\all.h" />
<ClInclude Include="lol\image\color.h" />
<ClInclude Include="lol\image\image.h" />
<ClInclude Include="lol\math\all.h" />
<ClInclude Include="lol\math\constants.h" />
<ClInclude Include="lol\math\functions.h" />
<ClInclude Include="lol\math\geometry.h" />
<ClInclude Include="lol\math\half.h" />
<ClInclude Include="lol\math\interp.h" />
<ClInclude Include="lol\math\rand.h" />
<ClInclude Include="lol\math\real.h" />
<ClInclude Include="lol\math\remez.h" />
<ClInclude Include="lol\math\vector.h" />
<ClInclude Include="lol\sys\all.h" />
<ClInclude Include="lol\sys\atomic.h" />
<ClInclude Include="lol\sys\file.h" />
<ClInclude Include="lol\sys\init.h" />
<ClInclude Include="lol\sys\thread.h" />
<ClInclude Include="lol\sys\timer.h" />
<ClInclude Include="lol\unit.h" />
<ClInclude Include="mesh\mesh.h" />
<ClInclude Include="map.h" />
<ClInclude Include="numeric.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="platform\d3d9\d3d9input.h" />
<ClInclude Include="platform\ps3\ps3app.h" />
<ClInclude Include="platform\ps3\ps3input.h" />
<ClInclude Include="platform\ps3\threadbase.h" />
<ClInclude Include="platform\sdl\sdlapp.h" />
<ClInclude Include="platform\sdl\sdlinput.h" />
<ClInclude Include="platform\xbox\xboxapp.h" />
<ClInclude Include="platform\xbox\xboxinput.h" />
<ClInclude Include="profiler.h" />
<ClInclude Include="sample.h" />
<ClInclude Include="sampler.h" />
<ClInclude Include="scene.h" />
<ClInclude Include="simd.h" />
<ClInclude Include="sprite.h" />
<ClInclude Include="sys\threadbase.h" />
<ClInclude Include="text.h" />
<ClInclude Include="ticker.h" />
<ClInclude Include="tiler.h" />
<ClInclude Include="tileset.h" />
<ClInclude Include="video.h" />
<ClInclude Include="world.h" />
<ClInclude Include="worldentity.h" />
</ItemGroup>
<ItemGroup>
<LolFxCompile Include="easymesh\shiny.lolfx" />
<LolFxCompile Include="easymesh\shinydebuglighting.lolfx" />
<LolFxCompile Include="easymesh\shinydebugnormal.lolfx" />
<LolFxCompile Include="easymesh\shinydebugUV.lolfx" />
<LolFxCompile Include="easymesh\shinydebugwireframe.lolfx" />
<LolFxCompile Include="easymesh\shiny_SK.lolfx" />
<LolFxCompile Include="gpu\defaultmaterial.lolfx" />
<LolFxCompile Include="gpu\emptymaterial.lolfx" />
<LolFxCompile Include="gpu\line.lolfx" />
<LolFxCompile Include="gpu\testmaterial.lolfx" />
<LolFxCompile Include="gpu\tile.lolfx" />
<LolFxCompile Include="gradient.lolfx" />
</ItemGroup>
<ItemGroup>
<None Include="easymesh\easymesh-parser.y" />
<None Include="easymesh\easymesh-scanner.l" />
<None Include="gpu\lolfx-parser.y" />
<None Include="gpu\lolfx-scanner.l" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="bullet\lolbullet.vcxproj">
<Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
</ProjectReference>
<ProjectReference Include="lua\lollua.vcxproj">
<Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\Lol.Fx.targets" />
</ImportGroup>
</Project>

+ 16
- 4
src/lolcore.vcxproj.filters View File

@@ -76,6 +76,9 @@
<Filter Include="sys">
<UniqueIdentifier>{1d945673-ee9a-48a7-9ee8-34338c5fefc1}</UniqueIdentifier>
</Filter>
<Filter Include="lol\debug">
<UniqueIdentifier>{01285b11-c6c7-4a9e-8dee-daa2c63901e4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="image\image.cpp">
@@ -306,11 +309,11 @@
<ClCompile Include="base\log.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="debug\lines.cpp">
<Filter>debug</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="image\image.h">
<Filter>image</Filter>
</ClInclude>
<ClInclude Include="debug\fps.h">
<Filter>debug</Filter>
</ClInclude>
@@ -596,6 +599,15 @@
<ClInclude Include="sys\threadbase.h">
<Filter>sys</Filter>
</ClInclude>
<ClInclude Include="lol\debug\all.h">
<Filter>lol\debug</Filter>
</ClInclude>
<ClInclude Include="lol\debug\lines.h">
<Filter>lol\debug</Filter>
</ClInclude>
<ClInclude Include="lol\image\image.h">
<Filter>lol\image</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<LolFxCompile Include="gpu\emptymaterial.lolfx">
@@ -649,4 +661,4 @@
<Filter>gpu</Filter>
</None>
</ItemGroup>
</Project>
</Project>

Write Preview
Loading…
Cancel
Save