diff options
author | truelight <truelight@openttd.org> | 2007-06-17 20:30:28 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2007-06-17 20:30:28 +0000 |
commit | 003375d3755fe06227894e941b177491770c17fe (patch) | |
tree | e0105857aa1562ca3ca15a5e7df7e49bfc939456 /projects | |
parent | b0b4820387ec6f0214b43dc61b452fa73ca8a09a (diff) | |
download | openttd-003375d3755fe06227894e941b177491770c17fe.tar.xz |
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
-Codechange: introduced a hierachy of blitters to avoid a lot of code duplication
Note: this allows much easier adding other types of video-drivers, like OpenGL
Diffstat (limited to 'projects')
-rwxr-xr-x | projects/generate | 2 | ||||
-rw-r--r-- | projects/openttd.vcproj | 42 | ||||
-rw-r--r-- | projects/openttd_vs80.vcproj | 54 |
3 files changed, 38 insertions, 60 deletions
diff --git a/projects/generate b/projects/generate index e218d9634..dc43f6be0 100755 --- a/projects/generate +++ b/projects/generate @@ -40,7 +40,7 @@ file_prefix="..\\\\src\\\\" safety_check() { li="" - for i in `cat $1 | grep -v "#" | xargs -n 1 basename | sort`; do + for i in `cat $1 | grep -v "#\|ottdres.rc\|win32.cpp\|win32_v.cpp" | xargs -n 1 basename | sort`; do if [ "$li" = "$i" ]; then echo " !! ERROR !!" echo "" diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj index 899464bf8..de6df4f63 100644 --- a/projects/openttd.vcproj +++ b/projects/openttd.vcproj @@ -968,12 +968,24 @@ Name="Blitters" Filter=""> <File + RelativePath=".\..\src\blitter\32bpp_base.cpp"> + </File> + <File + RelativePath=".\..\src\blitter\32bpp_base.hpp"> + </File> + <File RelativePath=".\..\src\blitter\32bpp_simple.cpp"> </File> <File RelativePath=".\..\src\blitter\32bpp_simple.hpp"> </File> <File + RelativePath=".\..\src\blitter\8bpp_base.cpp"> + </File> + <File + RelativePath=".\..\src\blitter\8bpp_base.hpp"> + </File> + <File RelativePath=".\..\src\blitter\8bpp_debug.cpp"> </File> <File @@ -992,7 +1004,10 @@ RelativePath=".\..\src\blitter\8bpp_simple.hpp"> </File> <File - RelativePath=".\..\src\blitter\blitter.hpp"> + RelativePath=".\..\src\blitter\base.hpp"> + </File> + <File + RelativePath=".\..\src\blitter\factory.hpp"> </File> <File RelativePath=".\..\src\blitter\null.cpp"> @@ -1021,31 +1036,6 @@ </File> </Filter> <Filter - Name="Renderer" - Filter=""> - <File - RelativePath=".\..\src\renderer\32bpp.cpp"> - </File> - <File - RelativePath=".\..\src\renderer\32bpp.hpp"> - </File> - <File - RelativePath=".\..\src\renderer\8bpp.cpp"> - </File> - <File - RelativePath=".\..\src\renderer\8bpp.hpp"> - </File> - <File - RelativePath=".\..\src\renderer\null.cpp"> - </File> - <File - RelativePath=".\..\src\renderer\null.hpp"> - </File> - <File - RelativePath=".\..\src\renderer\renderer.hpp"> - </File> - </Filter> - <Filter Name="NewGRF" Filter=""> <File diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 93f7d1241..e58eb48b2 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1512,6 +1512,14 @@ Name="Blitters" > <File + RelativePath=".\..\src\blitter\32bpp_base.cpp" + > + </File> + <File + RelativePath=".\..\src\blitter\32bpp_base.hpp" + > + </File> + <File RelativePath=".\..\src\blitter\32bpp_simple.cpp" > </File> @@ -1520,6 +1528,14 @@ > </File> <File + RelativePath=".\..\src\blitter\8bpp_base.cpp" + > + </File> + <File + RelativePath=".\..\src\blitter\8bpp_base.hpp" + > + </File> + <File RelativePath=".\..\src\blitter\8bpp_debug.cpp" > </File> @@ -1544,7 +1560,11 @@ > </File> <File - RelativePath=".\..\src\blitter\blitter.hpp" + RelativePath=".\..\src\blitter\base.hpp" + > + </File> + <File + RelativePath=".\..\src\blitter\factory.hpp" > </File> <File @@ -1581,38 +1601,6 @@ </File> </Filter> <Filter - Name="Renderer" - > - <File - RelativePath=".\..\src\renderer\32bpp.cpp" - > - </File> - <File - RelativePath=".\..\src\renderer\32bpp.hpp" - > - </File> - <File - RelativePath=".\..\src\renderer\8bpp.cpp" - > - </File> - <File - RelativePath=".\..\src\renderer\8bpp.hpp" - > - </File> - <File - RelativePath=".\..\src\renderer\null.cpp" - > - </File> - <File - RelativePath=".\..\src\renderer\null.hpp" - > - </File> - <File - RelativePath=".\..\src\renderer\renderer.hpp" - > - </File> - </Filter> - <Filter Name="NewGRF" > <File |