Commit Graph

914 Commits (267e7397c5683ca656fc64a6321af0f9b26355ef)

Author SHA1 Message Date
dfighter1985 b775237215 It's now possible to render using the user shaders and dynmat.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala 6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 11 years ago
dfighter1985 c3c3f154b1 Instead of auto-generating the dynmaterial added a menu item in the material editor that will trigger it if needed.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0ab68ef25f Added point light support.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 2e4b6bb6ae Don't try to edit stock shaders.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 a9a1d17c4f Added the stock shader names to the material editor, so it will now be able to select them when loading a shape.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 1d71a540ba Apparently QColor::set[color]f takes colors as floats clamped to the [0,1] range.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 c6bb6ec2a9 Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 4ba9d815d4 Colors are now set from the light setup, rather than being hardcoded.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0def5caf54 Added diffuse directional light support to the normal shader.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 8d57eac3d4 Some basic fog.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 16290f7ff9 Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala 0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 11 years ago
kervala 86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 11 years ago
dfighter1985 7307d748ea Sometimes shapes have 0 materials?!
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 14aea7acc9 Removed the debug triangle from the material editor plugin.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 d67198580a Implemented uniform querying, setting. Also updated the test triangle.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ca6a98aec Made the triangle debug program a bit more complicated, now using interpolated color.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9dc91a6ed1 Abstract program objects, vertex, and pixel programs can now be created using the driver, so the user can now feed shaders to it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f5358f712c Rendering the debug triangle with GLSL now works.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f387256984 Added triangle drawing for debug purposes.
--HG--
branch : gsoc2013-dfighter
12 years ago
kervala 2c7f848c83 Changed: Tabulations to spaces 12 years ago
dfighter1985 6fba0c094a Merging default
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8f45e49fa0 GL3 driver can now be instantiated.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 5ad6373f61 Build ligo outside the database
--HG--
branch : build_pipeline_py
12 years ago
kaetemi 78595ec0e6 Silently sneaking in a nicer splash image for ovqt 12 years ago
kaetemi e9c274c135 Use tags for pacs prim export 12 years ago
dfighter1985 0c64261e22 The 3dsmax exporter will now use the material file specified in the Nel material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f94960dffe Added the Nel material file selection possibility to the Nel material 3dsmax startup script.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ff8613205 Merging default.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ac98c00088 The prototype of the material exporter. It's only called when exporting a mesh, for now.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 12 years ago
dfighter1985 e99c1e2785 Clear the properties when clearing the scene, and also deactivate the buttons and comboboxes of the material widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 b776409cc8 More material properties are converted now.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6ad18a88f5 Shouldn't reset the material properties, when editing them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 37fb2cfcda Started work on converting the old material to new one. Some colors are already out. Also made some modifications to the editor so it can deal with it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 fb3f069a38 Should be able to save QColor based QVariant too.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 192e9c058a More work on the Variant type. Also modified material editor to use it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9306bd71e6 Added GUI code for multi/sub-material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c2296a2a93 It's not a terrible idea to remember the last used directory in the file open dialogs.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 04dcad32e7 Added support for adding basic primitives cube, sphere, cylinder, teapot.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a2ccb7e796 The main window takes ownership of ViewPortWidget because of setCentralWidget, so no need to delete it here.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6d31a50f5d I'll give up, I don't know why wheel events are not passed over to this widget as native events. Fortunately they are not needed, since the Nel style 3d mouse listener doesn't use them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 42bf13dcfd Implemented shape moving/rotating/zooming. Used parts of Dnk's code from object viewer for setting the camera up properly. NOTE: for some reason the ViewPortWidget doesn't receive native mouse wheel events. An investigation is in order.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 66fb3c1284 Shapes can now be loaded and rendered to ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8408ddd552 Added ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 96eb64ecbe Shader can now be set for the rendering pass, using the shader combo box in MaterialWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 cc86cdd3ef ShaderEditorWidget will now load/save it's content.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c9cd9cdd3c Shaders will now show up in the shader combobox of MaterialWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1f2ff5721e Shaders are now loaded/saved/deleted from the disk.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 00b47d6a50 Implemented the Shader widget, more or less.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 128c2a3270 Changed the Shader widget a little.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a71e4bc3ed Added some Shader related classes. They are not yet complete.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6d79a2cf6f Use the color editor for color properties. Also don't crash if property type is not supported by the property browser.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 2e6b1a834f We don't want duplicate property names and labels either.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9294cdc644 We don't want duplicate passes.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ea06a2c656 Property values can now be changed.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9ee24b3b93 Property browser will now show the properties.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ed267a6587 Probably we don't want the default first pass to be stuck with us if we're loading a material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 fa3ad050de It's not a bad idea to always have at least 1 pass.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d96b7e2d66 Added a new class, MaterialSpliter, it holds the Material widget, and the Material properties Qt property tree widget, and acts as a proxy / message router for them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c9605dde57 Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 832178a83f Adding / Removing properties will now work.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 94fe455a1a Material widget now retrieves the passes when loading a material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 067676c049 Changing passes should now show up on the material widget too!
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 02e61b1e1b Implemented the functionality of the Render Passes widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 30f8c9f9e1 Added a Nel3D proxy class.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8c35946010 Material properties widget is now linked to the right button.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 85e885f274 Worked a bit more on dynamic material. Also started to rework the material and pass widgets since I've realized I messed it up. Eg.: passes should have properties, not the material itself.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 40c95e82ff Changed the shader editor widget into a dialog. Implemented some of the button functions of Shader widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 abbc09e19c Added ShaderWidget, and restructured the material related menu items.
--HG--
branch : gsoc2013-dfighter
12 years ago
liria 487799cbf5 kervala's enhancements and fixes for the Windows compilation.
--HG--
branch : ig_elevaton_port_to_linux
12 years ago
liria 6b750cf042 FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows.
--HG--
branch : ig_elevaton_port_to_linux
12 years ago
liria 46d99e4a6d FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation.
--HG--
branch : ig_elevaton_port_to_linux
12 years ago
liria 99efdb2a23 FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.
--HG--
branch : ig_elevaton_port_to_linux
12 years ago
dfighter1985 d46944f258 More GUI skeleton work. Added Shader Editor widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 e87e265c42 Implemented some of the buttons of the GUI skeleton.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 5aec012c5f Added some more widget skeletons.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ca52a76e5d Added the skeleton of the OVQT Material Editor plugin.
--HG--
branch : gsoc2013-dfighter
12 years ago
sfb 2bf56882f8 merge 12 years ago
sfb 8fe6eee93c fixed #40 with an explicit static_cast. 12 years ago
dfighter1985 bdfa7dbc37 Don't build GUI Editor when not building the GUI library. 12 years ago
dfighter1985 fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 12 years ago
dfighter1985 ea8d82cfa6 MODIFIED: #20 Resolved build errors with stlport. 12 years ago
dfighter1985 f7962597bd MODIFIED: #20 Resolved some GCC build in the GUI Editor. 12 years ago
mattraykowski e7e51f01e0 merging gui editor repo. 12 years ago
dfighter1985 fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala 4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
kervala e53d42ea0e Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
kervala fc0f58e99b Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
kervala 671827225d Changed: French comments translated to English 12 years ago
kervala 6e498aefad Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kervala c71e6e82f1 Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kervala 45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 12 years ago
mattraykowski af14e1e591 merge, fixed inconsistent newlines 12 years ago
dnk-88 d301e9ac67 Change: Optimized placement source files in object viewer qt 12 years ago
dnk-88 d62b9db23c Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt
--HG--
branch : gsoc2011-worldeditorqt
12 years ago
kervala 5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 12 years ago
kervala 4a63d4556a Fixed: PCH for Object Viewer plugin 12 years ago
kervala 21b784cc84 Changed: Methods constification 12 years ago
kervala 80d16e39eb Changed: Add Qt headers in PCH for speed improvement 12 years ago
kervala 0cabe14089 Changed: Code simplification 12 years ago
kervala d1dfe4eb62 Added: PCH for Georges Editor Plugin 12 years ago
kervala d9e75b1e03 Changed: Compilation with GCC 12 years ago
dfighter1985 a98b99865e MODIFIED: #1471 Forgot to remove parents' properties before saving the node properties.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 e376bed8f1 MODIFIED: #1471 We should be able to close the application even when there's no loaded project.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala d890af5175 Changed: Applied Kaetemi patch to disable old S3TC library mistakes 12 years ago
dfighter1985 cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala 9ceb9e7d81 Fixed: Wrong EOL 12 years ago
dfighter1985 3bcbcd45e7 MODIFIED: #1471 Exiting OVQT will now work again properly.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 514536f0ff MODIFIED: #1471 There shouldn't be an error message when clicking cancel in the open file dialog.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 7cad2331e7 MODIFIED: #1471 Widget template changes can now be saved.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 6e1254b612 MODIFIED: #1471 Oups, forgot these warning messages...
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 c87cc27ae3 MODIFIED: #1471 Adding new widget now works in the widget property dialog.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 4a9fb9e013 MODIFIED: #1471 Adding new property now works.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 3c854dc1e2 CHANGED: #1471 Removing widget properties from the widget properties dialog will now work.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 f31af3d95b CHANGED: #1471 Removing widgets from the widget properties dialog will now work.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 2cebadaa79 CHANGED: #1471 Widget property templates are now stored in a tree. Also added some new controls to the widget property dialog.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dnk-88 602ca06998 Changed: Fixed crash land editor qt
--HG--
branch : gsoc2011-worldeditorqt
12 years ago
kervala eb6ccdaad8 Fixed: MFC tools compilation with STLport 12 years ago
kervala a3376d32a4 fixes #3 allow Qt without STLport to link to NeL with STLport 12 years ago
kervala 34bf41082f Fixed: Compilation with 64 bits MFC 12 years ago
kervala b7be696848 Move all PACS headers in nel/include/pacs directory (fixes #2) 12 years ago
kervala d8c7fa52f9 Changed: Replaced string empty comparisons with empty() 12 years ago
kervala 6c1f14778e Changed: #825 Remove all warnings when compiling Ryzom 12 years ago
kervala 6c0bd82c2a Changed: Use *_PREFIX instead of fixed values with INSTALL 12 years ago
kervala f7ee271a8f Changed: Use RYZOM_SHARE_PREFIX as prefix to look for leveldesign data 12 years ago
kervala cb12a7546a Changed: #1254 Error while compiling with current stable squish 12 years ago
kervala 1374286cab Changed: #825 Remove all warnings when compiling Ryzom 12 years ago
kervala 0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 12 years ago
kervala fc8c26ff9f Fixed: #1254 Error while compiling with current stable squish 12 years ago
kervala 0d4f383a7f Changed: Plugins specs and plugins installation 12 years ago
kervala ddd33c6090 Fixed: OVQT plugins loading under Unices (in the order: local, OVQT plugins, system) 12 years ago
kervala 541a147d34 Changed: Homogeneous carriage returns 12 years ago
kervala 476377dd88 Changed: Fixed plugins specs name to install 12 years ago
kervala 2028034214 Changed: Install plugins specs in ${NL_SHARE_PREFIX}/object_viewer_qt/plugins under Linux 12 years ago
kervala 8d9c96a97a Changed: Use "lib" prefix under unices for plugins 12 years ago
kervala 8ab293a6ec Changed: #1493 Fixed some directories 12 years ago
kervala 7a04e920e1 Fixed: #1493 MultiArch support 12 years ago
kervala 3f764df03e Added: shape2obj project to convert NeL .shape to standard .obj file format 12 years ago
kervala f61d6c9ae2 Changed: Updated some object_viewer_qt french translations 12 years ago
dnk-88 068b9bf7bb Changed: #1302 Polish code of property editor
--HG--
branch : gsoc2011-worldeditorqt
13 years ago
dfighter1985 63370056f0 CHANGED: #1471 GUI Editor can now be linked without manually supplying the libraries.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 efc9890e08 CHANGED: #1471 Serialize links that belong to the root group too. Also deactivate the active group when serializing.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 7bfecaad4b CHANGED: #1471 Need to serialize root group first, otherwise client crashes when loading the pointer settings.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 a0559ee680 CHANGED: #1471 Keys are now parsed from the config files, and then serialized on save.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 c532f23ac1 CHANGED: #1471 Pointer settings are now parsed even when the particular pointer cannot be instantiated. They are also serialized when serializing the GUI.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 0d4c4cd56d CHANGED: #1471 Should be able to change text options for CCtrlTextButton.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 91368514b6 CHANGED: #1471 GUI Procedures are now serialized.
--HG--
branch : gsoc2012-gui-editor
13 years ago
dfighter1985 4ae34c1844 CHANGED: #1471 Variables are now serialized.
--HG--
branch : gsoc2012-gui-editor
13 years ago