LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor.

Browse Source 
--HG--
branch : minor
This commit is contained in:
rude
2011-03-09 12:39:21 +01:00
parent a2dadbf049 3c7353be9d
commit 2546f27b07
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/msvc2010/love.vcxproj
+42 -14
View File
@@ -21,19 +21,45 @@
<ClCompile Include="..\..\src\common\utf8.cpp" /> <ClCompile Include="..\..\src\common\utf8.cpp" />
<ClCompile Include="..\..\src\common\Vector.cpp" /> <ClCompile Include="..\..\src\common\Vector.cpp" />
<ClCompile Include="..\..\src\common\wrap_Data.cpp" /> <ClCompile Include="..\..\src\common\wrap_Data.cpp" />
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\auxiliar.c" /> <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\auxiliar.c">
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\buffer.c" /> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\except.c" /> </ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\inet.c" /> <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\buffer.c">
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\io.c" /> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\luasocket.c" /> </ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\mime.c" /> <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\except.c">
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\options.c" /> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\select.c" /> </ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\tcp.c" /> <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\inet.c">
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\timeout.c" /> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\udp.c" /> </ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\wsocket.c" /> <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\io.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\luasocket.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\mime.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\options.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\select.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\tcp.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\timeout.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\udp.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\libluasocket\wsocket.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\libraries\luasocket\luasocket.cpp" /> <ClCompile Include="..\..\src\libraries\luasocket\luasocket.cpp" />
<ClCompile Include="..\..\src\love.cpp"> <ClCompile Include="..\..\src\love.cpp">
<ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes> <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes>
@@ -69,7 +95,9 @@
<ClCompile Include="..\..\src\modules\graphics\Image.cpp" /> <ClCompile Include="..\..\src\modules\graphics\Image.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\Font.cpp" /> <ClCompile Include="..\..\src\modules\graphics\opengl\Font.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\Framebuffer.cpp" /> <ClCompile Include="..\..\src\modules\graphics\opengl\Framebuffer.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\GLee.c" /> <ClCompile Include="..\..\src\modules\graphics\opengl\GLee.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\src\modules\graphics\opengl\Graphics.cpp" /> <ClCompile Include="..\..\src\modules\graphics\opengl\Graphics.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\Image.cpp" /> <ClCompile Include="..\..\src\modules\graphics\opengl\Image.cpp" />
<ClCompile Include="..\..\src\modules\graphics\opengl\ParticleSystem.cpp" /> <ClCompile Include="..\..\src\modules\graphics\opengl\ParticleSystem.cpp" />
src/modules/graphics/opengl/Graphics.cpp
+3 -3
View File
@@ -738,7 +738,7 @@ namespace opengl
using namespace std; using namespace std;
string text(str); string text(str);
const float width_space = currentFont->getWidth(' '); const float width_space = static_cast<float>(currentFont->getWidth(' '));
vector<string> lines_to_draw; vector<string> lines_to_draw;
//split text at newlines //split text at newlines
@@ -763,7 +763,7 @@ namespace opengl
if (width >= wrap) { if (width >= wrap) {
lines_to_draw.push_back( string_builder.str() ); lines_to_draw.push_back( string_builder.str() );
string_builder.str( "" ); string_builder.str( "" );
width = currentFont->getWidth( word ); width = static_cast<float>(currentFont->getWidth( word ));
} }
string_builder << word << " "; string_builder << word << " ";
width += width_space; width += width_space;
@@ -775,7 +775,7 @@ namespace opengl
// now for the actual printing // now for the actual printing
vector<string>::const_iterator line_iter, line_end = lines_to_draw.end(); vector<string>::const_iterator line_iter, line_end = lines_to_draw.end();
for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) { for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) {
float width = currentFont->getWidth( *line_iter ); float width = static_cast<float>(currentFont->getWidth( *line_iter ));
switch (align) { switch (align) {
case ALIGN_RIGHT: case ALIGN_RIGHT:
currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y)); currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y));
src/modules/sound/lullaby/ModPlugDecoder.cpp
+4 -1
View File
@@ -17,7 +17,7 @@
* misrepresented as being the original software. * misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution. * 3. This notice may not be removed or altered from any source distribution.
**/ **/
#include <common/config.h>
#include "ModPlugDecoder.h" #include "ModPlugDecoder.h"
#include <common/Exception.h> #include <common/Exception.h>
@@ -41,8 +41,11 @@ namespace lullaby
// fill with modplug defaults (modplug _memsets_, so we could get // fill with modplug defaults (modplug _memsets_, so we could get
// garbage settings when the struct is only partially initialized) // garbage settings when the struct is only partially initialized)
#ifndef LOVE_WINDOWS
// This does not exist yet on Windows.
settings.mStereoSeparation = 128; settings.mStereoSeparation = 128;
settings.mMaxMixChannels = 32; settings.mMaxMixChannels = 32;
#endif // LOVE_WINDOWS
settings.mReverbDepth = 0; settings.mReverbDepth = 0;
settings.mReverbDelay = 0; settings.mReverbDelay = 0;
settings.mBassAmount = 0; settings.mBassAmount = 0;