Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ryzomcore

Browse source
This commit is contained in:
deed 2019-08-29 11:15:14 +02:00
commit 9a89e3f4a1
317 changed files with 6242 additions and 5255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
azure-pipelines.yml
View file

@ -1,5 +1,6 @@
jobs:
- job: ubuntu16
timeoutInMinutes: 120
pool:
vmImage: 'Ubuntu-16.04'
steps:
@ -26,12 +27,13 @@ jobs:
sudo apt-get install libsquish-dev -y
sudo apt-get install liblzma-dev -y
sudo apt-get install libgsf-1-dev -y
sudo apt-get install qtbase5-dev qttools5-dev qttools5-dev-tools
displayName: 'Dependencies'
- script: |
mkdir build
cmake --version
cd build
cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=ON -DWITH_LIBGSF=ON ../code
cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ../code
cat CMakeCache.txt
displayName: 'CMake'
- script: |

2
code/CMakeLists.txt
View file

@ -55,7 +55,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(RyzomCore CXX C)
SET(NL_VERSION_MAJOR 1)
SET(NL_VERSION_MINOR 0)
SET(NL_VERSION_PATCH 0)
SET(NL_VERSION_PATCH 1)
SET(YEAR "2004-${CURRENT_YEAR}")
SET(AUTHOR "Winch Gate and The Ryzom Core Community")

16
code/CMakeModules/ConfigureChecks.cmake
View file

@ -37,15 +37,25 @@ MACRO(NL_CONFIGURE_CHECKS)
SET(RYZOM_VERSION_PATCH ${NL_VERSION_PATCH})
ENDIF()
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}.${REVISION}")
IF(DESCRIBE)
SET(NL_VERSION "${DESCRIBE}")
ELSE()
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}.${REVISION}")
ENDIF()
SET(NL_VERSION_RC "${NL_VERSION_MAJOR},${NL_VERSION_MINOR},${NL_VERSION_PATCH},${REVISION}")
SET(NL_PRODUCT_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
SET(RYZOM_VERSION_SHORT "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}")
SET(RYZOM_VERSION "${RYZOM_VERSION_SHORT}.${REVISION}")
IF(DESCRIBE)
SET(RYZOM_VERSION "${DESCRIBE}")
ELSE()
SET(RYZOM_VERSION "${RYZOM_VERSION_SHORT}.${REVISION}")
ENDIF()
SET(RYZOM_VERSION_RC "${RYZOM_VERSION_MAJOR},${RYZOM_VERSION_MINOR},${RYZOM_VERSION_PATCH},${REVISION}")
SET(RYZOM_PRODUCT_VERSION "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}")
NOW(BUILD_DATE)
SET(COPYRIGHT "${YEAR} ${AUTHOR}")
SET(COPYRIGHT "Copyright (C) ${YEAR} ${AUTHOR}")
IF(NOT RYZOM_CLIENT_ICON)
SET(RYZOM_CLIENT_ICON "khanat_client")

44
code/CMakeModules/GetRevision.cmake
View file

@ -76,9 +76,42 @@ IF(EXISTS "${ROOT_DIR}/.git/")
FIND_PACKAGE(Git)
IF(GIT_FOUND)
Git_WC_INFO(${ROOT_DIR} ER)
SET(REVISION ${ER_WC_REVISION})
SET(CHANGESET ${ER_WC_CHANGESET})
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
WORKING_DIRECTORY ${ROOT_DIR}
RESULT_VARIABLE git_exit_code
OUTPUT_VARIABLE REVISION)
IF(NOT ${git_exit_code} EQUAL 0)
MESSAGE(WARNING "git rev-list failed, unable to include version.")
ELSE()
STRING(STRIP ${REVISION} REVISION)
ENDIF()
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
WORKING_DIRECTORY ${ROOT_DIR}
RESULT_VARIABLE git_exit_code
OUTPUT_VARIABLE CHANGESET)
IF(NOT ${git_exit_code} EQUAL 0)
MESSAGE(WARNING "git rev-parse failed, unable to include version.")
ELSE()
STRING(STRIP ${CHANGESET} CHANGESET)
ENDIF()
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY ${ROOT_DIR}
RESULT_VARIABLE git_exit_code
OUTPUT_VARIABLE BRANCH)
IF(NOT ${git_exit_code} EQUAL 0)
MESSAGE(WARNING "git rev-parse failed, unable to include git branch.")
ELSE()
STRING(STRIP ${BRANCH} BRANCH)
ENDIF()
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe
WORKING_DIRECTORY ${ROOT_DIR}
RESULT_VARIABLE git_exit_code
OUTPUT_VARIABLE DESCRIBE)
IF(NOT ${git_exit_code} EQUAL 0)
MESSAGE(WARNING "git rev-parse failed, unable to include git branch.")
ELSE()
STRING(STRIP ${DESCRIBE} DESCRIBE)
ENDIF()
ENDIF()
ENDIF()
@ -91,11 +124,6 @@ IF(SOURCE_DIR AND NOT DEFINED REVISION)
ENDIF()
ENDIF()
# Prevent crash if no revision from git or mercurial found
IF(NOT DEFINED REVISION)
SET(REVISION 0)
ENDIF()
IF(DEFINED REVISION)
MESSAGE(STATUS "Found revision ${REVISION}")
ELSE()

3
code/config.h.cmake
View file

@ -27,9 +27,12 @@
#cmakedefine NL_VERSION "${NL_VERSION}"
#cmakedefine NL_VERSION_RC ${NL_VERSION_RC}
#cmakedefine NL_PRODUCT_VERSION "${NL_PRODUCT_VERSION}"
#cmakedefine RYZOM_VERSION "${RYZOM_VERSION}"
#cmakedefine RYZOM_VERSION_RC ${RYZOM_VERSION_RC}
#cmakedefine RYZOM_PRODUCT_VERSION "${RYZOM_PRODUCT_VERSION}"
#cmakedefine AUTHOR "${AUTHOR}"
#cmakedefine YEAR "${YEAR}"
#cmakedefine COPYRIGHT "${COPYRIGHT}"

13
code/nel/include/nel/gui/css_selector.h
View file

@ -43,8 +43,9 @@ namespace NLGUI
std::string key;
std::string value;
char op; // =, ~, |, ^, $, *
SAttribute(const std::string &k, const std::string &v, char o)
:key(k),value(v),op(o)
bool caseSensitive;
SAttribute(const std::string &k, const std::string &v, char o, bool cs)
:key(k),value(v),op(o), caseSensitive(cs)
{}
};
@ -69,7 +70,8 @@ namespace NLGUI
// add attribute to selector
// ' ' op means 'key exists, ignore value'
void addAttribute(const std::string &key, const std::string &val = "", char op = ' ');
// cs case-sensitive true|false
void addAttribute(const std::string &key, const std::string &val = "", char op = ' ', bool cs = true);
// add pseudo class to selector, eg 'first-child'
void addPseudoClass(const std::string &key);
@ -84,6 +86,9 @@ namespace NLGUI
// NOTE: Does not check combinator
bool match(const CHtmlElement &elm) const;
// debug
std::string toString() const;
private:
bool matchClass(const CHtmlElement &elm) const;
bool matchAttributes(const CHtmlElement &elm) const;
@ -91,7 +96,7 @@ namespace NLGUI
// match An+B rule to child index (1 based)
bool matchNth(sint childNr, sint a, sint b) const;
// parse nth-child string to 'a' and 'b' components
// :nth-child(odd)
// :nth-child(even)

7
code/nel/include/nel/gui/css_style.h
View file

@ -57,11 +57,12 @@ namespace NLGUI
Underlined=false;
StrikeThrough=false;
GlobalColor=false;
DisplayBlock=false;
Width=-1;
Height=-1;
MaxWidth=-1;
MaxHeight=-1;
BorderWidth=1;
BorderWidth=-1;
BackgroundColor=NLMISC::CRGBA::Black;
BackgroundColorOver=NLMISC::CRGBA::Black;
}
@ -87,6 +88,7 @@ namespace NLGUI
bool GlobalColor;
bool Underlined;
bool StrikeThrough;
bool DisplayBlock;
sint32 Width;
sint32 Height;
sint32 MaxWidth;
@ -172,11 +174,12 @@ namespace NLGUI
styleStackIndex++;
_StyleStack.push_back(Current);
Current.DisplayBlock = false;
Current.Width=-1;
Current.Height=-1;
Current.MaxWidth=-1;
Current.MaxHeight=-1;
Current.BorderWidth=1;
Current.BorderWidth=-1;
Current.StyleRules.clear();
}

117
code/nel/include/nel/gui/group_html.h
View file

@ -107,7 +107,7 @@ namespace NLGUI
void refresh();
// submit form
void submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y);
void submitForm(uint button, sint32 x, sint32 y);
// Browse error
void browseError (const char *msg);
@ -125,6 +125,8 @@ namespace NLGUI
// add image download (used by view_bitmap.cpp to load web images)
void addImageDownload(const std::string &url, CViewBase *img, const CStyleParams &style = CStyleParams(), const TImageType type = NormalImage);
// remove image from download list if present
void removeImageDownload(CViewBase *img);
std::string localImageName(const std::string &url);
// Timeout
@ -325,7 +327,7 @@ namespace NLGUI
// Add a button in the current paragraph. actionHandler, actionHandlerParams and tooltip can be NULL.
CCtrlButton *addButton(CCtrlButton::EType type, const std::string &name, const std::string &normalBitmap, const std::string &pushedBitmap,
const std::string &overBitmap, const char *actionHandler, const char *actionHandlerParams, const char *tooltip,
const std::string &overBitmap, const char *actionHandler, const char *actionHandlerParams, const std::string &tooltip,
const CStyleParams &style = CStyleParams());
// Set the background color
@ -385,6 +387,7 @@ namespace NLGUI
bool _BrowseNextTime;
bool _PostNextTime;
uint _PostFormId;
std::string _PostFormAction;
std::string _PostFormSubmitType;
std::string _PostFormSubmitButton;
std::string _PostFormSubmitValue;
@ -407,6 +410,7 @@ namespace NLGUI
// True when the <lua> element has been encountered
bool _ParsingLua;
bool _IgnoreText;
bool _IgnoreChildElements;
// the script to execute
std::string _LuaScript;
bool _LuaHrefHack;
@ -465,6 +469,64 @@ namespace NLGUI
};
std::vector<HTMLOListElement> _UL;
class HTMLMeterElement {
public:
enum EValueRegion {
VALUE_OPTIMUM = 0,
VALUE_SUB_OPTIMAL,
VALUE_EVEN_LESS_GOOD
};
public:
HTMLMeterElement()
: value(0.f), min(0.f), max(1.f), low(0.f), high(1.f), optimum(0.5f)
{}
// read attributes from html element
void readValues(const CHtmlElement &elm);
// return value ratio to min-max
float getValueRatio() const;
// return optimum region based current value
EValueRegion getValueRegion() const;
// return meter bar color
NLMISC::CRGBA getBarColor(const CHtmlElement &elm, CCssStyle &style) const;
// return meter value bar color based value and optimum range
NLMISC::CRGBA getValueColor(const CHtmlElement &elm, CCssStyle &style) const;
float value;
float min;
float max;
float low;
float high;
float optimum;
};
class HTMLProgressElement
{
public:
HTMLProgressElement()
: value(0.f), max(1.f)
{}
// read attributes from html element
void readValues(const CHtmlElement &elm);
// return value ratio to min-max
float getValueRatio() const;
// return meter bar color
NLMISC::CRGBA getBarColor(const CHtmlElement &elm, CCssStyle &style) const;
// return meter value bar color based value and optimum range
NLMISC::CRGBA getValueColor(const CHtmlElement &elm, CCssStyle &style) const;
float value;
float max;
};
// A mode
std::vector<bool> _A;
inline bool getA() const
@ -509,14 +571,6 @@ namespace NLGUI
return _LinkClass.back().c_str();
}
std::vector<bool> _BlockLevelElement;
inline bool isBlockLevelElement() const
{
if (_BlockLevelElement.empty())
return false;
return _BlockLevelElement.back();
}
// Divs (i.e. interface group)
std::vector<class CInterfaceGroup*> _Divs;
inline CInterfaceGroup *getDiv() const
@ -600,6 +654,9 @@ namespace NLGUI
sint InitialSelection; // initial selection for the combo box
};
// <form> element "id" attribute
std::string id;
// The action the form has to perform
std::string Action;
@ -607,6 +664,25 @@ namespace NLGUI
std::vector<CEntry> Entries;
};
std::vector<CForm> _Forms;
// submit buttons added to from
struct SFormSubmitButton
{
SFormSubmitButton(const std::string &form, const std::string &name, const std::string &value, const std::string &type, const std::string &formAction="")
: form(form), name(name), value(value), type(type), formAction(formAction)
{ }
std::string form; // form 'id'
std::string name; // submit button name
std::string value; // submit button value
std::string type; // button type, ie 'image'
std::string formAction; // override form action attribute (url)
};
// submit buttons added to form
std::vector<SFormSubmitButton> _FormSubmit;
std::vector<CInterfaceGroup *> _Groups;
// Cells parameters
@ -819,12 +895,31 @@ namespace NLGUI
// apply background from current style (for html, body)
void applyBackground(const CHtmlElement &elm);
void insertFormImageButton(const std::string &name,
const std::string &tooltip,
const std::string &src,
const std::string &over,
const std::string &formId,
const std::string &formAction = "",
uint32 minWidth = 0,
const std::string &templateName = "");
void insertFormTextButton(const std::string &name,
const std::string &tooltip,
const std::string &value,
const std::string &formId,
const std::string &formAction = "",
uint32 minWidth = 0,
const std::string &templateName = "");
// HTML elements
void htmlA(const CHtmlElement &elm);
void htmlAend(const CHtmlElement &elm);
void htmlBASE(const CHtmlElement &elm);
void htmlBODY(const CHtmlElement &elm);
void htmlBR(const CHtmlElement &elm);
void htmlBUTTON(const CHtmlElement &elm);
void htmlBUTTONend(const CHtmlElement &elm);
void htmlDD(const CHtmlElement &elm);
void htmlDDend(const CHtmlElement &elm);
//void htmlDEL(const CHtmlElement &elm);
@ -852,6 +947,7 @@ namespace NLGUI
void htmlLUA(const CHtmlElement &elm);
void htmlLUAend(const CHtmlElement &elm);
void htmlMETA(const CHtmlElement &elm);
void htmlMETER(const CHtmlElement &elm);
void htmlOBJECT(const CHtmlElement &elm);
void htmlOBJECTend(const CHtmlElement &elm);
void htmlOL(const CHtmlElement &elm);
@ -862,6 +958,7 @@ namespace NLGUI
void htmlPend(const CHtmlElement &elm);
void htmlPRE(const CHtmlElement &elm);
void htmlPREend(const CHtmlElement &elm);
void htmlPROGRESS(const CHtmlElement &elm);
void htmlSCRIPT(const CHtmlElement &elm);
void htmlSCRIPTend(const CHtmlElement &elm);
void htmlSELECT(const CHtmlElement &elm);

12
code/nel/include/nel/gui/html_element.h
View file

@ -47,8 +47,6 @@ namespace NLGUI
// defined style and :before/:after pseudo elements
TStyle Style;
TStyle StyleBefore;
TStyle StyleAfter;
// hierarchy
CHtmlElement *parent;
@ -79,6 +77,16 @@ namespace NLGUI
// debug
std::string toString(bool tree = false, uint depth = 0) const;
// query, get, set pseudo element style rules
void clearPseudo();
bool hasPseudo(const std::string &key) const;
TStyle getPseudo(const std::string &key) const;
void setPseudo(const std::string &key, const TStyle &style);
private:
// pseudo elements like ":before" and ":after"
std::map<std::string, TStyle> _Pseudo;
};
}

15
code/nel/include/nel/gui/interface_group.h
View file

@ -211,6 +211,11 @@ namespace NLGUI
int luaGetNumGroups(CLuaState &ls);
int luaGetGroup(CLuaState &ls);
// debug functions
int luaDumpSize(CLuaState &ls);
int luaDumpEltsOrder(CLuaState &ls);
int luaDumpGroups(CLuaState &ls);
void setMaxSizeRef(const std::string &maxSizeRef);
std::string getMaxSizeRefAsString() const;
@ -223,6 +228,9 @@ namespace NLGUI
REFLECT_LUA_METHOD("delGroup", luaDelGroup);
REFLECT_LUA_METHOD("getNumGroups", luaGetNumGroups);
REFLECT_LUA_METHOD("getGroup", luaGetGroup);
REFLECT_LUA_METHOD("dumpSize", luaDumpSize);
REFLECT_LUA_METHOD("dumpEltsOrder", luaDumpEltsOrder);
REFLECT_LUA_METHOD("dumpGroups", luaDumpGroups);
REFLECT_STRING ("left_click", getLeftClickHandler, setLeftClickHandler);
REFLECT_STRING ("right_click", getRightClickHandler, setRightClickHandler);
REFLECT_STRING ("left_click_params", getLeftClickHandlerParams, setLeftClickHandlerParams);
@ -274,8 +282,8 @@ namespace NLGUI
sint getInsertionOrder(CViewBase *vb) const;
// for debug only
void dumpGroups();
void dumpEltsOrder();
void dumpGroups() const;
void dumpEltsOrder() const;
virtual void renderWiredQuads(CInterfaceElement::TRenderWired type, const std::string &uiFilter);
@ -345,6 +353,9 @@ namespace NLGUI
void makeNewClip (sint32 &oldClipX, sint32 &oldClipY, sint32 &oldClipW, sint32 &oldClipH);
void restoreClip (sint32 oldSciX, sint32 oldSciY, sint32 oldSciW, sint32 oldSciH);
// Compute clip contribution for current window. This doesn't change the clip window in the driver.
void computeClipContribution(sint32 &newX, sint32 &newY, sint32 &newW, sint32 &newH) const;
// Compute clip contribution for current window, and a previous clipping rectangle. This doesn't change the clip window in the driver.
void computeCurrentClipContribution(sint32 prevX, sint32 prevY, sint32 prevW, sint32 prevH,
sint32 &newX, sint32 &newY, sint32 &newW, sint32 &newH) const;

7
code/nel/include/nel/gui/view_bitmap.h
View file

@ -56,8 +56,14 @@ namespace NLGUI
_TxtOffsetY = 0;
_TxtWidth = -1;
_TxtHeight = -1;
// Support for https://.. textures
_HtmlDownload = false;
}
/// Destructor
virtual ~CViewBitmap();
std::string getProperty( const std::string &name ) const;
void setProperty( const std::string &name, const std::string &value );
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
@ -132,6 +138,7 @@ namespace NLGUI
bool _Flip : 1;
bool _Tile : 1;
bool _InheritGCAlpha : 1;
bool _HtmlDownload : 1;
// For single texture

6
code/nel/include/nel/misc/common.h
View file

@ -282,9 +282,11 @@ template <class T> T trimQuotes (const T &str)
typename T::size_type size = str.size();
if (size == 0)
return str;
if (str[0] != str[size-1] && (str[0] != '"' || str[0] != '\''))
if (str[0] != str[size-1])
return str;
return str.substr(1, size - 1);
if (str[0] != '"' && str[0] != '\'')
return str;
return str.substr(1, size - 2);
}
//////////////////////////////////////////////////////////////////////////

1
code/nel/include/nel/misc/version_nl.cmake
View file

@ -2,6 +2,7 @@
#define NL_VERSION_H
#define NL_VERSION "${NL_VERSION}"
#define NL_PRODUCT_VERSION "${NL_PRODUCT_VERSION}"
#define NL_VERSION_MAJOR ${NL_VERSION_MAJOR}
#define NL_VERSION_MINOR ${NL_VERSION_MINOR}
#define NL_VERSION_PATCH ${NL_VERSION_PATCH}

2
code/nel/include/nel/sound/audio_decoder_mp3.h
View file

@ -18,7 +18,7 @@
#define NLSOUND_AUDIO_DECODER_MP3_H
#include <nel/misc/types_nl.h>
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#include <nel/sound/audio_decoder.h>

1603
code/nel/include/nel/sound/decoder/dr_mp3.h
View file

File diff suppressed because it is too large Load diff

11
code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
View file

@ -1247,23 +1247,23 @@ bool CDriverD3D::init (uintptr_t windowIcon, emptyProc exitFunc)
createCursors();
_WindowClass = "NLD3D" + toString(windowIcon);
_WindowClass = utf8ToWide("NLD3D" + toString(windowIcon));
// Register a window class
WNDCLASSA wc;
WNDCLASSW wc;
memset(&wc,0,sizeof(wc));
wc.style = 0; // CS_HREDRAW | CS_VREDRAW ;//| CS_DBLCLKS;
wc.lpfnWndProc = (WNDPROC)WndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = GetModuleHandleA(NULL);
wc.hInstance = GetModuleHandleW(NULL);
wc.hIcon = (HICON)windowIcon;
wc.hCursor = _DefaultCursor;
wc.hbrBackground = WHITE_BRUSH;
wc.lpszClassName = _WindowClass.c_str();
wc.lpszMenuName = NULL;
if (!RegisterClassA(&wc))
if (!RegisterClassW(&wc))
{
DWORD error = GetLastError();
if (error != ERROR_CLASS_ALREADY_EXISTS)
@ -1416,8 +1416,7 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
AdjustWindowRect(&WndRect,WndFlags,FALSE);
// Create
ucstring ustr(_WindowClass);
_HWnd = CreateWindowW((LPCWSTR)ustr.c_str(), L"", WndFlags, CW_USEDEFAULT,CW_USEDEFAULT, WndRect.right-WndRect.left,WndRect.bottom-WndRect.top, NULL, NULL,
_HWnd = CreateWindowW(_WindowClass.c_str(), L"", WndFlags, CW_USEDEFAULT,CW_USEDEFAULT, WndRect.right-WndRect.left,WndRect.bottom-WndRect.top, NULL, NULL,
GetModuleHandleW(NULL), NULL);
if (!_HWnd)
{

2
code/nel/src/3d/driver/direct3d/driver_direct3d.h
View file

@ -2314,7 +2314,7 @@ private:
TShaderDrvInfoPtrList _ShaderDrvInfos;
// Windows
std::string _WindowClass;
std::wstring _WindowClass;
HWND _HWnd;
sint32 _WindowX;
sint32 _WindowY;

4
code/nel/src/3d/driver/direct3d/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

2
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -316,7 +316,7 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc)
wc.lpfnWndProc = (WNDPROC)WndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = GetModuleHandle(NULL);
wc.hInstance = GetModuleHandleW(NULL);
wc.hIcon = (HICON)windowIcon;
wc.hCursor = _DefaultCursor;
wc.hbrBackground = WHITE_BRUSH;

4
code/nel/src/3d/driver/opengl/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/src/3d/driver/opengles/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

40
code/nel/src/gui/css_parser.cpp
View file

@ -463,7 +463,7 @@ namespace NLGUI
{
if (sel[pos] == '\'' || sel[pos] == '"')
{
// value is quoted
// skip over quoted value
start = pos;
pos++;
while(pos < sel.size() && sel[pos] != sel[start])
@ -476,9 +476,6 @@ namespace NLGUI
}
if (pos == sel.size()) break;
value = sel.substr(start + 1, pos - start - 1);
break;
}
else if (sel[pos] == '\\')
{
@ -486,7 +483,6 @@ namespace NLGUI
}
else if (!quote && sel[pos] == ']')
{
// unquoted value
value = sel.substr(start, pos - start);
break;
}
@ -494,17 +490,20 @@ namespace NLGUI
pos++;
} // while 'value'
// TODO: scan for sel[pos] == ']'
if (pos == sel.size()) break;
// whitespace between quote and ], ie '[ attr $= "val" ]'
if (sel[pos] != ']')
{
while(pos < sel.size() && sel[pos] != ']')
pos++;
}
if (pos == sel.size()) break;
current.addAttribute(key.toUtf8(), value.toUtf8(), (char)op);
bool cs = true;
// [value="attr" i]
if (value.size() > 2 && value[value.size()-2] == ' ')
{
ucchar lastChar = value[value.size()-1];
if (lastChar == 'i' || lastChar == 'I' || lastChar == 's' || lastChar == 'S')
{
value = value.substr(0, value.size()-2);
cs = !((lastChar == 'i' || lastChar == 'I'));
}
}
current.addAttribute(key.toUtf8(), trimQuotes(value).toUtf8(), (char)op, cs);
} // op error
} // no value
@ -631,18 +630,9 @@ namespace NLGUI
{
result.clear();
}
else if (result.empty() || !current.empty())
else if (!current.empty())
{
// pseudo element like ':before' can only be set on the last selector
if (!result.empty() && !pseudoElement.empty())
{
// failed
result.clear();
}
else
{
result.push_back(current);
}
result.push_back(current);
}
return result;

56
code/nel/src/gui/css_selector.cpp
View file

@ -71,9 +71,17 @@ namespace NLGUI
}
}
void CCssSelector::addAttribute(const std::string &key, const std::string &val, char op)
void CCssSelector::addAttribute(const std::string &key, const std::string &val, char op, bool cs)
{
Attr.push_back(SAttribute(key, val, op));
if (cs)
{
// case sensitive match
Attr.push_back(SAttribute(key, val, op, cs));
}
else
{
Attr.push_back(SAttribute(key, toLower(val), op, cs));
}
}
void CCssSelector::addPseudoClass(const std::string &key)
@ -135,6 +143,12 @@ namespace NLGUI
if (!elm.hasAttribute(Attr[i].key)) return false;
std::string value = elm.getAttribute(Attr[i].key);
// case-insensitive compare, Attr.value is already lowercased
if (!Attr[i].caseSensitive)
{
value = toLower(value);
}
switch(Attr[i].op)
{
case '=':
@ -310,5 +324,43 @@ namespace NLGUI
}
}
std::string CCssSelector::toString() const
{
std::string ret;
ret += Element;
ret += Id;
if (!Class.empty())
{
for(uint i = 0; i<Class.size(); i++)
ret += "." + Class[i];
}
if (!Attr.empty())
{
for(uint i = 0; i<Attr.size(); ++i)
{
ret += "[" + Attr[i].key;
if (Attr[i].op != ' ')
{
ret += Attr[i].op + Attr[i].value;
}
ret += "]";
}
}
if (!PseudoClass.empty())
{
for(uint i = 0; i<PseudoClass.size(); ++i)
{
ret += ":" + PseudoClass[i];
}
}
if (Combinator != '\0')
{
ret += Combinator;
}
// ret += ":" + PseudoClass;
return ret;
}
} // namespace

27
code/nel/src/gui/css_style.cpp
View file

@ -89,8 +89,7 @@ namespace NLGUI
}
elm.Style.clear();
elm.StyleBefore.clear();
elm.StyleAfter.clear();
elm.clearPseudo();
if (!mRules.empty())
{
@ -101,13 +100,9 @@ namespace NLGUI
{
merge(elm.Style, i->Properties);
}
else if (i->PseudoElement == ":before")
else
{
merge(elm.StyleBefore, i->Properties);
}
else if (i->PseudoElement == ":after")
{
merge(elm.StyleAfter, i->Properties);
elm.setPseudo(i->PseudoElement, i->Properties);
}
}
}
@ -461,6 +456,14 @@ namespace NLGUI
if (pos != style.StyleRules.end())
style.StyleRules.erase(pos);
}
else
if (it->first == "display")
{
if (it->second == "inherit")
style.DisplayBlock = current.DisplayBlock;
else
style.DisplayBlock = (it->second == "block" || it->second == "table");
}
}
}
@ -720,6 +723,8 @@ namespace NLGUI
style.Width = tmpf * style.FontSize;
else if (unit == "pt")
style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.Width = 0; // TODO: style.WidthRatio
else
style.Width = tmpf;
}
@ -736,6 +741,8 @@ namespace NLGUI
style.Height = tmpf * style.FontSize;
else if (unit == "pt")
style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.Height = 0; // TODO: style.HeightRatio
else
style.Height = tmpf;
}
@ -752,6 +759,8 @@ namespace NLGUI
style.MaxWidth = tmpf * style.FontSize;
else if (unit == "pt")
style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.MaxWidth = 0; // TODO: style.MaxWidthRatio
else
style.MaxWidth = tmpf;
}
@ -768,6 +777,8 @@ namespace NLGUI
style.MaxHeight = tmpf * style.FontSize;
else if (unit == "pt")
style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.MaxHeight = 0; // TODO: style.MaxHeightRatio
else
style.MaxHeight = tmpf;
}

4
code/nel/src/gui/curl_certificates.cpp
View file

@ -332,7 +332,9 @@ namespace NLGUI
{
ERR_error_string_n(errCode, errorBuffer, 1024);
nlwarning("Error adding certificate %s: %s", entry.name.c_str(), errorBuffer);
res = CURLE_SSL_CACERT;
// There seems to be intermittent issues (on windows) where cert loading will fail for same 3 to 5 certs
// with an 'SSL_shutdown while in init' error. It does not seem to be fatal for connection.
//res = CURLE_SSL_CACERT;
}
}
else

4
code/nel/src/gui/group_container.cpp
View file

@ -2385,7 +2385,7 @@ namespace NLGUI
{
_W = _Parent->getW();
}
setMaxH (16384); // No scrollbar for container of layer > 0
setMaxH (std::numeric_limits<sint32>::max()); // No scrollbar for container of layer > 0
newH = (pLayer->H_T - pLayer->InsetT);
}
@ -2468,7 +2468,7 @@ namespace NLGUI
else
{
if (_List != NULL)
_List->setMaxH (16384);
_List->setMaxH (std::numeric_limits<sint32>::max());
}
if (_LayerSetup == 0)

681
code/nel/src/gui/group_html.cpp
View file

File diff suppressed because it is too large Load diff

1
code/nel/src/gui/group_list.cpp
View file

@ -1026,7 +1026,6 @@ namespace NLGUI
}
child->_Parent = this;
child->_ParentPos = NULL;
child->_Active = true;
child->_X = 0;
child->_Y = 0;
child->_RenderLayer = this->_RenderLayer;

40
code/nel/src/gui/html_element.cpp
View file

@ -82,6 +82,46 @@ namespace NLGUI
}
}
// ***************************************************************************
void CHtmlElement::clearPseudo()
{
_Pseudo.clear();
}
// ***************************************************************************
bool CHtmlElement::hasPseudo(const std::string &key) const
{
return _Pseudo.find(key) != _Pseudo.end();
}
// ***************************************************************************
TStyle CHtmlElement::getPseudo(const std::string &key) const
{
std::map<std::string, TStyle>::const_iterator it = _Pseudo.find(key);
if (it != _Pseudo.end())
return it->second;
return TStyle();
}
// ***************************************************************************
void CHtmlElement::setPseudo(const std::string &key, const TStyle &style)
{
std::map<std::string, TStyle>::iterator it = _Pseudo.find(key);
if (it != _Pseudo.end())
{
// insert into previous, override previous values if they exist
for(TStyle::const_iterator itStyle = style.begin(); itStyle != style.end(); ++itStyle)
{
it->second[itStyle->first] = itStyle->second;
}
}
else
{
_Pseudo[key] = style;
}
}
// ***************************************************************************
std::string CHtmlElement::toString(bool tree, uint depth) const
{

90
code/nel/src/gui/interface_group.cpp
View file

@ -51,14 +51,14 @@ namespace NLGUI
CInterfaceGroup::CInterfaceGroup(const TCtorParam &param) : CCtrlBase(param)
{
_ParentSizeMax = NULL;
_MaxW = _MaxH = 16384;
_MaxW = _MaxH = std::numeric_limits<sint32>::max();
_OffsetX = _OffsetY = 0;
_Overlappable= true;
_ResizeFromChildW= false;
_ResizeFromChildH= false;
_ResizeFromChildWMargin= 0;
_ResizeFromChildHMargin= 0;
_MaxWReal = _MaxHReal = 16384;
_MaxWReal = _MaxHReal = std::numeric_limits<sint32>::max();
_GroupSizeRef = 0;
_Escapable= false;
_Priority= WIN_PRIORITY_NORMAL;
@ -829,7 +829,7 @@ namespace NLGUI
const std::map< uint32, SLinkData > &linkMap =
CWidgetManager::getInstance()->getParser()->getLinkMap();
xmlNodePtr node = NULL;
std::map< uint32, SLinkData >::const_iterator itr;
@ -847,17 +847,17 @@ namespace NLGUI
xmlAddChild( parentNode, node );
xmlSetProp( node, BAD_CAST "expr", BAD_CAST data.expr.c_str() );
if( !data.target.empty() )
xmlSetProp( node, BAD_CAST "target", BAD_CAST data.target.c_str() );
if( !data.action.empty() )
{
xmlSetProp( node, BAD_CAST "action", BAD_CAST data.action.c_str() );
if( !data.params.empty() )
xmlSetProp( node, BAD_CAST "params", BAD_CAST data.params.c_str() );
if( !data.cond.empty() )
xmlSetProp( node, BAD_CAST "cond", BAD_CAST data.cond.c_str() );
}
@ -1542,12 +1542,8 @@ namespace NLGUI
// \todo yoyo: do not know why but don't work if this==scroll_text
if(sonGroup && !isGroupScrollText())
{
sint32 oldSciX= -16384;
sint32 oldSciY= -16384;
sint32 oldSciW= 32768;
sint32 oldSciH= 32768;
sint32 w, h;
sonGroup->computeCurrentClipContribution(oldSciX, oldSciY, oldSciW, oldSciH, x0, y0, w, h);
sonGroup->computeClipContribution(x0, y0, w, h);
x1= x0 + w;
y1= y0 + h;
}
@ -1792,7 +1788,7 @@ namespace NLGUI
CInterfaceGroup *pChild = *itg;
if (pChild->getActive())
{
// bool bUnder =
// bool bUnder =
pChild->getViewsUnder (x, y, clipX, clipY, clipW, clipH, vVB);
// if (bUnder && !vICL.empty())
// return true;
@ -1847,7 +1843,7 @@ namespace NLGUI
CInterfaceGroup *pChild = *itg;
if (pChild->getActive())
{
// bool bUnder =
// bool bUnder =
pChild->getCtrlsUnder (x, y, clipX, clipY, clipW, clipH, vICL);
// if (bUnder && !vICL.empty())
// return true;
@ -1903,7 +1899,7 @@ namespace NLGUI
CInterfaceGroup *pChild = *itg;
if (pChild->getActive())
{
// bool bUnder =
// bool bUnder =
pChild->getGroupsUnder (x, y, clipX, clipY, clipW, clipH, vIGL);
// if (bUnder && !vICL.empty())
// return true;
@ -1926,8 +1922,7 @@ namespace NLGUI
}
// ------------------------------------------------------------------------------------------------
void CInterfaceGroup::computeCurrentClipContribution(sint32 oldSciX, sint32 oldSciY, sint32 oldSciW, sint32 oldSciH,
sint32 &newSciXDest, sint32 &newSciYDest, sint32 &newSciWDest, sint32 &newSciHDest) const
void CInterfaceGroup::computeClipContribution(sint32 &newSciXDest, sint32 &newSciYDest, sint32 &newSciWDest, sint32 &newSciHDest) const
{
sint32 newSciX = _XReal;
sint32 newSciY = _YReal;
@ -1947,6 +1942,21 @@ namespace NLGUI
newSciY = _YReal + _HReal - _MaxHReal;
newSciH = _MaxHReal;
}
// Don't apply margins because HTML list marker is drawn outside group paragraph inner content.
// Should not be an issue because horizontal scolling not used.
newSciXDest = newSciX/* + _MarginLeft*/;
newSciYDest = newSciY;
newSciWDest = newSciW/* - _MarginLeft*/;
newSciHDest = newSciH;
}
// ------------------------------------------------------------------------------------------------
void CInterfaceGroup::computeCurrentClipContribution(sint32 oldSciX, sint32 oldSciY, sint32 oldSciW, sint32 oldSciH,
sint32 &newSciXDest, sint32 &newSciYDest, sint32 &newSciWDest, sint32 &newSciHDest) const
{
sint32 newSciX, newSciY, newSciW, newSciH;
computeClipContribution(newSciX, newSciY, newSciW, newSciH);
// Clip Left
if (newSciX < oldSciX)
{
@ -2149,7 +2159,34 @@ namespace NLGUI
}
// ------------------------------------------------------------------------------------------------
void CInterfaceGroup::dumpGroups()
int CInterfaceGroup::luaDumpSize(CLuaState &ls)
{
const char *funcName = "dumpSize";
CLuaIHM::checkArgCount(ls, funcName, 0);
dumpSize();
return 0;
}
// ------------------------------------------------------------------------------------------------
int CInterfaceGroup::luaDumpEltsOrder(CLuaState &ls)
{
const char *funcName = "dumpEltsOrder";
CLuaIHM::checkArgCount(ls, funcName, 0);
dumpEltsOrder();
return 0;
}
// ------------------------------------------------------------------------------------------------
int CInterfaceGroup::luaDumpGroups(CLuaState &ls)
{
const char *funcName = "dumpGroups";
CLuaIHM::checkArgCount(ls, funcName, 0);
dumpGroups();
return 0;
}
// ------------------------------------------------------------------------------------------------
void CInterfaceGroup::dumpGroups() const
{
nlinfo("Num groups = %d", (int) _ChildrenGroups.size());
for(uint k = 0; k < _ChildrenGroups.size(); ++k)
@ -2166,21 +2203,18 @@ namespace NLGUI
}
// ------------------------------------------------------------------------------------------------
void CInterfaceGroup::dumpEltsOrder()
void CInterfaceGroup::dumpEltsOrder() const
{
nlinfo("Num elements = %d", (int) _EltOrder.size());
nlinfo("Num elements = %d, num groups = %d", (int) _EltOrder.size(), _ChildrenGroups.size());
for(uint k = 0; k < _EltOrder.size(); ++k)
{
std::string typeName = "???";
if (_ChildrenGroups[k])
{
NLGUI::CViewBase *view = _EltOrder[k];
const type_info &ti = typeid(*view);
typeName = ti.name();
}
CInterfaceElement *el = _EltOrder[k];
if (el)
{
std::string typeName;
NLGUI::CViewBase *view = _EltOrder[k];
const type_info &ti = typeid(*view);
typeName = ti.name();
nlinfo("Element %d, name = %s, type=%s, x=%d, y=%d, parent_name=%s parentposname=%s xreal=%d, yreal=%d, wreal=%d, hreal=%d",
k, el->getId().c_str(), typeName.c_str(), el->getX(), el->getY(), el->getParent() ? el->getParent()->getId().c_str() : "no parent",
el->getParentPos() ? el->getParentPos()->getId().c_str() : "parent",
@ -2595,7 +2629,7 @@ namespace NLGUI
e->setSizeRef("");
e->setParent(p);
e->setParentPos(p);
e->setParentSize(p);
e->alignTo(p);

13
code/nel/src/gui/view_bitmap.cpp
View file

@ -37,6 +37,18 @@ REGISTER_UI_CLASS(CViewBitmap)
namespace NLGUI
{
CViewBitmap::~CViewBitmap()
{
if (_HtmlDownload)
{
CGroupHTML *groupHtml = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:webig:content:html"));
if (groupHtml) {
_HtmlDownload = false;
groupHtml->removeImageDownload(dynamic_cast<CViewBase*>(this));
}
}
}
std::string CViewBitmap::getProperty( const std::string &name ) const
{
if( name == "color" )
@ -461,6 +473,7 @@ namespace NLGUI
if (!CFile::fileExists(localname))
localname = "web_del.tga";
_TextureId.setTexture (localname.c_str(), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
_HtmlDownload = true;
groupHtml->addImageDownload(TxName, dynamic_cast<CViewBase*>(this));
}
}

6
code/nel/src/gui/view_text.cpp
View file

@ -79,7 +79,7 @@ namespace NLGUI
_MultiLine = false;
_TextMode = DontClipWord;
_MultiLineSpace = 8;
_LineMaxW = 16384;
_LineMaxW = std::numeric_limits<sint32>::max();
_MultiLineMaxWOnly = false;
_MultiLineClipEndSpace = false;
_LastMultiLineMaxW = 0;
@ -199,7 +199,7 @@ namespace NLGUI
_MultiLine = false;
_MultiLineSpace = 8;
_LineMaxW= 16384;
_LineMaxW= std::numeric_limits<sint32>::max();
_MultiLineMaxWOnly = false;
_MultiLineClipEndSpace = false;
_LastMultiLineMaxW = 0;
@ -858,7 +858,7 @@ namespace NLGUI
}
prop = (char*) xmlGetProp( cur, (xmlChar*)"line_maxw" );
_LineMaxW = 16384;
_LineMaxW = std::numeric_limits<sint32>::max();
if (prop)
fromString((const char*)prop, _LineMaxW);

2
code/nel/src/ligo/zone_bank.cpp
View file

@ -508,7 +508,7 @@ bool CZoneBank::initFromPath(const std::string &sPathName, std::string &error)
if (ext == "ligozone")
{
if (!addElement(NLMISC::CFile::getFilename(files[i]), error))
if (!addElement(files[i], error))
return false;
}
}

3
code/nel/src/misc/stdmisc.h
View file

@ -20,8 +20,11 @@
#if defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <malloc.h>
#include <crtdbg.h>
#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#elif defined(_MSC_VER)
#include <malloc.h>
#endif
#include <algorithm>

8
code/nel/src/misc/string_common.cpp
View file

@ -144,9 +144,9 @@ std::string winCpToCp(const char *str, size_t len, UINT srcCp, UINT dstCp)
wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4);
if (!tmp)
return std::string();
int tmpLen = MultiByteToWideChar(srcCp, MB_PRECOMPOSED,
int tmpLen = MultiByteToWideChar(srcCp, 0,
str, (int)(len + 1), /* include null-termination */
tmp, (int)((len + 1) * 4));
tmp, (int)((len + 1) * 2));
if (tmpLen <= 1)
{
_freea(tmp);
@ -170,9 +170,9 @@ std::wstring winCpToWide(const char *str, size_t len, UINT cp)
wchar_t *tmp = (wchar_t *)_malloca((len + 1) * 4);
if (!tmp)
return std::wstring();
int tmpLen = MultiByteToWideChar(cp, MB_PRECOMPOSED,
int tmpLen = MultiByteToWideChar(cp, 0,
str, (int)(len + 1), /* include null-termination */
tmp, (int)((len + 1) * 4));
tmp, (int)((len + 1) * 2));
if (tmpLen <= 1)
{
_freea(tmp);

4
code/nel/src/sound/audio_decoder.cpp
View file

@ -103,7 +103,7 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
{
return new CAudioDecoderVorbis(stream, loop);
}
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
else if (type_lower == "mp3")
{
return new CAudioDecoderMP3(stream, loop);
@ -146,7 +146,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
nlwarning("Unable to open: '%s'", filepath.c_str());
}
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
else if (type_lower == "mp3")
{
CIFile ifile;

2
code/nel/src/sound/audio_decoder_mp3.cpp
View file

@ -17,7 +17,7 @@
#include "stdsound.h"
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#include <nel/sound/audio_decoder_mp3.h>

4
code/nel/src/sound/driver/dsound/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/src/sound/driver/fmod/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/src/sound/driver/openal/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_openal_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/src/sound/driver/xaudio2/resources.rc
View file

@ -27,11 +27,11 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/anim_builder/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(anim_builder ${SRC})

BIN
code/nel/tools/3d/anim_builder/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/anim_builder/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Anim Builder"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "anim_builder" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

6
code/nel/tools/3d/animation_set_builder/CMakeLists.txt
View file

@ -1,9 +1,11 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(animation_set_builder ${SRC})
TARGET_LINK_LIBRARIES(animation_set_builder nel3d nelmisc)
NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: anim_set_builder")
NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: Animation Set Builder")
NL_ADD_RUNTIME_FLAGS(animation_set_builder)
INSTALL(TARGETS animation_set_builder RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

BIN
code/nel/tools/3d/animation_set_builder/gold_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/animation_set_builder/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Animation Set Builder"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "animation_set_builder" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/build_clod_bank/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_clod_bank ${SRC})

4
code/nel/tools/3d/build_clodtex/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_clodtex ${SRC})

4
code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_coarse_mesh ${SRC})

4
code/nel/tools/3d/build_far_bank/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_far_bank ${SRC})

2
code/nel/tools/3d/build_interface/CMakeLists.txt
View file

@ -1,4 +1,4 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})

4
code/nel/tools/3d/build_shadow_skin/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_shadow_skin ${SRC})

4
code/nel/tools/3d/build_smallbank/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_smallbank ${SRC})

4
code/nel/tools/3d/cluster_viewer/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC})

42
code/nel/tools/3d/cluster_viewer/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "red_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Cluster Viewer"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "cluster_viewer" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

BIN
code/nel/tools/3d/cluster_viewer/red_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

4
code/nel/tools/3d/get_neighbors/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(get_neighbors ${SRC})

BIN
code/nel/tools/3d/get_neighbors/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/get_neighbors/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Get Neighbors"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "get_neighbors" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

6
code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
View file

@ -1,5 +1,7 @@
FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h)
FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(hls_bank_maker ${SRC})
TARGET_LINK_LIBRARIES(hls_bank_maker s3tc_compressor nelmisc nel3d)

BIN
code/nel/tools/3d/hls_bank_maker/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/hls_bank_maker/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL HLS Bank Maker"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "hls_bank_maker" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/ig_add/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_add ${SRC})

BIN
code/nel/tools/3d/ig_add/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/ig_add/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL IG Add"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "ig_add" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/ig_elevation/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_elevation ${SRC})

BIN
code/nel/tools/3d/ig_elevation/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/ig_elevation/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL IG Elevation"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "ig_elevation" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/ig_lighter/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_lighter ${SRC})

BIN
code/nel/tools/3d/ig_lighter/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/ig_lighter/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL IG Lighter"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "ig_lighter" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

4
code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(lightmap_optimizer ${SRC})

BIN
code/nel/tools/3d/lightmap_optimizer/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/lightmap_optimizer/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Lightmap Optimizer"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "lightmap_optimizer" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

6
code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
View file

@ -1,6 +1,8 @@
FILE(GLOB SRC *.cpp *.h ../../ig_lighter_lib/*.cpp ../../ig_lighter_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../../ig_lighter_lib/*.cpp ../../ig_lighter_lib/*.h *.rc *.rc2 *.def)
ADD_LIBRARY(ligoscape_utility SHARED ligoscape_utility.rc ${SRC} ligoscape_utility.def)
SOURCE_GROUP("" FILES ${SRC})
ADD_LIBRARY(ligoscape_utility SHARED ${SRC})
INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})

68
code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc
View file

@ -1,4 +1,4 @@
//Microsoft Developer Studio generated resource script.
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@ -7,19 +7,17 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "windows.h"
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
// English resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@ -27,76 +25,32 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
3 TEXTINCLUDE
BEGIN
"\r\n"
"#include ""version.rc2""\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,0,0
PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileVersion", "3.0.0.0\0"
VALUE "InternalName", "Ligoscape\0"
VALUE "LegalCopyright", "\0"
VALUE "OriginalFilename", "Ligoscape.dlu\0"
VALUE "ProductName", "3D Studio MAX\0"
VALUE "ProductVersion", "3.0.0.0\0"
VALUE "FileDescription", "NeL Ligoscape utility\0"
VALUE "Comments", "TECH: \0"
VALUE "LegalTrademarks", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
STRINGTABLE
BEGIN
IDS_LIBDESCRIPTION "NeL Ligoscape utility"
IDS_CATEGORY "NeL Tools"
@ -105,7 +59,7 @@ BEGIN
IDS_SPIN "Spin"
END
#endif // English (U.S.) resources
#endif // English resources
/////////////////////////////////////////////////////////////////////////////
@ -115,7 +69,7 @@ END
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "version.rc2"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
code/nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp
View file

@ -134,7 +134,7 @@ bool CMaxToLigo::loadLigoConfigFile (CLigoConfig& config, Interface& it, bool di
if (res)
{
// Path
std::string path = NLMISC::CFile::getPath(MCharStrToUtf8(sModulePath) + "ligoscape.cfg");
std::string path = NLMISC::CFile::getPath(MCharStrToUtf8(sModulePath)) + "ligoscape.cfg";
try
{

55
code/nel/tools/3d/ligo/plugin_max/version.rc2 Normal file
View file

@ -0,0 +1,55 @@
#ifndef NL_VERSION_RC2
#define NL_VERSION_RC2
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(65001)
#include <windows.h>
#include "config.h"
#include "maxversion.h"
#define STRINGIFY_(x) #x
#define STRINGIFY(x) STRINGIFY_(x)
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT "_r"
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK"
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Ligoscape utility"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
VALUE "OriginalFilename", "nelligoscapeutility" NL_FILEEXT ".dlx"
VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END
#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
#endif /* #ifndef NL_VERSION_RC2 */

5
code/nel/tools/3d/mesh_export/CMakeLists.txt
View file

@ -1,9 +1,10 @@
FILE(GLOB SRCS *.cpp)
FILE(GLOB HDRS *.h)
FILE(GLOB RECS *.rc)
SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
SOURCE_GROUP("" FILES ${SRCS} ${HDRS} ${RECS})
ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS})
ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS} ${RECS})
TARGET_LINK_LIBRARIES(mesh_export mesh_utils nel3d nelmisc)
NL_DEFAULT_PROPS(mesh_export "NeL, Tools, 3D: Mesh Export")

BIN
code/nel/tools/3d/mesh_export/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/mesh_export/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Mesh Export"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "mesh_export" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

6
code/nel/tools/3d/object_viewer/CMakeLists.txt
View file

@ -1,6 +1,8 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
ADD_LIBRARY(object_viewer_dll SHARED ${SRC} object_viewer.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_LIBRARY(object_viewer_dll SHARED ${SRC})
TARGET_LINK_LIBRARIES(object_viewer_dll
nelmisc

98
code/nel/tools/3d/object_viewer/object_viewer.rc
View file

@ -13,11 +13,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
// English resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
@ -259,19 +259,6 @@ BEGIN
"No views were selected ! No snapshot will be taken."
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
@ -2567,58 +2554,14 @@ BEGIN
"#include ""res\\object_viewer.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
"#include ""l.fra\\afxres.rc"" // Standard components\r\n"
"#endif\r\n"
"\r\n"
"#include ""version.rc2""\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,103
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040c04b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "object_viewer DLL\0"
VALUE "FileVersion", "1, 0, 0, 103\0"
VALUE "InternalName", "object_viewer\0"
VALUE "LegalCopyright", "Copyright (C) 2001\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "object_viewer.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Bibliothèque de liaison dynamique object_viewer\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x40c, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// Menu
@ -3248,35 +3191,6 @@ BEGIN
0
END
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDR_MAINFRAME "Toto"
END
STRINGTABLE DISCARDABLE
BEGIN
ID_SHOOT_SCENE "Shoot the scene in a movie"
END
#endif // French (France) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// French (Belgium) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRB)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
@ -3323,7 +3237,7 @@ BEGIN
END
#endif // APSTUDIO_INVOKED
#endif // French (Belgium) resources
#endif // English resources
/////////////////////////////////////////////////////////////////////////////
@ -3347,6 +3261,8 @@ LANGUAGE 12, 1
#include "l.fra\afxres.rc" // Standard components
#endif
#include "version.rc2"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

51
code/nel/tools/3d/object_viewer/version.rc2 Normal file
View file

@ -0,0 +1,51 @@
#ifndef NL_VERSION_RC2
#define NL_VERSION_RC2
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(65001)
#include <windows.h>
#include "config.h"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT "_r"
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Object Viewer dynamic library"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "object_viewer" NL_FILEEXT ".dll"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END
#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
#endif /* #ifndef NL_VERSION_RC2 */

6
code/nel/tools/3d/object_viewer_exe/CMakeLists.txt
View file

@ -1,9 +1,11 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
SOURCE_GROUP("" FILES ${SRC})
ENABLE_LANGUAGE(RC)
ADD_DEFINITIONS(${MFC_DEFINITIONS})
SET(CMAKE_MFC_FLAG 2)
ADD_EXECUTABLE(object_viewer WIN32 ${SRC} object_viewer_exe.rc)
ADD_EXECUTABLE(object_viewer WIN32 ${SRC})
TARGET_LINK_LIBRARIES( object_viewer
nelmisc

35
code/nel/tools/3d/object_viewer_exe/object_viewer_exe.rc
View file

@ -1,4 +1,4 @@
//Microsoft Developer Studio generated resource script.
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@ -7,19 +7,17 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
// English resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@ -28,46 +26,35 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_MAIN_ICON ICON DISCARDABLE "nevraxpill.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
IDI_MAIN_ICON ICON "nevraxpill.ico"
/////////////////////////////////////////////////////////////////////////////
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
3 TEXTINCLUDE
BEGIN
"\r\n"
"#include ""version.rc2""\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // French (France) resources
#endif // English resources
/////////////////////////////////////////////////////////////////////////////
@ -77,7 +64,7 @@ END
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "version.rc2"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

18
code/nel/tools/3d/object_viewer_exe/resource.h
View file

@ -1,21 +1,5 @@
// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
// 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 <http://www.gnu.org/licenses/>.
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Microsoft Visual C++ generated include file.
// Used by object_viewer_exe.rc
//
#define IDI_ICON1 101

51
code/nel/tools/3d/object_viewer_exe/version.rc2 Normal file
View file

@ -0,0 +1,51 @@
#ifndef NL_VERSION_RC2
#define NL_VERSION_RC2
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(65001)
#include <windows.h>
#include "config.h"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Object Viewer"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "object_viewer" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END
#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
#endif /* #ifndef NL_VERSION_RC2 */

4
code/nel/tools/3d/panoply_maker/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(panoply_maker ${SRC})

BIN
code/nel/tools/3d/panoply_maker/blue_pill.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

42
code/nel/tools/3d/panoply_maker/main.rc Normal file
View file

@ -0,0 +1,42 @@
#include <windows.h>
#include "config.h"
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Panoply Maker"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "panoply_maker" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

0
code/nel/tools/3d/panoply_preview/greenpill.ico → code/nel/tools/3d/panoply_preview/green_pill.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

1
code/nel/tools/3d/panoply_preview/icon.rc
View file

@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "greenpill.ico"

43
code/nel/tools/3d/panoply_preview/main.rc Normal file
View file

@ -0,0 +1,43 @@
#include <windows.h>
#include "config.h"
IDI_ICON1 ICON DISCARDABLE "green_pill.ico"
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT ""
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL Panoply Preview"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
VALUE "OriginalFilename", "nl_panoply_preview" NL_FILEEXT ".exe"
VALUE "ProductName", "NeL Tools"
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END

6
code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt
View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h *.def)
FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
SOURCE_GROUP("" FILES ${SRC})
ADD_LIBRARY(nel_3dsmax_shared SHARED ${SRC})
@ -11,7 +13,7 @@ TARGET_LINK_LIBRARIES(nel_3dsmax_shared
${MAXSDK_LIBRARIES}
Version.lib)
NL_DEFAULT_PROPS(nel_3dsmax_shared "MAX Plugin: NeL 3DSMAX Shared")
NL_DEFAULT_PROPS(nel_3dsmax_shared "MAX Plugin: NeL 3ds Max Shared")
NL_ADD_RUNTIME_FLAGS(nel_3dsmax_shared)
NL_ADD_LIB_SUFFIX(nel_3dsmax_shared)
#SET_TARGET_PROPERTIES(nel_export PROPERTIES SUFFIX ".dlx")

BIN
code/nel/tools/3d/plugin_max/nel_3dsmax_shared/nel_3dsmax_shared.rc Normal file
View file

Binary file not shown.

14
code/nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h Normal file
View file

@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by nel_3dsmax_shared.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

55
code/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2 Normal file
View file

@ -0,0 +1,55 @@
#ifndef NL_VERSION_RC2
#define NL_VERSION_RC2
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
#pragma code_page(65001)
#include <windows.h>
#include "config.h"
#include "maxversion.h"
#define STRINGIFY_(x) #x
#define STRINGIFY(x) STRINGIFY_(x)
#ifdef _DEBUG
#define NL_FILEEXT "_d"
#else
#define NL_FILEEXT "_r"
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK"
VALUE "CompanyName", AUTHOR
VALUE "FileDescription", "NeL shared library for 3ds Max"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
VALUE "OriginalFilename", "nel_3dsmax_shared" NL_FILEEXT ".dll"
VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
VALUE "ProductVersion", NL_PRODUCT_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x9, 1200
END
END
#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
#endif /* #ifndef NL_VERSION_RC2 */

8
code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
View file

@ -354,7 +354,7 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
if (RPO::isZone (*pNode, time))
{
// Save path
std::string sSavePath = MCharStrToUtf8(pNode->GetName());
std::string sSavePath = NLMISC::toLower(MCharStrToUtf8(pNode->GetName()));
// Choose a file to export
if (!CExportNel::getScriptAppData (pNode, NEL3D_APPDATA_DONTEXPORT, 0))
@ -372,7 +372,7 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
else if (CExportNel::isVegetable (*pNode, time))
{
// Save path
std::string sSavePath = MCharStrToUtf8(pNode->GetName());
std::string sSavePath = NLMISC::toLower(MCharStrToUtf8(pNode->GetName()));
// Choose a file to export
if (!CExportNel::getScriptAppData (pNode, NEL3D_APPDATA_DONTEXPORT, 0))
@ -391,7 +391,7 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
else if (CExportNel::isLodCharacter (*pNode, time))
{
// Save path
std::string sSavePath = MCharStrToUtf8(pNode->GetName());
std::string sSavePath = NLMISC::toLower(MCharStrToUtf8(pNode->GetName()));
// Choose a file to export
if (!CExportNel::getScriptAppData (pNode, NEL3D_APPDATA_DONTEXPORT, 0))
@ -410,7 +410,7 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
else if (CExportNel::isMesh (*pNode, time))
{
// Save path
std::string sSavePath = MCharStrToUtf8(pNode->GetName());
std::string sSavePath = NLMISC::toLower(MCharStrToUtf8(pNode->GetName()));
// Choose a file to export
if (!CExportNel::getScriptAppData (pNode, NEL3D_APPDATA_DONTEXPORT, 0))

Some files were not shown because too many files have changed in this diff Show more