From 4e9550100a872b6d66f87182652b414b9e007bda Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 21 Jun 2010 23:06:34 +0200 Subject: [PATCH 1/5] Added: patch_gen project in Ryzom tools --- code/ryzom/tools/all.sln | 19 + code/ryzom/tools/patch_gen/patch_gen.vcproj | 392 ++++++++++++++++++++ 2 files changed, 411 insertions(+) create mode 100644 code/ryzom/tools/patch_gen/patch_gen.vcproj diff --git a/code/ryzom/tools/all.sln b/code/ryzom/tools/all.sln index 7bf63041f..325bfb0b6 100644 --- a/code/ryzom/tools/all.sln +++ b/code/ryzom/tools/all.sln @@ -176,6 +176,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icon_search", "leveldesign\ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alias_synchronizer", "leveldesign\alias_synchronizer\alias_synchronizer.vcproj", "{3ECD7F32-6603-45D2-91AB-5FBC278F6DC8}" + ProjectSection(ProjectDependencies) = postProject + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C} = {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "land_export", "leveldesign\world_editor\land_export\land_export.vcproj", "{FECBB892-F33C-4195-AB69-9B708BFBCDEA}" ProjectSection(ProjectDependencies) = postProject @@ -214,6 +218,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "georges_convert", "leveldes EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "export", "leveldesign\export\export.vcproj", "{577230FF-399C-4C9D-9495-CEC106326441}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patch_gen", "patch_gen\patch_gen.vcproj", "{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}" + ProjectSection(ProjectDependencies) = postProject + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} + {4B320F68-0B9B-4065-A2ED-AF5D4B163006} = {4B320F68-0B9B-4065-A2ED-AF5D4B163006} + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} = {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -550,6 +561,14 @@ Global {577230FF-399C-4C9D-9495-CEC106326441}.Release|Win32.Build.0 = Release|Win32 {577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.ActiveCfg = Release|x64 {577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.Build.0 = Release|x64 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.ActiveCfg = Debug|Win32 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.Build.0 = Debug|Win32 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|x64.ActiveCfg = Debug|x64 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|x64.Build.0 = Debug|x64 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|Win32.ActiveCfg = Release|Win32 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|Win32.Build.0 = Release|Win32 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.ActiveCfg = Release|x64 + {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/code/ryzom/tools/patch_gen/patch_gen.vcproj b/code/ryzom/tools/patch_gen/patch_gen.vcproj new file mode 100644 index 000000000..77649479d --- /dev/null +++ b/code/ryzom/tools/patch_gen/patch_gen.vcproj @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 551d33c9330dc5cdd41bb075f2dd50b9c40cc30f Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 22 Jun 2010 08:12:31 +0200 Subject: [PATCH 2/5] Fixed: #993 Floating Point Exception in NL3D::CDriverGL::getModes on Linux --- code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index d2c85c715..d456bb74c 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -1200,8 +1200,9 @@ bool CDriverGL::getModes(std::vector &modes) GfxMode mode; mode.Width = (uint16)ms[j]->hdisplay; mode.Height = (uint16)ms[j]->vdisplay; - mode.Frequency = 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal); - nldebug("3D: Mode %d: %dx%d, %d Hz", j, ms[j]->hdisplay,ms[j]->vdisplay, 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal)); + const uint16 pixelsCount = ms[j]->htotal * ms[j]->vtotal; + mode.Frequency = pixelCount ? 1000 * ms[j]->dotclock / pixelCount:0; + nldebug("3D: Mode %d: %dx%d, %d Hz", j, mode.Width, mode.Height, mode.Frequency); modes.push_back (mode); } XFree(ms); @@ -1236,7 +1237,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode) mode.Width = (uint16)devmode.dmPelsWidth; mode.Height = (uint16)devmode.dmPelsHeight; mode.AntiAlias = _AntiAliasing; - + #elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE) NL3D::MAC::getCurrentScreenMode(mode); @@ -1245,7 +1246,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode) /* TODO this is just a hack to get the ryzom client running on mac os x x11. the implementation below relies on the vidmode extension which is not - availeble on mac os x's x11. for that reason the color depth value is + availeble on mac os x's x11. for that reason the color depth value is hard coded here. FIXME replace this hack by native cocoa color depth retrieval */ From 0761387c3b1a5f9a040cc28f41275656f3ecb2ba Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 22 Jun 2010 12:03:05 +0200 Subject: [PATCH 3/5] Changed: #841 Change the wrong header in the source code --- code/nel/include/nel/3d/seg_remanence.h | 17 +++++++++++++++-- code/nel/include/nel/misc/win32_util.h | 16 ++++++++++++++++ code/nel/include/nel/misc/win_tray.h | 15 +++++++++++++++ code/nel/include/nel/misc/xml_pack.h | 15 +++++++++++++++ code/nel/src/3d/std3d.cpp | 15 +++++++++++++++ code/nel/src/3d/std3d.h | 15 +++++++++++++++ 6 files changed, 91 insertions(+), 2 deletions(-) diff --git a/code/nel/include/nel/3d/seg_remanence.h b/code/nel/include/nel/3d/seg_remanence.h index deb56399b..8e1d00d22 100644 --- a/code/nel/include/nel/3d/seg_remanence.h +++ b/code/nel/include/nel/3d/seg_remanence.h @@ -1,5 +1,18 @@ - - +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef NL_SEG_REMANENCE_H #define NL_SEG_REMANENCE_H diff --git a/code/nel/include/nel/misc/win32_util.h b/code/nel/include/nel/misc/win32_util.h index ce2a3bca4..1d57fd3b9 100644 --- a/code/nel/include/nel/misc/win32_util.h +++ b/code/nel/include/nel/misc/win32_util.h @@ -1,3 +1,19 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + #ifndef NL_WIN32_UTIL_H #define NL_WIN32_UTIL_H diff --git a/code/nel/include/nel/misc/win_tray.h b/code/nel/include/nel/misc/win_tray.h index e69de29bb..c002bbed9 100644 --- a/code/nel/include/nel/misc/win_tray.h +++ b/code/nel/include/nel/misc/win_tray.h @@ -0,0 +1,15 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . diff --git a/code/nel/include/nel/misc/xml_pack.h b/code/nel/include/nel/misc/xml_pack.h index 8dffbf85f..96b1b1ff9 100644 --- a/code/nel/include/nel/misc/xml_pack.h +++ b/code/nel/include/nel/misc/xml_pack.h @@ -1,3 +1,18 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef XML_PACK_H #define XML_PACK_H diff --git a/code/nel/src/3d/std3d.cpp b/code/nel/src/3d/std3d.cpp index a1d48d564..af5b3d147 100644 --- a/code/nel/src/3d/std3d.cpp +++ b/code/nel/src/3d/std3d.cpp @@ -1,3 +1,18 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "std3d.h" diff --git a/code/nel/src/3d/std3d.h b/code/nel/src/3d/std3d.h index a4c626608..7afc496ea 100644 --- a/code/nel/src/3d/std3d.h +++ b/code/nel/src/3d/std3d.h @@ -1,3 +1,18 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/misc/types_nl.h" From 964ffc21833d583d605a930b2bbb66f76fa78baa Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 23 Jun 2010 08:59:03 +0200 Subject: [PATCH 4/5] Fixed: #993 Floating Point Exception in NL3D::CDriverGL::getModes on Linux --- code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index d456bb74c..a6703a873 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -1201,7 +1201,7 @@ bool CDriverGL::getModes(std::vector &modes) mode.Width = (uint16)ms[j]->hdisplay; mode.Height = (uint16)ms[j]->vdisplay; const uint16 pixelsCount = ms[j]->htotal * ms[j]->vtotal; - mode.Frequency = pixelCount ? 1000 * ms[j]->dotclock / pixelCount:0; + mode.Frequency = pixelsCount ? 1000 * ms[j]->dotclock / pixelsCount:0; nldebug("3D: Mode %d: %dx%d, %d Hz", j, mode.Width, mode.Height, mode.Frequency); modes.push_back (mode); } @@ -1246,7 +1246,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode) /* TODO this is just a hack to get the ryzom client running on mac os x x11. the implementation below relies on the vidmode extension which is not - availeble on mac os x's x11. for that reason the color depth value is + available on mac os x's x11. for that reason the color depth value is hard coded here. FIXME replace this hack by native cocoa color depth retrieval */ From 5c913341e2bb6cf1a2c32e9cb520e6a972b2e035 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 23 Jun 2010 09:10:49 +0200 Subject: [PATCH 5/5] Fixed: #998 bnp_make returns 1 when successful --- code/nel/tools/misc/bnp_make/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/code/nel/tools/misc/bnp_make/main.cpp index c1fb19a65..d2a64b2c7 100644 --- a/code/nel/tools/misc/bnp_make/main.cpp +++ b/code/nel/tools/misc/bnp_make/main.cpp @@ -359,7 +359,7 @@ int main (int nNbArg, char **ppArgs) gBNPHeader.OffsetFromBeginning = 0; packSubRecurse(); gBNPHeader.append (gDestBNPFile); - return 1; + return 0; } if ((strcmp(ppArgs[1], "/u") == 0) || (strcmp(ppArgs[1], "/U") == 0) || @@ -405,7 +405,7 @@ int main (int nNbArg, char **ppArgs) unpack (dirName); - return 1; + return 0; } if ((strcmp(ppArgs[1], "/l") == 0) || (strcmp(ppArgs[1], "/L") == 0) || @@ -450,7 +450,7 @@ int main (int nNbArg, char **ppArgs) for (i = 0; i < gBNPHeader.Files.size(); ++i) printf ("%s\n", gBNPHeader.Files[i].Name.c_str()); - return 1; + return 0; } usage ();