archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
901b0dea620a943a227ae2d7732cef0948777e7e
blender-archive/source/blender/editors/space_view3d/drawmesh.c

1345 lines
38 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
*
* Contributor(s): Blender Foundation, full update, glsl support
*
* ***** END GPL LICENSE BLOCK *****
*/
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
/** \file blender/editors/space_view3d/drawmesh.c
* \ingroup spview3d
*/
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include <string.h>
#include <math.h>
#include "MEM_guardedalloc.h"
more syncing with trunk, also cleared many warnings with gcc4.6
2011-05-09 04:06:48 +00:00
#include "BLI_utildefines.h"
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
#include "BLI_bitmap.h"
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
#include "BLI_math.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "DNA_material_types.h"
- remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
#include "DNA_mesh_types.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "DNA_meshdata_types.h"
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
#include "DNA_node_types.h"
#include "DNA_object_types.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "DNA_property_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "BKE_DerivedMesh.h"
Fix #33292: cycles material draw mode selection not working on some cards, now skip glsl for picking as was already done for other GLSL drawing.
2012-11-26 08:00:15 +00:00
#include "BKE_global.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "BKE_image.h"
#include "BKE_material.h"
2.5, continuing work with localizing paint modes. * Replaced FACESEL_PAINT_TEST macro with paint_facesel_test. This removes one more thing from BKE_global, and it'll make it easier to localize. * Fixed sculpt paint cursor sometimes not showing.
2009-08-15 19:48:50 +00:00
#include "BKE_paint.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "BKE_property.h"
code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere).
2013-04-13 20:31:52 +00:00
#include "BKE_editmesh.h"
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
#include "BKE_scene.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "UI_resources.h"
#include "GPU_draw.h"
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
#include "GPU_material.h"
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
#include "GPU_basic_shader.h"
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
#include "GPU_shader.h"
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Fix T39306: Backface culling in Multitexture always uses mat game settings Trying to use mat game settings in 3DView makes sense - but only when we are using "Game Engine" as 'renderer'! Note GLSL code completely ignores mat game settings currently, could be added too...
2014-03-21 10:11:54 +01:00
#include "RE_engine.h"
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
#include "ED_uvedit.h"
2.5 Editmesh code cleaned and compiling/linking. A whopping 20k lines back! :) Not that it does stuff... editmode in/out has to be done, and loads of operators. Also linking/exporting editmesh calls has to be reviewed. Also: added a blender_test_break() mechanism in BKE.
2008-12-30 13:16:14 +00:00
style cleanup
2012-07-08 20:36:00 +00:00
#include "view3d_intern.h" /* own include */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
/* user data structures for derived mesh callbacks */
typedef struct drawMeshFaceSelect_userData {
Mesh *me;
remove the pointer from BLI_bitmap's typedef, hides that an arg passed is really an array which may be modified by other functions.
2013-07-22 23:20:48 +00:00
BLI_bitmap *edge_flags; /* pairs of edge options (visible, select) */
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
} drawMeshFaceSelect_userData;
typedef struct drawEMTFMapped_userData {
svn merge ^/trunk/blender -r42757:42759
2011-12-20 10:59:56 +00:00
BMEditMesh *em;
Code cleanup: use bools where possible
2014-02-03 18:55:59 +11:00
bool has_mcol;
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
int cd_poly_tex_offset;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
const MPoly *mpoly;
const MTexPoly *mtexpoly;
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
} drawEMTFMapped_userData;
typedef struct drawTFace_userData {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
const Mesh *me;
const MPoly *mpoly;
const MTexPoly *mtexpoly;
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
} drawTFace_userData;
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
/**************************** Face Select Mode *******************************/
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
/* mainly to be less confusing */
BLI_INLINE int edge_vis_index(const int index) { return index * 2; }
BLI_INLINE int edge_sel_index(const int index) { return index * 2 + 1; }
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
static BLI_bitmap *get_tface_mesh_marked_edge_info(Mesh *me, bool draw_select_edges)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
remove the pointer from BLI_bitmap's typedef, hides that an arg passed is really an array which may be modified by other functions.
2013-07-22 23:20:48 +00:00
BLI_bitmap *bitmap_edge_flags = BLI_BITMAP_NEW(me->totedge * 2, __func__);
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
MPoly *mp;
MLoop *ml;
int i, j;
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
bool select_set;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
for (i = 0; i < me->totpoly; i++) {
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
mp = &me->mpoly[i];
remove redundant assignments & unused vars. also minor functional changes - OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it) - removing BG image now returns cancelled if no image is removed.
2011-01-12 03:41:12 +00:00
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
if (!(mp->flag & ME_HIDE)) {
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
select_set = (mp->flag & ME_FACE_SEL) != 0;
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
ml = me->mloop + mp->loopstart;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
for (j = 0; j < mp->totloop; j++, ml++) {
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
if ((draw_select_edges == false) &&
(select_set && BLI_BITMAP_TEST(bitmap_edge_flags, edge_sel_index(ml->e))))
{
BLI_BITMAP_DISABLE(bitmap_edge_flags, edge_vis_index(ml->e));
}
else {
BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_vis_index(ml->e));
if (select_set) {
BLI_BITMAP_ENABLE(bitmap_edge_flags, edge_sel_index(ml->e));
}
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
}
}
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
return bitmap_edge_flags;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
static DMDrawOption draw_mesh_face_select__setHiddenOpts(void *userData, int index)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawMeshFaceSelect_userData *data = userData;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Mesh *me = data->me;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (me->drawflag & ME_DRAWEDGES) {
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
if ((BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index))))
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NORMAL;
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
else
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_SKIP;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
else if (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index)) &&
BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index)))
{
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NORMAL;
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
}
else {
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_SKIP;
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
2.5 View3D has been split now in a local part (RegionView3D) and a per-area part (old View3D). Currently local is: - view transform - camera zoom/offset - gpencil (todo) - custom clipping planes Rest is in Area still, like active camera, draw type, layers, localview, custom centers, around-settings, transform widget, gridlines, and so on (mostly stuff as available in header). To see it work; also added new feature for region split, press SHIFT+ALT+CTRL+S for four-split. The idea is to make a preset 4-split, configured to stick to top/right/front views for three views. Another cool idea to explore is to then box-clip all drawing based on these 3 views. Note about the code: - currently view3d still stores some depricated settings, to convert from older files. Not all settings are copied over though, like custom clip planes or the 'lock view to object'. - since some view3d ops are now on area level, the operators for it should keep track of that. Bugfix in transform: quat initialize in operator-invoke missed one zero. Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
static DMDrawOption draw_mesh_face_select__setSelectOpts(void *userData, int index)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawMeshFaceSelect_userData *data = userData;
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
return (BLI_BITMAP_TEST(data->edge_flags, edge_sel_index(index)) &&
BLI_BITMAP_TEST(data->edge_flags, edge_vis_index(index))) ? DM_DRAW_OPTION_NORMAL : DM_DRAW_OPTION_SKIP;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
2.5 View3D has been split now in a local part (RegionView3D) and a per-area part (old View3D). Currently local is: - view transform - camera zoom/offset - gpencil (todo) - custom clipping planes Rest is in Area still, like active camera, draw type, layers, localview, custom centers, around-settings, transform widget, gridlines, and so on (mostly stuff as available in header). To see it work; also added new feature for region split, press SHIFT+ALT+CTRL+S for four-split. The idea is to make a preset 4-split, configured to stick to top/right/front views for three views. Another cool idea to explore is to then box-clip all drawing based on these 3 views. Note about the code: - currently view3d still stores some depricated settings, to convert from older files. Not all settings are copied over though, like custom clip planes or the 'lock view to object'. - since some view3d ops are now on area level, the operators for it should keep track of that. Bugfix in transform: quat initialize in operator-invoke missed one zero. Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
/* draws unselected */
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
static DMDrawOption draw_mesh_face_select__drawFaceOptsInv(void *userData, int index)
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Mesh *me = (Mesh *)userData;
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
MPoly *mpoly = &me->mpoly[index];
if (!(mpoly->flag & ME_HIDE) && !(mpoly->flag & ME_FACE_SEL))
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
else
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_SKIP;
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
}
2.5 View3D has been split now in a local part (RegionView3D) and a per-area part (old View3D). Currently local is: - view transform - camera zoom/offset - gpencil (todo) - custom clipping planes Rest is in Area still, like active camera, draw type, layers, localview, custom centers, around-settings, transform widget, gridlines, and so on (mostly stuff as available in header). To see it work; also added new feature for region split, press SHIFT+ALT+CTRL+S for four-split. The idea is to make a preset 4-split, configured to stick to top/right/front views for three views. Another cool idea to explore is to then box-clip all drawing based on these 3 views. Note about the code: - currently view3d still stores some depricated settings, to convert from older files. Not all settings are copied over though, like custom clip planes or the 'lock view to object'. - since some view3d ops are now on area level, the operators for it should keep track of that. Bugfix in transform: quat initialize in operator-invoke missed one zero. Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
void draw_mesh_face_select(RegionView3D *rv3d, Mesh *me, DerivedMesh *dm, bool draw_select_edges)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawMeshFaceSelect_userData data;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
data.me = me;
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
data.edge_flags = get_tface_mesh_marked_edge_info(me, draw_select_edges);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glEnable(GL_DEPTH_TEST);
Fix T37727: z-offset problems with camera view
2013-12-09 20:59:29 +11:00
ED_view3d_polygon_offset(rv3d, 1.0);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
/* Draw (Hidden) Edges */
setlinestyle(1);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
UI_ThemeColor(TH_EDGE_FACESEL);
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
dm->drawMappedEdges(dm, draw_mesh_face_select__setHiddenOpts, &data);
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
setlinestyle(0);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* Draw Selected Faces */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (me->drawflag & ME_DRAWFACES) {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
[#24325] Texture painting using selected faces mask draw a subtle grey over unselected faces rather then coloring selected faces which got in the way of seeing the colors while painting.
2010-10-19 15:35:46 +00:00
/* dull unselected faces so as not to get in the way of seeing color */
glColor4ub(96, 96, 96, 64);
GPU Buffers: This commit begins implementation of the idea about hidden face separation outlined in http://code.blender.org/2015/06/optimizing-blenders-real-time-mesh- We split hidden and visible faces to different parts of the triangle buffer. Mapped drawing will now skip iterating through hidden polys. Of course the final target, when all derived mesh types use VBO sorting, is to skip checking for hide flag per face completely. All faces will be pre-sorted anyway and we'll be able to draw them with one draw call.
2015-07-25 20:00:49 +02:00
dm->drawMappedFaces(dm, draw_mesh_face_select__drawFaceOptsInv, NULL, NULL, (void *)me, DM_DRAW_SKIP_HIDDEN);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glDisable(GL_BLEND);
}
Fix T37727: z-offset problems with camera view
2013-12-09 20:59:29 +11:00
ED_view3d_polygon_offset(rv3d, 1.0);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
/* Draw Stippled Outline for selected faces */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glColor3ub(255, 255, 255);
setlinestyle(1);
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
dm->drawMappedEdges(dm, draw_mesh_face_select__setSelectOpts, &data);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
setlinestyle(0);
Fix T37727: z-offset problems with camera view
2013-12-09 20:59:29 +11:00
ED_view3d_polygon_offset(rv3d, 0.0); /* resets correctly now, even after calling accumulated offsets */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Optimize face-select drawing (weight/vertex paint mode face selection) with bmesh theres no need for edge-hash lookups, replace EdgeHash with BLI_bitmap.
2013-05-12 08:42:24 +00:00
MEM_freeN(data.edge_flags);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
/***************************** Texture Drawing ******************************/
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
static Material *give_current_material_or_def(Object *ob, int matnr)
{
style cleanup
2012-07-08 20:36:00 +00:00
extern Material defmaterial; /* render module abuse... */
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Material *ma = give_current_material(ob, matnr);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
return ma ? ma : &defmaterial;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
/* Icky globals, fix with userdata parameter */
static struct TextureDrawState {
Object *ob;
Texture painting: Include explicit control for texturing: This commit introduces a painting mode option, available in the slots panel. The default value "Material" will create slots from the blender material, same as just merged from the paint branch. The new option "Image", will use an explicit image field that artists can use to select the image to paint on. This will should allow painting regardless of the renderer used or for use in modifiers.
2014-08-28 16:40:38 +02:00
Image *stencil; /* texture painting stencil */
Image *canvas; /* texture painting canvas, for image mode */
Fix T39306: Backface culling in Multitexture always uses mat game settings Trying to use mat game settings in 3DView makes sense - but only when we are using "Game Engine" as 'renderer'! Note GLSL code completely ignores mat game settings currently, could be added too...
2014-03-21 10:11:54 +01:00
bool use_game_mat;
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
int is_lit, is_tex;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
int color_profile;
Fix #34290: backface culling option in 3d view was not interacting well with the option in the material in texture draw mode, now it always overrides the material.
2013-02-18 15:08:23 +00:00
bool use_backface_culling;
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
bool two_sided_lighting;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
unsigned char obcol[4];
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
bool is_texpaint;
Texture painting: Include explicit control for texturing: This commit introduces a painting mode option, available in the slots panel. The default value "Material" will create slots from the blender material, same as just merged from the paint branch. The new option "Image", will use an explicit image field that artists can use to select the image to paint on. This will should allow painting regardless of the renderer used or for use in modifiers.
2014-08-28 16:40:38 +02:00
bool texpaint_material; /* use material slots for texture painting */
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
} Gtexdraw = {NULL, NULL, NULL, false, 0, 0, 0, false, false, {0, 0, 0, 0}, false, false};
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
static bool set_draw_settings_cached(int clearcache, MTexPoly *texface, Material *ma, struct TextureDrawState gtexdraw)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
static Material *c_ma;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
static int c_textured;
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
static MTexPoly c_texface;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
static int c_backculled;
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
static bool c_badtex;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
static int c_lit;
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
static int c_has_texface;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Code cleanup: fix confusing line of code with useless ||.
2013-05-14 10:20:58 +00:00
int backculled = 1;
Fix T39306: Backface culling in Multitexture always uses mat game settings Trying to use mat game settings in 3DView makes sense - but only when we are using "Game Engine" as 'renderer'! Note GLSL code completely ignores mat game settings currently, could be added too...
2014-03-21 10:11:54 +01:00
int alphablend = GPU_BLEND_SOLID;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
int textured = 0;
int lit = 0;
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
int has_texface = texface != NULL;
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
bool need_set_tpage = false;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
bool texpaint = ((gtexdraw.ob->mode & OB_MODE_TEXTURE_PAINT) != 0);
Image *ima = NULL;
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
Fix transparency issues in 3d viewport The issue was introduced by 0f95149 and it only worked before because default game material alpha blending was set to alpha. Now it'll check whether material has transparency enabled and will use alpha blending by default in this case.
2014-06-27 15:33:57 +06:00
if (ma != NULL) {
if (ma->mode & MA_TRANSP) {
alphablend = GPU_BLEND_ALPHA;
}
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
if (clearcache) {
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
c_textured = c_lit = c_backculled = -1;
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
memset(&c_texface, 0, sizeof(c_texface));
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
c_badtex = false;
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
c_has_texface = -1;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
c_ma = NULL;
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
else {
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
textured = gtexdraw.is_tex;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
}
/* convert number of lights into boolean */
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
if (gtexdraw.is_lit) lit = 1;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Fix T39524: Backface culling is always on in Textured view in BI. Special case I did not think about in own previous culling fix (rB0f95149a7849).
2014-03-31 20:05:09 +02:00
backculled = gtexdraw.use_backface_culling;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
if (ma) {
if (ma->mode & MA_SHLESS) lit = 0;
Fix T39306: Backface culling in Multitexture always uses mat game settings Trying to use mat game settings in 3DView makes sense - but only when we are using "Game Engine" as 'renderer'! Note GLSL code completely ignores mat game settings currently, could be added too...
2014-03-21 10:11:54 +01:00
if (gtexdraw.use_game_mat) {
backculled = backculled || (ma->game.flag & GEMAT_BACKCULL);
alphablend = ma->game.alpha_blend;
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
if (texface && !texpaint) {
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
textured = textured && (texface->tpage);
/* no material, render alpha if texture has depth=32 */
if (!ma && BKE_image_has_alpha(texface->tpage))
alphablend = GPU_BLEND_ALPHA;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Texture painting: Do not generate materials/images/UVs if they are missing. Now we spawn a panel ("Missing Data") with operators to generate the missing data and pop a warning if user tries to paint without them. The reason we have reverted this is that it is too easy to end up with more textures than we wanted. It was impossible to enter texture paint without having textures added, and code makes too many assumptions about what user may want. Discussed during Sunday's meeting. This might be a candidate for 2.72a but I'm not sure how other artists will take this (and how refined and crash-free it is), better make a few iterations first. And for interested parties...test please, don't wait until after a release to poke with such issues. Also, add slot operator now adds a new unconnected image node in cycles. Only used in the "Missing Data" panel. This should be a separate commit but I am squashing it into the same commit because it relies too much on changes done here and can be reverted easily if complainstorm occurs again.
2014-10-06 15:12:06 +02:00
else if (texpaint) {
Texture painting: Include explicit control for texturing: This commit introduces a painting mode option, available in the slots panel. The default value "Material" will create slots from the blender material, same as just merged from the paint branch. The new option "Image", will use an explicit image field that artists can use to select the image to paint on. This will should allow painting regardless of the renderer used or for use in modifiers.
2014-08-28 16:40:38 +02:00
if (gtexdraw.texpaint_material)
Texture painting: Do not generate materials/images/UVs if they are missing. Now we spawn a panel ("Missing Data") with operators to generate the missing data and pop a warning if user tries to paint without them. The reason we have reverted this is that it is too easy to end up with more textures than we wanted. It was impossible to enter texture paint without having textures added, and code makes too many assumptions about what user may want. Discussed during Sunday's meeting. This might be a candidate for 2.72a but I'm not sure how other artists will take this (and how refined and crash-free it is), better make a few iterations first. And for interested parties...test please, don't wait until after a release to poke with such issues. Also, add slot operator now adds a new unconnected image node in cycles. Only used in the "Missing Data" panel. This should be a separate commit but I am squashing it into the same commit because it relies too much on changes done here and can be reverted easily if complainstorm occurs again.
2014-10-06 15:12:06 +02:00
ima = ma && ma->texpaintslot ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
else
Texture painting: Include explicit control for texturing: This commit introduces a painting mode option, available in the slots panel. The default value "Material" will create slots from the blender material, same as just merged from the paint branch. The new option "Image", will use an explicit image field that artists can use to select the image to paint on. This will should allow painting regardless of the renderer used or for use in modifiers.
2014-08-28 16:40:38 +02:00
ima = gtexdraw.canvas;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
}
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
else
textured = 0;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
if (backculled != c_backculled) {
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
if (backculled) glEnable(GL_CULL_FACE);
else glDisable(GL_CULL_FACE);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
c_backculled = backculled;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
/* need to re-set tpage if textured flag changed or existsment of texface changed.. */
need_set_tpage = textured != c_textured || has_texface != c_has_texface;
/* ..or if settings inside texface were changed (if texface was used) */
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
need_set_tpage |= (texpaint && c_ma != ma) || (texface && memcmp(&c_texface, texface, sizeof(c_texface)));
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
if (need_set_tpage) {
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
if (textured) {
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
if (texpaint) {
c_badtex = false;
if (GPU_verify_image(ima, NULL, 0, 1, 0, false)) {
glEnable(GL_TEXTURE_2D);
Fix erase alpha not having any output on viewport after last commit.
2014-09-02 16:48:43 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glActiveTexture(GL_TEXTURE1);
glEnable(GL_TEXTURE_2D);
Texture painting: Do not generate materials/images/UVs if they are missing. Now we spawn a panel ("Missing Data") with operators to generate the missing data and pop a warning if user tries to paint without them. The reason we have reverted this is that it is too easy to end up with more textures than we wanted. It was impossible to enter texture paint without having textures added, and code makes too many assumptions about what user may want. Discussed during Sunday's meeting. This might be a candidate for 2.72a but I'm not sure how other artists will take this (and how refined and crash-free it is), better make a few iterations first. And for interested parties...test please, don't wait until after a release to poke with such issues. Also, add slot operator now adds a new unconnected image node in cycles. Only used in the "Missing Data" panel. This should be a separate commit but I am squashing it into the same commit because it relies too much on changes done here and can be reverted easily if complainstorm occurs again.
2014-10-06 15:12:06 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_PREVIOUS);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glBindTexture(GL_TEXTURE_2D, ima->bindcode);
glActiveTexture(GL_TEXTURE0);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
}
else {
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glActiveTexture(GL_TEXTURE1);
glDisable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 0);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glActiveTexture(GL_TEXTURE0);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
c_badtex = true;
GPU_clear_tpage(true);
glDisable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 0);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
}
}
else {
c_badtex = !GPU_set_tpage(texface, !texpaint, alphablend);
}
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
}
else {
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
GPU_set_tpage(NULL, 0, 0);
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
c_badtex = false;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
c_textured = textured;
Fix #30874: Single texture display in Edit Mode It was a regression since 2.62 caused by how texface is passing to drawParamsMapped Previously it was used from CD layer but now it's getting copied from MexPoly into a variable allocated in stack for function void emDM_drawFacesTex_common. To set texture needed to draw particular face function set_draw_settings_cached is used, which tries to not to copy texture into GPU when it's not needed (for example, when drawing bunch of faces with the same texture) and one of condition if texture should be updated in GPU was comparing address of texface passed to this function and cached texface. But this address are exactly the sane and points to a memory inside stack of emDM_drawFacesTex_common. Fixed by cacheing texface content, not it's address.
2012-04-10 16:28:26 +00:00
c_has_texface = has_texface;
if (texface)
memcpy(&c_texface, texface, sizeof(c_texface));
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
if (c_badtex) lit = 0;
if (lit != c_lit || ma != c_ma) {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
if (lit) {
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
int options = GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR;
if (gtexdraw.two_sided_lighting)
options |= GPU_SHADER_TWO_SIDED;
if (c_textured && !c_badtex)
options |= GPU_SHADER_TEXTURE_2D;
if (!ma)
ma = give_current_material_or_def(NULL, 0); /* default material */
float specular[3];
mul_v3_v3fl(specular, &ma->specr, ma->spec);
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_colors(NULL, specular, ma->har, 0.0f);
GPU_basic_shader_bind(options);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
else {
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
c_lit = lit;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
c_ma = ma;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
return c_badtex;
}
2.5 View3D has been split now in a local part (RegionView3D) and a per-area part (old View3D). Currently local is: - view transform - camera zoom/offset - gpencil (todo) - custom clipping planes Rest is in Area still, like active camera, draw type, layers, localview, custom centers, around-settings, transform widget, gridlines, and so on (mostly stuff as available in header). To see it work; also added new feature for region split, press SHIFT+ALT+CTRL+S for four-split. The idea is to make a preset 4-split, configured to stick to top/right/front views for three views. Another cool idea to explore is to then box-clip all drawing based on these 3 views. Note about the code: - currently view3d still stores some depricated settings, to convert from older files. Not all settings are copied over though, like custom clip planes or the 'lock view to object'. - since some view3d ops are now on area level, the operators for it should keep track of that. Bugfix in transform: quat initialize in operator-invoke missed one zero. Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
unsigned char obcol[4];
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
bool is_tex, solidtex;
patch [#32325] textured solid backface culling option from Fredrik Hansson (fredrikh)
2012-08-14 18:01:58 +00:00
Mesh *me = ob->data;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
ImagePaintSettings *imapaint = &scene->toolsettings->imapaint;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup
2012-07-08 20:36:00 +00:00
/* XXX scene->obedit warning */
fix for weight paint with face mask enabled drawing with lights.
2011-10-06 05:01:24 +00:00
/* texture draw is abused for mask selection mode, do this so wire draw
* with face selection in weight paint is not lit. */
now vertex paint uses the same overrides as weight paint - so wire draw mode allows vertex paint to be unlit (which is quite handy, previously you had to hide lamps).
2012-04-24 23:47:10 +00:00
if ((v3d->drawtype <= OB_WIRE) && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT))) {
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
solidtex = false;
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
Gtexdraw.is_lit = 0;
fix for weight paint with face mask enabled drawing with lights.
2011-10-06 05:01:24 +00:00
}
Fix T46749: Texture paint & shadeless mode fails Using shadeless did nothing in texture-paint mode. (regression in 2.76)
2015-11-13 06:12:30 +11:00
else if ((ob->mode & OB_MODE_TEXTURE_PAINT) && BKE_scene_use_new_shading_nodes(scene)) {
solidtex = true;
if (v3d->flag2 & V3D_SHADELESS_TEX)
Gtexdraw.is_lit = 0;
else
Gtexdraw.is_lit = -1;
}
Cleanup: warning/style
2015-10-28 23:30:08 +11:00
else if ((v3d->drawtype == OB_SOLID) ||
Fix T46749: Texture paint & shadeless mode fails Using shadeless did nothing in texture-paint mode. (regression in 2.76)
2015-11-13 06:12:30 +11:00
((ob->mode & OB_MODE_EDIT) && (v3d->drawtype != OB_TEXTURE)))
Cleanup: warning/style
2015-10-28 23:30:08 +11:00
{
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* draw with default lights in solid draw mode and edit mode */
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
solidtex = true;
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
Gtexdraw.is_lit = -1;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Fix for bug #18228: OpenGL specular did not get the correct view vector in perspective mode. This is default OpenGL behavior, but by now this optimization is really insignificant. Works in both the 3d view and game engine.
2009-02-06 19:21:24 +00:00
else {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* draw with lights in the scene otherwise */
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
solidtex = false;
style cleanup
2013-10-16 04:08:20 +00:00
if (v3d->flag2 & V3D_SHADELESS_TEX)
3D view: textured draw mode now has a Shadeless option in the Shading panel, to draw textures without shading. For Cycles this was not possible yet, and for Blender Internal you had to move away all lights which was also not ideal. (Caminandes feature request)
2013-10-15 15:56:00 +00:00
Gtexdraw.is_lit = 0;
else
Gtexdraw.is_lit = GPU_scene_object_lights(scene, ob, v3d->lay, rv3d->viewmat, !rv3d->is_persp);
Fix for bug #18228: OpenGL specular did not get the correct view vector in perspective mode. This is default OpenGL behavior, but by now this optimization is really insignificant. Works in both the 3d view and game engine.
2009-02-06 19:21:24 +00:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
rgba_float_to_uchar(obcol, ob->col);
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
if (solidtex || v3d->drawtype == OB_TEXTURE) is_tex = true;
else is_tex = false;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Gtexdraw.ob = ob;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
Gtexdraw.stencil = (imapaint->flag & IMAGEPAINT_PROJECT_LAYER_STENCIL) ? imapaint->stencil : NULL;
Gtexdraw.is_texpaint = (ob->mode == OB_MODE_TEXTURE_PAINT);
Texture painting: Include explicit control for texturing: This commit introduces a painting mode option, available in the slots panel. The default value "Material" will create slots from the blender material, same as just merged from the paint branch. The new option "Image", will use an explicit image field that artists can use to select the image to paint on. This will should allow painting regardless of the renderer used or for use in modifiers.
2014-08-28 16:40:38 +02:00
Gtexdraw.texpaint_material = (imapaint->mode == IMAGEPAINT_MODE_MATERIAL);
Gtexdraw.canvas = (Gtexdraw.texpaint_material) ? NULL : imapaint->canvas;
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
Gtexdraw.is_tex = is_tex;
Color Management, Stage 2: Switch color pipeline to use OpenColorIO Replace old color pipeline which was supporting linear/sRGB color spaces only with OpenColorIO-based pipeline. This introduces two configurable color spaces: - Input color space for images and movie clips. This space is used to convert images/movies from color space in which file is saved to Blender's linear space (for float images, byte images are not internally converted, only input space is stored for such images and used later). This setting could be found in image/clip data block settings. - Display color space which defines space in which particular display is working. This settings could be found in scene's Color Management panel. When render result is being displayed on the screen, apart from converting image to display space, some additional conversions could happen. This conversions are: - View, which defines tone curve applying before display transformation. These are different ways to view the image on the same display device. For example it could be used to emulate film view on sRGB display. - Exposure affects on image exposure before tone map is applied. - Gamma is post-display gamma correction, could be used to match particular display gamma. - RGB curves are user-defined curves which are applying before display transformation, could be used for different purposes. All this settings by default are only applying on render result and does not affect on other images. If some particular image needs to be affected by this transformation, "View as Render" setting of image data block should be set to truth. Movie clips are always affected by all display transformations. This commit also introduces configurable color space in which sequencer is working. This setting could be found in scene's Color Management panel and it should be used if such stuff as grading needs to be done in color space different from sRGB (i.e. when Film view on sRGB display is use, using VD16 space as sequencer's internal space would make grading working in space which is close to the space using for display). Some technical notes: - Image buffer's float buffer is now always in linear space, even if it was created from 16bit byte images. - Space of byte buffer is stored in image buffer's rect_colorspace property. - Profile of image buffer was removed since it's not longer meaningful. - OpenGL and GLSL is supposed to always work in sRGB space. It is possible to support other spaces, but it's quite large project which isn't so much important. - Legacy Color Management option disabled is emulated by using None display. It could have some regressions, but there's no clear way to avoid them. - If OpenColorIO is disabled on build time, it should make blender behaving in the same way as previous release with color management enabled. More details could be found at this page (more details would be added soon): http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management -- Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO integration and to Brecht van Lommel for some further development and code/ usecase review!
2012-09-15 10:05:07 +00:00
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
/* naughty multitexturing hacks to quickly support stencil + shading + alpha blending
* in new texpaint code. The better solution here would be to support GLSL */
if (Gtexdraw.is_texpaint) {
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
glActiveTexture(GL_TEXTURE1);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glEnable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
Fix erase alpha not having any output on viewport after last commit.
2014-09-02 16:48:43 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_PREVIOUS);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
Fix erase alpha not having any output on viewport after last commit.
2014-09-02 16:48:43 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
/* load the stencil texture here */
if (Gtexdraw.stencil != NULL) {
glActiveTexture(GL_TEXTURE2);
if (GPU_verify_image(Gtexdraw.stencil, NULL, false, false, false, false)) {
float col[4] = {imapaint->stencil_col[0], imapaint->stencil_col[1], imapaint->stencil_col[2], 1.0f};
glEnable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_CONSTANT);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_TEXTURE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_TEXTURE);
glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, col);
if ((imapaint->flag & IMAGEPAINT_PROJECT_LAYER_STENCIL_INV) == 0) {
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_ONE_MINUS_SRC_COLOR);
}
else {
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
}
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
}
}
glActiveTexture(GL_TEXTURE0);
}
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
Fix #32695: Can't disable color management for 3D view Made it so viewport will disable color management if display device set to None. This solves couple of regressions, mainly related on old BGE files and made None display behave exactly as old color management disabled.
2012-10-01 11:14:02 +00:00
Gtexdraw.color_profile = BKE_scene_check_color_management_enabled(scene);
Fix T39306: Backface culling in Multitexture always uses mat game settings Trying to use mat game settings in 3DView makes sense - but only when we are using "Game Engine" as 'renderer'! Note GLSL code completely ignores mat game settings currently, could be added too...
2014-03-21 10:11:54 +01:00
Gtexdraw.use_game_mat = (RE_engines_find(scene->r.engine)->flag & RE_GAME) != 0;
Fix #34290: backface culling option in 3d view was not interacting well with the option in the material in texture draw mode, now it always overrides the material.
2013-02-18 15:08:23 +00:00
Gtexdraw.use_backface_culling = (v3d->flag2 & V3D_BACKFACE_CULLING) != 0;
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
Gtexdraw.two_sided_lighting = (me->flag & ME_TWOSIDED);
Color Management, Stage 2: Switch color pipeline to use OpenColorIO Replace old color pipeline which was supporting linear/sRGB color spaces only with OpenColorIO-based pipeline. This introduces two configurable color spaces: - Input color space for images and movie clips. This space is used to convert images/movies from color space in which file is saved to Blender's linear space (for float images, byte images are not internally converted, only input space is stored for such images and used later). This setting could be found in image/clip data block settings. - Display color space which defines space in which particular display is working. This settings could be found in scene's Color Management panel. When render result is being displayed on the screen, apart from converting image to display space, some additional conversions could happen. This conversions are: - View, which defines tone curve applying before display transformation. These are different ways to view the image on the same display device. For example it could be used to emulate film view on sRGB display. - Exposure affects on image exposure before tone map is applied. - Gamma is post-display gamma correction, could be used to match particular display gamma. - RGB curves are user-defined curves which are applying before display transformation, could be used for different purposes. All this settings by default are only applying on render result and does not affect on other images. If some particular image needs to be affected by this transformation, "View as Render" setting of image data block should be set to truth. Movie clips are always affected by all display transformations. This commit also introduces configurable color space in which sequencer is working. This setting could be found in scene's Color Management panel and it should be used if such stuff as grading needs to be done in color space different from sRGB (i.e. when Film view on sRGB display is use, using VD16 space as sequencer's internal space would make grading working in space which is close to the space using for display). Some technical notes: - Image buffer's float buffer is now always in linear space, even if it was created from 16bit byte images. - Space of byte buffer is stored in image buffer's rect_colorspace property. - Profile of image buffer was removed since it's not longer meaningful. - OpenGL and GLSL is supposed to always work in sRGB space. It is possible to support other spaces, but it's quite large project which isn't so much important. - Legacy Color Management option disabled is emulated by using None display. It could have some regressions, but there's no clear way to avoid them. - If OpenColorIO is disabled on build time, it should make blender behaving in the same way as previous release with color management enabled. More details could be found at this page (more details would be added soon): http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management -- Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO integration and to Brecht van Lommel for some further development and code/ usecase review!
2012-09-15 10:05:07 +00:00
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
memcpy(Gtexdraw.obcol, obcol, sizeof(obcol));
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
set_draw_settings_cached(1, NULL, NULL, Gtexdraw);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glShadeModel(GL_SMOOTH);
Fix #34290: backface culling option in 3d view was not interacting well with the option in the material in texture draw mode, now it always overrides the material.
2013-02-18 15:08:23 +00:00
glCullFace(GL_BACK);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
- added GCC warning -Wstrict-prototypes - fixed bug in paste material, exposed by stricter warnings. - removed/renamed various shadowed vars. - removed BGE lamp.colour, only allow lamp.color attribute.
2010-12-03 12:30:59 +00:00
static void draw_textured_end(void)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
if (Gtexdraw.ob->mode & OB_MODE_TEXTURE_PAINT) {
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glActiveTexture(GL_TEXTURE1);
glDisable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glBindTexture(GL_TEXTURE_2D, 0);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
if (Gtexdraw.stencil != NULL) {
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glActiveTexture(GL_TEXTURE2);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
glDisable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glBindTexture(GL_TEXTURE_2D, 0);
Fix T41414, T41386. There were a few issues to fix here: * We did not really unpremultiply float image dabs prior to sending them to the GPU. That made float and byte image result different in texture painting and undoing could change the result. * To make textures nicely composited over the mesh, I used decal mode in OpenGL texture environment for the texture unit. This uses the texture's alpha channel with a nice over operator. * Texture creation used to override the alpha setting due to the display restrictions. Not so anymore, people can now create transparent byte images. Also, made alpha zero default for new textures now, since it has such a nice effect here.
2014-08-12 13:49:27 +02:00
}
Fix T41682. Bring back shading in texture painting. This works now but it uses 3 texture units instead of two. Most GPUs of DirectX 8 (OpenGL 1.4 should cover that) functionality even should have those, but some old GPUs might not work with that. In any case, I hope we will be moving to OpenGL 2.1 requirement soon anyway where 4-8 texture units are usually the norm.
2014-09-02 15:57:22 +02:00
glActiveTexture(GL_TEXTURE0);
Fix T41414, T41386. There were a few issues to fix here: * We did not really unpremultiply float image dabs prior to sending them to the GPU. That made float and byte image result different in texture painting and undoing could change the result. * To make textures nicely composited over the mesh, I used decal mode in OpenGL texture environment for the texture unit. This uses the texture's alpha channel with a nice over operator. * Texture creation used to override the alpha setting due to the display restrictions. Not so anymore, people can now create transparent byte images. Also, made alpha zero default for new textures now, since it has such a nice effect here.
2014-08-12 13:49:27 +02:00
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
/* manual reset, since we don't use tpage */
glBindTexture(GL_TEXTURE_2D, 0);
/* force switch off textures */
GPU_clear_tpage(true);
}
else {
/* switch off textures */
GPU_set_tpage(NULL, 0, 0);
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glShadeModel(GL_FLAT);
glDisable(GL_CULL_FACE);
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* XXX, bad patch - GPU_default_lights() calls
There is no GLenum called LIGHT_POSITION There is an FAQ that mentions a mythical GL_LIGHT_POSITION, and lots of programmers speak of it, but this mythical creature does not exist! The correct symbol is GL_POSITION
2012-05-04 07:23:50 +00:00
* glLightfv(GL_POSITION, ...) which
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
* is transformed by the current matrix... we
* need to make sure that matrix is identity.
*
* It would be better if drawmesh.c kept track
* of and restored the light settings it changed.
* - zr
*/
glPushMatrix();
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
glLoadIdentity();
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
GPU_default_lights();
glPopMatrix();
}
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
static DMDrawOption draw_tface__set_draw_legacy(MTexPoly *mtexpoly, const bool has_mcol, int matnr)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Material *ma = give_current_material(Gtexdraw.ob, matnr + 1);
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
bool invalidtexture = false;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
if (ma && (ma->game.flag & GEMAT_INVISIBLE))
return DM_DRAW_OPTION_SKIP;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
invalidtexture = set_draw_settings_cached(0, mtexpoly, ma, Gtexdraw);
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
if (mtexpoly && invalidtexture) {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glColor3ub(0xFF, 0x00, 0xFF);
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
else if (ma && (ma->shade_flag & MA_OBCOLOR)) {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glColor3ubv(Gtexdraw.obcol);
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
else if (!has_mcol) {
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
if (mtexpoly) {
code cleanup: favor braces when blocks have mixed brace use.
2013-03-09 03:46:30 +00:00
glColor3f(1.0, 1.0, 1.0);
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
else {
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (ma) {
Changes to Color Management After testing and feedback, I've decided to slightly modify the way color management works internally. While the previous method worked well for rendering, was a smaller transition and had some advantages over this new method, it was a bit more ambiguous, and was making things difficult for other areas such as compositing. This implementation now considers all color data (with only a couple of exceptions such as brush colors) to be stored in linear RGB color space, rather than sRGB as previously. This brings it in line with Nuke, which also operates this way, quite successfully. Color swatches, pickers, color ramp display are now gamma corrected to display gamma so you can see what you're doing, but the numbers themselves are considered linear. This makes understanding blending modes more clear (a 0.5 value on overlay will not change the result now) as well as making color swatches act more predictably in the compositor, however bringing over color values from applications like photoshop or gimp, that operate in a gamma space, will give identical results. This commit will convert over existing files saved by earlier 2.5 versions to work generally the same, though there may be some slight differences with things like textures. Now that we're set on changing other areas of shading, this won't be too disruptive overall. I've made a diagram explaining the pipeline here: http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png and some docs here: http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
float col[3];
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (Gtexdraw.color_profile) linearrgb_to_srgb_v3_v3(col, &ma->r);
Changes to Color Management After testing and feedback, I've decided to slightly modify the way color management works internally. While the previous method worked well for rendering, was a smaller transition and had some advantages over this new method, it was a bit more ambiguous, and was making things difficult for other areas such as compositing. This implementation now considers all color data (with only a couple of exceptions such as brush colors) to be stored in linear RGB color space, rather than sRGB as previously. This brings it in line with Nuke, which also operates this way, quite successfully. Color swatches, pickers, color ramp display are now gamma corrected to display gamma so you can see what you're doing, but the numbers themselves are considered linear. This makes understanding blending modes more clear (a 0.5 value on overlay will not change the result now) as well as making color swatches act more predictably in the compositor, however bringing over color values from applications like photoshop or gimp, that operate in a gamma space, will give identical results. This commit will convert over existing files saved by earlier 2.5 versions to work generally the same, though there may be some slight differences with things like textures. Now that we're set on changing other areas of shading, this won't be too disruptive overall. I've made a diagram explaining the pipeline here: http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png and some docs here: http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
else copy_v3_v3(col, &ma->r);
glColor3fv(col);
}
code cleanup: favor braces when blocks have mixed brace use.
2013-03-09 03:46:30 +00:00
else {
glColor3f(1.0, 1.0, 1.0);
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
else {
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_NORMAL; /* Set color from mcol */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
}
Merge with trunk r40782
2011-10-04 11:42:44 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
static DMDrawOption draw_tface__set_draw(MTexPoly *mtexpoly, const bool UNUSED(has_mcol), int matnr)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Material *ma = give_current_material(Gtexdraw.ob, matnr + 1);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
Cleanup, use define instead of magic number
2015-06-17 16:29:13 +02:00
if (ma && (ma->game.flag & GEMAT_INVISIBLE)) return DM_DRAW_OPTION_SKIP;
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
if (mtexpoly || Gtexdraw.is_texpaint)
set_draw_settings_cached(0, mtexpoly, ma, Gtexdraw);
Fix #33741,#33856: multi texture drawing problem with VBO's after a recent bugfix.
2013-01-15 10:47:44 +00:00
Fix #33599: VBO textured draw mode did not update correctly when an image filepath was changed to an invalid one. Also fixed Object Color not being displayed correctly with VBO's. The way it has to clear the VBO buffers here is quite poor though and slow, we really need textures and materials in the depsgraph to do this quicker.
2012-12-18 12:42:13 +00:00
/* always use color from mcol, as set in update_tface_color_layer */
return DM_DRAW_OPTION_NORMAL;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Fix #31988: VBOs Textured solid : no update of material in 3Dview Issue was caused by VBOs using CD_TEXTURE_MCOL for faces colors. This layer was creating on mesh display (from draw_tface_mapped__set_draw) in cases there's no such a layer. If material settings are changing, this layer wasn't updated and old colors were used. Fixed by performing an update of this layer in cases it's already exists. This would give some % of slowdown, but don't think it'll be dramatically bad. Would be nice to find a nice way to update such a layer in cases material is actually changes only, or get completely rid of it/
2012-07-12 16:08:22 +00:00
Don't use vertex colors in textured mesh display during texpaint. Wasn't that irritating?
2015-04-10 13:05:17 +02:00
static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
const MPoly *mp = dm->getPolyArray(dm);
const int mpoly_num = dm->getNumPolys(dm);
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
MTexPoly *mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
MLoopCol *finalCol;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
int i, j;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
MLoopCol *mloopcol = NULL;
Don't use vertex colors in textured mesh display during texpaint. Wasn't that irritating?
2015-04-10 13:05:17 +02:00
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
/* cache material values to avoid a lot of lookups */
Material *ma = NULL;
short mat_nr_prev = -1;
enum {
COPY_CALC,
COPY_ORIG,
COPY_PREV,
} copy_mode = COPY_CALC;
Don't use vertex colors in textured mesh display during texpaint. Wasn't that irritating?
2015-04-10 13:05:17 +02:00
if (use_mcol) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
mloopcol = dm->getLoopDataArray(dm, CD_PREVIEW_MLOOPCOL);
if (!mloopcol)
mloopcol = dm->getLoopDataArray(dm, CD_MLOOPCOL);
Don't use vertex colors in textured mesh display during texpaint. Wasn't that irritating?
2015-04-10 13:05:17 +02:00
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (CustomData_has_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL)) {
finalCol = CustomData_get_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL);
Fix #31988: VBOs Textured solid : no update of material in 3Dview Issue was caused by VBOs using CD_TEXTURE_MCOL for faces colors. This layer was creating on mesh display (from draw_tface_mapped__set_draw) in cases there's no such a layer. If material settings are changing, this layer wasn't updated and old colors were used. Fixed by performing an update of this layer in cases it's already exists. This would give some % of slowdown, but don't think it'll be dramatically bad. Would be nice to find a nice way to update such a layer in cases material is actually changes only, or get completely rid of it/
2012-07-12 16:08:22 +00:00
}
else {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
finalCol = MEM_mallocN(sizeof(MLoopCol) * dm->numLoopData, "add_tface_color_layer");
CustomData_add_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL, CD_ASSIGN, finalCol, dm->numLoopData);
Fix #31988: VBOs Textured solid : no update of material in 3Dview Issue was caused by VBOs using CD_TEXTURE_MCOL for faces colors. This layer was creating on mesh display (from draw_tface_mapped__set_draw) in cases there's no such a layer. If material settings are changing, this layer wasn't updated and old colors were used. Fixed by performing an update of this layer in cases it's already exists. This would give some % of slowdown, but don't think it'll be dramatically bad. Would be nice to find a nice way to update such a layer in cases material is actually changes only, or get completely rid of it/
2012-07-12 16:08:22 +00:00
}
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
for (i = mpoly_num; i--; mp++) {
const short mat_nr = mp->mat_nr;
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
if (UNLIKELY(mat_nr_prev != mat_nr)) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
ma = give_current_material(Gtexdraw.ob, mat_nr + 1);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_CALC;
mat_nr_prev = mat_nr;
}
TexFace to Material Settings big patch Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
/* avoid lookups */
if (copy_mode == COPY_ORIG) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
}
else if (copy_mode == COPY_PREV) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
int loop_index = mp->loopstart;
const MLoopCol *lcol_prev = &finalCol[(mp - 1)->loopstart];
for (j = 0; j < mp->totloop; j++, loop_index++) {
finalCol[loop_index] = *lcol_prev;
}
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
}
/* (copy_mode == COPY_CALC) */
else if (ma && (ma->game.flag & GEMAT_INVISIBLE)) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (mloopcol) {
memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_ORIG;
}
else {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_PREV;
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
else if (mtexpoly && set_draw_settings_cached(0, mtexpoly, ma, Gtexdraw)) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
int loop_index = mp->loopstart;
for (j = 0; j < mp->totloop; j++, loop_index++) {
finalCol[loop_index].r = 255;
finalCol[loop_index].g = 0;
finalCol[loop_index].b = 255;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_PREV;
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
Fix #33599: VBO textured draw mode did not update correctly when an image filepath was changed to an invalid one. Also fixed Object Color not being displayed correctly with VBO's. The way it has to clear the VBO buffers here is quite poor though and slow, we really need textures and materials in the depsgraph to do this quicker.
2012-12-18 12:42:13 +00:00
else if (ma && (ma->shade_flag & MA_OBCOLOR)) {
Cleanup
2015-07-29 20:18:22 +10:00
int loop_index = mp->loopstart;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
for (j = 0; j < mp->totloop; j++, loop_index++) {
Fix warnings and remove casts by adding copy_vx_vx_uchar() functions.
2015-10-11 01:44:47 +02:00
copy_v3_v3_uchar(&finalCol[loop_index].r, Gtexdraw.obcol);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_PREV;
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
}
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
else {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (mloopcol) {
memcpy(&finalCol[mp->loopstart], &mloopcol[mp->loopstart], sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_ORIG;
}
else if (mtexpoly) {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
copy_mode = COPY_PREV;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
else {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
float col[3];
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (ma) {
int loop_index = mp->loopstart;
MLoopCol lcol;
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (Gtexdraw.color_profile) linearrgb_to_srgb_v3_v3(col, &ma->r);
else copy_v3_v3(col, &ma->r);
rgb_float_to_uchar((unsigned char *)&lcol.r, col);
lcol.a = 255;
for (j = 0; j < mp->totloop; j++, loop_index++) {
finalCol[loop_index] = lcol;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Changes to Color Management After testing and feedback, I've decided to slightly modify the way color management works internally. While the previous method worked well for rendering, was a smaller transition and had some advantages over this new method, it was a bit more ambiguous, and was making things difficult for other areas such as compositing. This implementation now considers all color data (with only a couple of exceptions such as brush colors) to be stored in linear RGB color space, rather than sRGB as previously. This brings it in line with Nuke, which also operates this way, quite successfully. Color swatches, pickers, color ramp display are now gamma corrected to display gamma so you can see what you're doing, but the numbers themselves are considered linear. This makes understanding blending modes more clear (a 0.5 value on overlay will not change the result now) as well as making color swatches act more predictably in the compositor, however bringing over color values from applications like photoshop or gimp, that operate in a gamma space, will give identical results. This commit will convert over existing files saved by earlier 2.5 versions to work generally the same, though there may be some slight differences with things like textures. Now that we're set on changing other areas of shading, this won't be too disruptive overall. I've made a diagram explaining the pipeline here: http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png and some docs here: http://www.blender.org/development/release-logs/blender-250/color-management/
2009-12-02 07:56:34 +00:00
}
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
else {
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
memset(&finalCol[mp->loopstart], 0xff, sizeof(*finalCol) * mp->totloop);
Optimize Vertex Color update Avoid recalculating the material color when its the same as the last.
2015-07-16 15:47:23 +10:00
}
copy_mode = COPY_PREV;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
}
}
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
Addition/correction to previous commit: subsurf needs the same modifications in its derived mesh function or materials don't get updated at all anymore.
2014-11-27 20:12:46 +01:00
static DMDrawOption draw_tface_mapped__set_draw(void *userData, int origindex, int UNUSED(mat_nr))
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
const Mesh *me = ((drawTFace_userData *)userData)->me;
uv texture (though not glsl) works now. also fixed some bugs. still some issues left, and for some reason textured objs aren't displaying properly in object mode.
2009-07-24 10:43:58 +00:00
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
/* array checked for NULL before calling */
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
MPoly *mpoly = &me->mpoly[origindex];
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
BLI_assert(origindex >= 0 && origindex < me->totpoly);
uv texture (though not glsl) works now. also fixed some bugs. still some issues left, and for some reason textured objs aren't displaying properly in object mode.
2009-07-24 10:43:58 +00:00
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
if (mpoly->flag & ME_HIDE) {
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_SKIP;
uv texture (though not glsl) works now. also fixed some bugs. still some issues left, and for some reason textured objs aren't displaying properly in object mode.
2009-07-24 10:43:58 +00:00
}
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
else {
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
MTexPoly *tpoly = (me->mtpoly) ? &me->mtpoly[origindex] : NULL;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
int matnr = mpoly->mat_nr;
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
return draw_tface__set_draw(tpoly, (me->mloopcol != NULL), matnr);
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Addition/correction to previous commit: subsurf needs the same modifications in its derived mesh function or materials don't get updated at all anymore.
2014-11-27 20:12:46 +01:00
static DMDrawOption draw_em_tf_mapped__set_draw(void *userData, int origindex, int mat_nr)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawEMTFMapped_userData *data = userData;
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
BMEditMesh *em = data->em;
fix for own regression, face index ranges still need checking in some places.
2013-07-14 23:41:33 +00:00
BMFace *efa;
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
if (UNLIKELY(origindex >= em->bm->totface))
fix for own regression, face index ranges still need checking in some places.
2013-07-14 23:41:33 +00:00
return DM_DRAW_OPTION_NORMAL;
Fix T42653, solidify modifier not displaying correctly under edit mode. Basically, our drawing code assumed we always use the edit mesh materials, which can be different from the derived mesh materials in modifiers doing overrides. We usually we want to use the derived mesh when it is available instead. There are two fixes here for both solid and textured mode. Unfortunately the fixes do not help to make the display code less labyrinthian but I expect this "should work" (tm and famous last words) Solid mode fix is 95% from Bastien, thanks!
2014-11-27 19:12:48 +01:00
efa = BM_face_at_index(em->bm, origindex);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
remove NULL checks for return values from EDBM_***_at_index calls.
2013-06-20 07:00:57 +00:00
if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
return DM_DRAW_OPTION_SKIP;
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
}
else {
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
MTexPoly *mtexpoly = (data->cd_poly_tex_offset != -1) ?
BM_ELEM_CD_GET_VOID_P(efa, data->cd_poly_tex_offset) : NULL;
Addition/correction to previous commit: subsurf needs the same modifications in its derived mesh function or materials don't get updated at all anymore.
2014-11-27 20:12:46 +01:00
int matnr = (mat_nr != -1) ? mat_nr : efa->mat_nr;
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
return draw_tface__set_draw_legacy(mtexpoly, data->has_mcol, matnr);
uv texture (though not glsl) works now. also fixed some bugs. still some issues left, and for some reason textured objs aren't displaying properly in object mode.
2009-07-24 10:43:58 +00:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
fix [#29794] Cannot hide faces in weight-paint mode bug was introduced with cycles merge.
2012-01-11 07:03:47 +00:00
/* when face select is on, use face hidden flag */
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
static DMDrawOption wpaint__setSolidDrawOptions_facemask(void *userData, int index)
fix [#29794] Cannot hide faces in weight-paint mode bug was introduced with cycles merge.
2012-01-11 07:03:47 +00:00
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Mesh *me = (Mesh *)userData;
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
MPoly *mp = &me->mpoly[index];
Code cleanup: use named values for options in DerivedMesh drawing. The DMSetDrawOptions[Tex] callbacks return 0 (skip), 1 (draw), or 2 (either stipple or skip mcols.) In the CDDM, EDDM, and CCGDM draw functions, as well as the callbacks in drawmesh/drawobject, replace these numbers with values from an enum, DMDrawOptions.
2012-03-08 06:47:05 +00:00
if (mp->flag & ME_HIDE)
return DM_DRAW_OPTION_SKIP;
return DM_DRAW_OPTION_NORMAL;
fix [#29794] Cannot hide faces in weight-paint mode bug was introduced with cycles merge.
2012-01-11 07:03:47 +00:00
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void draw_mesh_text(Scene *scene, Object *ob, int glsl)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
Mesh *me = ob->data;
DerivedMesh *ddm;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
MPoly *mp, *mface = me->mpoly;
MTexPoly *mtpoly = me->mtpoly;
MLoopUV *mloopuv = me->mloopuv;
MLoopUV *luv;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
MLoopCol *mloopcol = me->mloopcol; /* why does mcol exist? */
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
MLoopCol *lcol;
fix for a strange linking error where set_property() in source/blender/blenkernel/intern/property.c would get mixed up with an X11 function of the same name. it crashed blender loading on my system. Give functions in property.c more unique names.
2012-09-18 04:35:30 +00:00
bProperty *prop = BKE_bproperty_object_get(ob, "Text");
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
GPUVertexAttribs gattribs;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
int a, totpoly = me->totpoly;
/* fake values to pass to GPU_render_text() */
style cleanup
2012-10-22 08:15:51 +00:00
MCol tmp_mcol[4] = {{0}};
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
MCol *tmp_mcol_pt = mloopcol ? tmp_mcol : NULL;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* don't draw without tfaces */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (!mtpoly || !mloopuv)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
return;
/* don't draw when editing */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (ob->mode & OB_MODE_EDIT)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
return;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
else if (ob == OBACT)
Paint API: add BKE_paint_select_elem_test: to check on paint selection
2014-02-26 16:00:54 +11:00
if (BKE_paint_select_elem_test(ob))
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
return;
2.5 Think global, act local! The old favorite G.scene gone! Man... that took almost 2 days. Also removed G.curscreen and G.edbo. Not everything could get solved; here's some notes. - modifiers now store current scene in ModifierData. This is not meant for permanent, but it can probably stick there until we cleaned the anim system and depsgraph to cope better with timing issues. - Game engine G.scene should become an argument for staring it. Didn't solve this yet. - Texture nodes should get scene cfra, but the current implementation is too tightly wrapped to do it easily.
2009-01-04 14:14:06 +00:00
ddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
for (a = 0, mp = mface; a < totpoly; a++, mtpoly++, mp++) {
short matnr = mp->mat_nr;
Cleanup: use bool /w flag checks
2015-04-20 23:37:04 +10:00
const bool mf_smooth = (mp->flag & ME_SMOOTH) != 0;
BGE: Fix for [#35320] "Crash When Adding Property without Setting Material" reported by Leon Cheung. Adding an extra NULL check to draw_mesh_text() to avoid accessing a NULL material array.
2013-05-13 05:37:45 +00:00
Material *mat = (me->mat) ? me->mat[matnr] : NULL;
Fix #32050: UV map and game engine property cause crash
2012-07-12 09:56:18 +00:00
int mode = mat ? mat->game.flag : GEMAT_INVISIBLE;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
BGE: Fix for [#35320] "Crash When Adding Property without Setting Material" reported by Leon Cheung. Adding an extra NULL check to draw_mesh_text() to avoid accessing a NULL material array.
2013-05-13 05:37:45 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
if (!(mode & GEMAT_INVISIBLE) && (mode & GEMAT_TEXT) && mp->totloop >= 3) {
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
/* get the polygon as a tri/quad */
int mp_vi[4];
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
float v_quad_data[4][3];
const float *v_quad[4];
const float *uv_quad[4];
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
char string[MAX_PROPSTRING];
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
int characters, i, glattrib = -1, badtex = 0;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
/* TEXFACE */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (glsl) {
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
GPU_object_material_bind(matnr + 1, &gattribs);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
for (i = 0; i < gattribs.totlayer; i++) {
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (gattribs.layer[i].type == CD_MTFACE) {
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glattrib = gattribs.layer[i].glindex;
break;
}
}
}
else {
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
badtex = set_draw_settings_cached(0, mtpoly, mat, Gtexdraw);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
if (badtex) {
continue;
}
}
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
mp_vi[0] = me->mloop[mp->loopstart + 0].v;
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
mp_vi[1] = me->mloop[mp->loopstart + 1].v;
mp_vi[2] = me->mloop[mp->loopstart + 2].v;
mp_vi[3] = (mp->totloop >= 4) ? me->mloop[mp->loopstart + 3].v : 0;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
/* UV */
luv = &mloopuv[mp->loopstart];
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
uv_quad[0] = luv->uv; luv++;
uv_quad[1] = luv->uv; luv++;
uv_quad[2] = luv->uv; luv++;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
if (mp->totloop >= 4) {
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
uv_quad[3] = luv->uv;
}
else {
uv_quad[3] = NULL;
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
}
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
/* COLOR */
if (mloopcol) {
code cleanup: use min_/max_ math functions, add minmax_v2_v2v2.
2012-10-25 22:47:54 +00:00
unsigned int totloop_clamp = min_ii(4, mp->totloop);
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
unsigned int j;
lcol = &mloopcol[mp->loopstart];
fix buffer overrun when 5+ sided faces were used for text drawing.
2012-09-19 02:06:27 +00:00
for (j = 0; j < totloop_clamp; j++, lcol++) {
swap BMLoopCol r/b color, requires subversion bump. old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol. Loading old files works, saving legacy format works too. What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge. (it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
MESH_MLOOPCOL_TO_MCOL(lcol, &tmp_mcol[j]);
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
}
}
/* LOCATION */
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
ddm->getVertCo(ddm, mp_vi[0], v_quad_data[0]);
ddm->getVertCo(ddm, mp_vi[1], v_quad_data[1]);
ddm->getVertCo(ddm, mp_vi[2], v_quad_data[2]);
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
if (mp->totloop >= 4) {
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
ddm->getVertCo(ddm, mp_vi[3], v_quad_data[3]);
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
}
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
v_quad[0] = v_quad_data[0];
v_quad[1] = v_quad_data[1];
v_quad[2] = v_quad_data[2];
if (mp->totloop >= 4) {
v_quad[3] = v_quad_data[2];
}
else {
v_quad[3] = NULL;
}
use MPoly's rather then MFaces (since these don't necessarily exist) for drawing game engine bitmap font text. minor edits to draw_tface_mapped__set_draw() to make it more efficient.
2012-02-08 09:07:24 +00:00
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup
2012-07-08 20:36:00 +00:00
/* The BM_FONT handling is in the gpu module, shared with the
* game engine, was duplicated previously */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
fix for a strange linking error where set_property() in source/blender/blenkernel/intern/property.c would get mixed up with an X11 function of the same name. it crashed blender loading on my system. Give functions in property.c more unique names.
2012-09-18 04:35:30 +00:00
BKE_bproperty_set_valstr(prop, string);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
characters = strlen(string);
Image thread safe improvements This commit makes BKE_image_acquire_ibuf referencing result, which means once some area requested for image buffer, it'll be guaranteed this buffer wouldn't be freed by image signal. To de-reference buffer BKE_image_release_ibuf should now always be used. To make referencing working correct we can not rely on result of image_get_ibuf_threadsafe called outside from thread lock. This is so because we need to guarantee getting image buffer from list of loaded buffers and it's referencing happens atomic. Without lock here it is possible that between call of image_get_ibuf_threadsafe and referencing the buffer IMA_SIGNAL_FREE would be called. Image signal handling too is blocking now to prevent such a situation. Threads are locking by spinlock, which are faster than mutexes. There were some slowdown reports in the past about render slowdown when using OSX on Xeon CPU. It shouldn't happen with spin locks, but more tests on different hardware would be really welcome. So far can not see speed regressions on own computers. This commit also removes BKE_image_get_ibuf, because it was not so intuitive when get_ibuf and acquire_ibuf should be used. Thanks to Ton and Brecht for discussion/review :)
2012-11-15 15:59:58 +00:00
if (!BKE_image_has_ibuf(mtpoly->tpage, NULL))
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
characters = 0;
if (!mf_smooth) {
float nor[3];
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
normal_tri_v3(nor, v_quad[0], v_quad[1], v_quad[2]);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glNormal3fv(nor);
}
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
GPU_render_text(
mtpoly, mode, string, characters,
(unsigned int *)tmp_mcol_pt,
v_quad, uv_quad,
glattrib);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
}
ddm->release(ddm);
}
Slight refactor of VBO code to deal with multiple textures. Added compareDrawSettings callback to driver mesh's callbacks which are drawing textured faces (mapped and not mapped). This new callback checks if two faces are drawing with the same settings (testures, shading etc) and if they not, flush of faces happens into ogl using glDrawArrays and next face would be drawn with it's own settings. Currently implemented compareDrawSettings is used to resolve issue from bug report only, probably there are extra places where this callback is needed, but haven't seen configuration where current logic will fail, so it should be ok. Also reordered arguments passing to drawMappedFaces DM's callbacks, so now all drawing callback are accepting list of callbacks and then userData, instead of using mixed order of callbacks and userData which was a bit confusing to work with. This commit fixes: - #26410: VBO & multitexture doesnt work - #29464: VBO enabled causes UV coruption
2011-12-01 12:12:39 +00:00
static int compareDrawOptions(void *userData, int cur_index, int next_index)
{
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawTFace_userData *data = userData;
Slight refactor of VBO code to deal with multiple textures. Added compareDrawSettings callback to driver mesh's callbacks which are drawing textured faces (mapped and not mapped). This new callback checks if two faces are drawing with the same settings (testures, shading etc) and if they not, flush of faces happens into ogl using glDrawArrays and next face would be drawn with it's own settings. Currently implemented compareDrawSettings is used to resolve issue from bug report only, probably there are extra places where this callback is needed, but haven't seen configuration where current logic will fail, so it should be ok. Also reordered arguments passing to drawMappedFaces DM's callbacks, so now all drawing callback are accepting list of callbacks and then userData, instead of using mixed order of callbacks and userData which was a bit confusing to work with. This commit fixes: - #26410: VBO & multitexture doesnt work - #29464: VBO enabled causes UV coruption
2011-12-01 12:12:39 +00:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (data->mpoly && data->mpoly[cur_index].mat_nr != data->mpoly[next_index].mat_nr)
Slight refactor of VBO code to deal with multiple textures. Added compareDrawSettings callback to driver mesh's callbacks which are drawing textured faces (mapped and not mapped). This new callback checks if two faces are drawing with the same settings (testures, shading etc) and if they not, flush of faces happens into ogl using glDrawArrays and next face would be drawn with it's own settings. Currently implemented compareDrawSettings is used to resolve issue from bug report only, probably there are extra places where this callback is needed, but haven't seen configuration where current logic will fail, so it should be ok. Also reordered arguments passing to drawMappedFaces DM's callbacks, so now all drawing callback are accepting list of callbacks and then userData, instead of using mixed order of callbacks and userData which was a bit confusing to work with. This commit fixes: - #26410: VBO & multitexture doesnt work - #29464: VBO enabled causes UV coruption
2011-12-01 12:12:39 +00:00
return 0;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (data->mtexpoly && data->mtexpoly[cur_index].tpage != data->mtexpoly[next_index].tpage)
Slight refactor of VBO code to deal with multiple textures. Added compareDrawSettings callback to driver mesh's callbacks which are drawing textured faces (mapped and not mapped). This new callback checks if two faces are drawing with the same settings (testures, shading etc) and if they not, flush of faces happens into ogl using glDrawArrays and next face would be drawn with it's own settings. Currently implemented compareDrawSettings is used to resolve issue from bug report only, probably there are extra places where this callback is needed, but haven't seen configuration where current logic will fail, so it should be ok. Also reordered arguments passing to drawMappedFaces DM's callbacks, so now all drawing callback are accepting list of callbacks and then userData, instead of using mixed order of callbacks and userData which was a bit confusing to work with. This commit fixes: - #26410: VBO & multitexture doesnt work - #29464: VBO enabled causes UV coruption
2011-12-01 12:12:39 +00:00
return 0;
return 1;
}
Fix #34837 Texture Painting using Face Selection Mask fails to show texture if more than 1 texture is used The problem here is that no flushing is done when the texface image changes between rendered triangles. Added a compare function and slightly modified the draw_tface_mapped__set_draw callback to compliant with the new user data.
2013-06-26 10:14:30 +00:00
Fixed issue with multiple textures and editmode when VBOs are enabled
2011-12-01 18:26:57 +00:00
static int compareDrawOptionsEm(void *userData, int cur_index, int next_index)
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
drawEMTFMapped_userData *data = userData;
Fixed issue with multiple textures and editmode when VBOs are enabled
2011-12-01 18:26:57 +00:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (data->mpoly && data->mpoly[cur_index].mat_nr != data->mpoly[next_index].mat_nr)
Fixed issue with multiple textures and editmode when VBOs are enabled
2011-12-01 18:26:57 +00:00
return 0;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
if (data->mtexpoly && data->mtexpoly[cur_index].tpage != data->mtexpoly[next_index].tpage)
Fixed issue with multiple textures and editmode when VBOs are enabled
2011-12-01 18:26:57 +00:00
return 0;
return 1;
}
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc. helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-15 01:52:28 +00:00
static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, DerivedMesh *dm, const int draw_flags)
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
{
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
Mesh *me = ob->data;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
DMDrawFlag uvflag = DM_DRAW_USE_ACTIVE_UV;
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* correct for negative scale */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
else glFrontFace(GL_CCW);
/* draw the textured mesh */
2.5 View3D has been split now in a local part (RegionView3D) and a per-area part (old View3D). Currently local is: - view transform - camera zoom/offset - gpencil (todo) - custom clipping planes Rest is in Area still, like active camera, draw type, layers, localview, custom centers, around-settings, transform widget, gridlines, and so on (mostly stuff as available in header). To see it work; also added new feature for region split, press SHIFT+ALT+CTRL+S for four-split. The idea is to make a preset 4-split, configured to stick to top/right/front views for three views. Another cool idea to explore is to then box-clip all drawing based on these 3 views. Note about the code: - currently view3d still stores some depricated settings, to convert from older files. Not all settings are copied over though, like custom clip planes or the 'lock view to object'. - since some view3d ops are now on area level, the operators for it should keep track of that. Bugfix in transform: quat initialize in operator-invoke missed one zero. Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
draw_textured_begin(scene, v3d, rv3d, ob);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
bugfix while looking into [#24900], color wasn't being set for face-mask mode.
2010-11-25 21:59:12 +00:00
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
if (ob->mode & OB_MODE_TEXTURE_PAINT) {
uvflag = DM_DRAW_USE_TEXPAINT_UV;
}
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (ob->mode & OB_MODE_EDIT) {
Get rid of hardcoded structure definition in DM drawing callbacks Structures passing to DM callbacks as userData used to be defined in both callee and callbacks itself which made it difficult and unsafe to add new properties to user data. Added typedefs for this structures and use them in callbacks and callee functions.
2011-12-20 08:47:36 +00:00
drawEMTFMapped_userData data;
some speedup for drawing mesh in texture mode. - only pass if the mesh has vertex colors to drawParams() rather then the mcol its self, this saves a lookup on the color. - drawing textures in editmode with no vertex colors would still lookup vertex colors on each face, instead cache this info for all faces.
2011-09-23 18:29:45 +00:00
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
data.em = me->edit_btmesh;
data.has_mcol = CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_MLOOPCOL);
Move from MTFace to MTexPoly w/ texture checks Part of moving away from MFace.
2015-07-14 22:27:25 +10:00
data.cd_poly_tex_offset = CustomData_get_offset(&me->edit_btmesh->bm->pdata, CD_MTEXPOLY);
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
data.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
data.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
some speedup for drawing mesh in texture mode. - only pass if the mesh has vertex colors to drawParams() rather then the mcol its self, this saves a lookup on the color. - drawing textures in editmode with no vertex colors would still lookup vertex colors on each face, instead cache this info for all faces.
2011-09-23 18:29:45 +00:00
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, compareDrawOptionsEm, &data, 0);
Code cleanup: remove seam drawing in face select mode, was left over from when seams were edited there, now only needed in edit mode.
2011-08-12 18:13:55 +00:00
}
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
else if (draw_flags & DRAW_FACE_SELECT) {
if (ob->mode & OB_MODE_WEIGHT_PAINT)
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions_facemask, GPU_object_material_bind, NULL, me,
GPU Buffers: This commit begins implementation of the idea about hidden face separation outlined in http://code.blender.org/2015/06/optimizing-blenders-real-time-mesh- We split hidden and visible faces to different parts of the triangle buffer. Mapped drawing will now skip iterating through hidden polys. Of course the final target, when all derived mesh types use VBO sorting, is to skip checking for hide flag per face completely. All faces will be pre-sorted anyway and we'll be able to draw them with one draw call.
2015-07-25 20:00:49 +02:00
DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN);
Fix #34837 Texture Painting using Face Selection Mask fails to show texture if more than 1 texture is used The problem here is that no flushing is done when the texface image changes between rendered triangles. Added a compare function and slightly modified the draw_tface_mapped__set_draw callback to compliant with the new user data.
2013-06-26 10:14:30 +00:00
else {
drawTFace_userData userData;
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
userData.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
userData.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
Fix #34837 Texture Painting using Face Selection Mask fails to show texture if more than 1 texture is used The problem here is that no flushing is done when the texface image changes between rendered triangles. Added a compare function and slightly modified the draw_tface_mapped__set_draw callback to compliant with the new user data.
2013-06-26 10:14:30 +00:00
userData.me = me;
GSOC 2013 paint Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-21 12:02:05 +02:00
dm->drawMappedFacesTex(dm, me->mpoly ? draw_tface_mapped__set_draw : NULL, compareDrawOptions, &userData, uvflag);
Fix #34837 Texture Painting using Face Selection Mask fails to show texture if more than 1 texture is used The problem here is that no flushing is done when the texface image changes between rendered triangles. Added a compare function and slightly modified the draw_tface_mapped__set_draw callback to compliant with the new user data.
2013-06-26 10:14:30 +00:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
}
Cleanup GPU: get rid of some extremely legacy draw code. Basically this commit gets rid of most of the derived mesh immediate mode drawing (cases such as subsurf excluded). Even when VBO is turned off in user preferences, we still use vertex arrays, which are very similar to VBOs but memory is client side. Vertex arrays are OpenGL 1.1 so compatibility is not an issue here. Reviewers: campbellbarton, sergey, jwilkins Differential Revision: https://developer.blender.org/D919
2014-11-28 14:38:18 +01:00
else {
drawTFace_userData userData;
Don't use vertex colors in textured mesh display during texpaint. Wasn't that irritating?
2015-04-10 13:05:17 +02:00
update_tface_color_layer(dm, !(ob->mode & OB_MODE_TEXTURE_PAINT));
Cleanup GPU: get rid of some extremely legacy draw code. Basically this commit gets rid of most of the derived mesh immediate mode drawing (cases such as subsurf excluded). Even when VBO is turned off in user preferences, we still use vertex arrays, which are very similar to VBOs but memory is client side. Vertex arrays are OpenGL 1.1 so compatibility is not an issue here. Reviewers: campbellbarton, sergey, jwilkins Differential Revision: https://developer.blender.org/D919
2014-11-28 14:38:18 +01:00
Add tessellation data to DerivedMesh (LoopTri) This stores loop indices into the loop array giving easier acess to data such as vertex-colors and UV's, removing the need to store an MFace duplicate of custom-data. This doesn't yet move all internal code from MFace to LoopTri just yet. Only applies to: - opengl drawing - sculpting (pbvh) - vertex/weight paint Thanks to @psy-fi for review, fixes and improvements to drawing!
2015-07-17 03:36:03 +10:00
userData.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
userData.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
Cleanup GPU: get rid of some extremely legacy draw code. Basically this commit gets rid of most of the derived mesh immediate mode drawing (cases such as subsurf excluded). Even when VBO is turned off in user preferences, we still use vertex arrays, which are very similar to VBOs but memory is client side. Vertex arrays are OpenGL 1.1 so compatibility is not an issue here. Reviewers: campbellbarton, sergey, jwilkins Differential Revision: https://developer.blender.org/D919
2014-11-28 14:38:18 +01:00
userData.me = NULL;
dm->drawFacesTex(dm, draw_tface__set_draw, compareDrawOptions, &userData, uvflag);
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* draw game engine text hack */
fix for a strange linking error where set_property() in source/blender/blenkernel/intern/property.c would get mixed up with an X11 function of the same name. it crashed blender loading on my system. Give functions in property.c more unique names.
2012-09-18 04:35:30 +00:00
if (BKE_bproperty_object_get(ob, "Text"))
2.5 Cleanup - for portablity we can keep the old ugly defines for retrieving active object, cfra and so on. But, they will use 'scene' not G.scene. - fixed code that uses those defines. - some unused variables/functions removed
2008-12-22 09:43:29 +00:00
draw_mesh_text(scene, ob, 0);
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
draw_textured_end();
/* draw edges and selected faces over textured mesh */
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
if (!(ob == scene->obedit) && (draw_flags & DRAW_FACE_SELECT)) {
bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
draw_mesh_face_select(rv3d, me, dm, draw_select_edges);
}
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
/* reset from negative scale correction */
glFrontFace(GL_CCW);
style cleanup: spelling. also remove large, duplicate comments from sunsky.h
2012-03-09 00:41:09 +00:00
/* in editmode, the blend mode needs to be set in case it was ADD */
2.5 Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-19 12:14:58 +00:00
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/************************** NEW SHADING NODES ********************************/
typedef struct TexMatCallback {
Scene *scene;
Object *ob;
Mesh *me;
DerivedMesh *dm;
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
bool shadeless;
bool two_sided_lighting;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
} TexMatCallback;
static void tex_mat_set_material_cb(void *UNUSED(userData), int mat_nr, void *attribs)
{
/* all we have to do here is simply enable the GLSL material, but note
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* that the GLSL code will give different result depending on the drawtype,
* in texture draw mode it will output the active texture node, in material
* draw mode it will show the full material. */
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
GPU_object_material_bind(mat_nr, attribs);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs)
{
/* texture draw mode without GLSL */
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
TexMatCallback *data = (TexMatCallback *)userData;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
GPUVertexAttribs *gattribs = attribs;
Image *ima;
ImageUser *iuser;
bNode *node;
/* draw image texture if we find one */
Bake-API: Test for cyclic node connection If the active image node contributes to the final material shader (meaning it's either directly or indirectly connected to an Output Node) the user will receive an alert about circular dependency. Similar to what we do for Blender internal the baking will still happen, but the user will receive the alert which should prevent the image saving to happen if the result was not intentional. Core function to check for node output written by Lukas Toenne. Reviewers: lukastoenne, campbellbarton Differential Revision: https://developer.blender.org/D673
2014-07-23 11:33:29 -03:00
if (ED_object_get_active_image(data->ob, mat_nr, &ima, &iuser, &node, NULL)) {
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/* get openl texture */
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
int mipmap = 1;
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
int bindcode = (ima) ? GPU_verify_image(ima, iuser, 0, 0, mipmap, false) : 0;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (bindcode) {
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
NodeTexBase *texbase = node->storage;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/* disable existing material */
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
GPU_object_material_unbind();
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/* bind texture */
glBindTexture(GL_TEXTURE_2D, ima->bindcode);
glMatrixMode(GL_TEXTURE);
glLoadMatrixf(texbase->tex_mapping.mat);
glMatrixMode(GL_MODELVIEW);
/* use active UV texture layer */
memset(gattribs, 0, sizeof(*gattribs));
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
gattribs->layer[0].type = CD_MTFACE;
gattribs->layer[0].name[0] = '\0';
gattribs->layer[0].gltexco = 1;
gattribs->totlayer = 1;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
/* bind material */
float diffuse[3] = {1.0f, 1.0f, 1.0f};
int options = GPU_SHADER_TEXTURE_2D;
if (!data->shadeless)
options |= GPU_SHADER_LIGHTING;
if (data->two_sided_lighting)
options |= GPU_SHADER_TWO_SIDED;
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_colors(diffuse, NULL, 0, 0.0f);
GPU_basic_shader_bind(options);
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
return;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
}
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
/* disable texture material */
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
if (data->shadeless) {
glColor3f(1.0f, 1.0f, 1.0f);
memset(gattribs, 0, sizeof(*gattribs));
}
else {
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
/* enable solid material */
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
GPU_object_material_bind(mat_nr, attribs);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
}
code cleanup: use boolean for derived mesh face test function
2013-07-19 10:40:52 +00:00
static bool tex_mat_set_face_mesh_cb(void *userData, int index)
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
{
/* faceselect mode face hiding */
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
TexMatCallback *data = (TexMatCallback *)userData;
Mesh *me = (Mesh *)data->me;
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
MPoly *mp = &me->mpoly[index];
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
fix for weight paint face selection. since removing tesselation faces we can no longer rely on me->totface & me->mface being set. now use polygons instead.
2012-02-05 03:25:13 +00:00
return !(mp->flag & ME_HIDE);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
code cleanup: use boolean for derived mesh face test function
2013-07-19 10:40:52 +00:00
static bool tex_mat_set_face_editmesh_cb(void *userData, int index)
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
{
/* editmode face hiding */
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
TexMatCallback *data = (TexMatCallback *)userData;
Mesh *me = (Mesh *)data->me;
fix for own regression, face index ranges still need checking in some places.
2013-07-14 23:41:33 +00:00
BMEditMesh *em = me->edit_btmesh;
BMFace *efa;
if (UNLIKELY(index >= em->bm->totface))
return DM_DRAW_OPTION_NORMAL;
move bmesh array lookup data and utility functions from editmesh into bmesh, since enough bmesh operations can also take advantage of direct index lookups on verts/edges/faces. developers note: - EDBM_index_arrays_init/ensure/free -> BM_mesh_elem_table_ensure/init/free - EDBM_vert/edge/face_at_index -> BM_vert/edge/face_at_index - EDBM_uv_element_map_create/free -> BM_uv_element_map_create/free - ED_uv_element_get -> BM_uv_element_get
2013-10-28 02:05:33 +00:00
efa = BM_face_at_index(em->bm, index);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
code refactor, function renaming for bmesh. These changes are to make the bmesh api more consistent and easier to learn, grouping similar functions which is convenient for autocomplete. This uses similar convention to RNA. * use face/loop/edge/vert as a prefix for functions. * use 'elem' as a prefix too for functions that can take any type with a BMHeader. * changed from camel case to underscore separated (like RNA).
2012-02-12 10:51:45 +00:00
return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
fix for building on msvc2008 (also style cleanup)
2012-09-04 01:23:50 +00:00
void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, DerivedMesh *dm, const int draw_flags)
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
{
Matcap fix: Setting Cycles as render engine skipped matcap drawing. Logic for checking drawing types needed a shuffle.
2013-01-22 12:36:06 +00:00
/* if not cycles, or preview-modifiers, or drawing matcaps */
Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last
2014-05-29 02:32:25 +10:00
if ((draw_flags & DRAW_MODIFIERS_PREVIEW) ||
(v3d->flag2 & V3D_SHOW_SOLID_MATCAP) ||
Revert "Fix T46284: Texture paint, wrong shading mode" Should fix T46616 but will reintroduce T46284. The second, original bug needs different handling This reverts commit 904db487a7b14c31282fe0284612159a836657cd.
2015-10-28 12:36:25 +02:00
(BKE_scene_use_new_shading_nodes(scene) == false) ||
((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID)))
Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last
2014-05-29 02:32:25 +10:00
{
Merge with trunk r41701
2011-11-09 15:46:53 +00:00
draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
return;
}
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
fix for fix, own fix for [#31368] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint().
2012-05-10 06:32:24 +00:00
draw_mesh_paint(v3d, rv3d, ob, dm, draw_flags);
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
return;
}
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/* set opengl state for negative scale & color */
code cleanyp - no functional changes.
2012-02-22 16:52:06 +00:00
if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
else glFrontFace(GL_CCW);
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
Mesh *me = ob->data;
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
bool shadeless = ((v3d->flag2 & V3D_SHADELESS_TEX) &&
((v3d->drawtype == OB_TEXTURE) || (ob->mode & OB_MODE_TEXTURE_PAINT)));
bool two_sided_lighting = (me->flag & ME_TWOSIDED) != 0;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
TexMatCallback data = {scene, ob, me, dm, shadeless, two_sided_lighting};
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
bool (*set_face_cb)(void *, int);
bool picking = (G.f & G_PICKSEL) != 0;
/* face hiding callback depending on mode */
if (ob == scene->obedit)
set_face_cb = tex_mat_set_face_editmesh_cb;
else if (draw_flags & DRAW_FACE_SELECT)
set_face_cb = tex_mat_set_face_mesh_cb;
else
set_face_cb = NULL;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
/* test if we can use glsl */
bool glsl = (v3d->drawtype == OB_MATERIAL) && !picking;
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
if (glsl || picking) {
/* draw glsl or solid */
dm->drawMappedFacesMat(dm,
Cleanup: style/spelling
2015-12-12 15:10:03 +11:00
tex_mat_set_material_cb,
set_face_cb, &data);
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
}
else {
/* draw textured */
dm->drawMappedFacesMat(dm,
Cleanup: style/spelling
2015-12-12 15:10:03 +11:00
tex_mat_set_texture_cb,
set_face_cb, &data);
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
OpenGL: fix cycles texture draw mode not respecting double sided lighting.
2015-11-27 02:29:57 +01:00
GPU_end_object_materials();
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
/* reset opengl state */
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
GPU_end_object_materials();
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
glBindTexture(GL_TEXTURE_2D, 0);
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
glFrontFace(GL_CCW);
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
/* faceselect mode drawing over textured mesh */
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
if (!(ob == scene->obedit) && (draw_flags & DRAW_FACE_SELECT)) {
bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
draw_mesh_face_select(rv3d, ob->data, dm, draw_select_edges);
}
Texturing: texture and 3d view draw type changes, these should only have any effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
}
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
/* Vertex Paint and Weight Paint */
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
static void draw_mesh_paint_light_begin(void)
{
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
/* get material diffuse color from vertex colors but set default spec */
const float specular[3] = {0.47f, 0.47f, 0.47f};
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_colors(NULL, specular, 35, 1.0f);
GPU_basic_shader_bind(GPU_SHADER_LIGHTING | GPU_SHADER_USE_COLOR);
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
}
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:32:14 +01:00
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
static void draw_mesh_paint_light_end(void)
{
OpenGL: rename simple shader to basic shader.
2015-12-05 22:11:31 +01:00
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
}
tweak to commit r57891, dont draw hidden faces/edges in editmode.
2013-07-01 01:25:21 +00:00
void draw_mesh_paint_weight_faces(DerivedMesh *dm, const bool use_light,
void *facemask_cb, void *user_data)
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
{
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
DMSetMaterial setMaterial = GPU_object_materials_check() ? GPU_object_material_bind : NULL;
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
int flags = DM_DRAW_USE_COLORS;
Fix weight painting + mask not drawing in latest master. Same issue as vertex painting - though one might wonder if we really need to set material on such occasions.
2015-07-22 16:58:18 +02:00
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
if (use_light) {
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
draw_mesh_paint_light_begin();
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
flags |= DM_DRAW_NEED_NORMALS;
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
}
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
dm->drawMappedFaces(dm, (DMSetDrawOptions)facemask_cb, setMaterial, NULL, user_data, flags);
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
if (use_light) {
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
draw_mesh_paint_light_end();
}
}
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
void draw_mesh_paint_vcolor_faces(DerivedMesh *dm, const bool use_light,
void *facemask_cb, void *user_data,
const Mesh *me)
{
OpenGL: rename GPU_enable_material to better indicate it's binding shaders.
2015-11-23 21:42:17 +01:00
DMSetMaterial setMaterial = GPU_object_materials_check() ? GPU_object_material_bind : NULL;
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
int flags = 0;
Only use material callback when enabled Vert/Face select in painting modes weren't drawing after recent changes.
2015-07-18 05:39:01 +10:00
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
if (use_light) {
draw_mesh_paint_light_begin();
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
flags |= DM_DRAW_NEED_NORMALS;
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
}
if (me->mloopcol) {
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
dm->drawMappedFaces(dm, facemask_cb, setMaterial, NULL, user_data,
DM_DRAW_USE_COLORS | flags);
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
}
else {
glColor3f(1.0f, 1.0f, 1.0f);
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645
2015-11-27 21:16:26 +01:00
dm->drawMappedFaces(dm, facemask_cb, setMaterial, NULL, user_data, flags);
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
}
if (use_light) {
draw_mesh_paint_light_end();
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
}
}
Vertex Paint: inverted line drawing, white lines were often hard to see
2014-03-20 11:44:48 +11:00
void draw_mesh_paint_weight_edges(RegionView3D *rv3d, DerivedMesh *dm,
const bool use_depth, const bool use_alpha,
tweak to commit r57891, dont draw hidden faces/edges in editmode.
2013-07-01 01:25:21 +00:00
void *edgemask_cb, void *user_data)
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
{
/* weight paint in solid mode, special case. focus on making the weights clear
* rather than the shading, this is also forced in wire view */
if (use_depth) {
Fix T37727: z-offset problems with camera view
2013-12-09 20:59:29 +11:00
ED_view3d_polygon_offset(rv3d, 1.0);
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
glDepthMask(0); /* disable write in zbuffer, selected edge wires show better */
}
else {
glDisable(GL_DEPTH_TEST);
}
Vertex Paint: inverted line drawing, white lines were often hard to see
2014-03-20 11:44:48 +11:00
if (use_alpha) {
glEnable(GL_BLEND);
}
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
glColor4ub(255, 255, 255, 96);
glEnable(GL_LINE_STIPPLE);
glLineStipple(1, 0xAAAA);
tweak to commit r57891, dont draw hidden faces/edges in editmode.
2013-07-01 01:25:21 +00:00
dm->drawMappedEdges(dm, (DMSetDrawOptions)edgemask_cb, user_data);
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
if (use_depth) {
Fix T37727: z-offset problems with camera view
2013-12-09 20:59:29 +11:00
ED_view3d_polygon_offset(rv3d, 0.0);
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
glDepthMask(1);
}
else {
glEnable(GL_DEPTH_TEST);
}
glDisable(GL_LINE_STIPPLE);
Vertex Paint: inverted line drawing, white lines were often hard to see
2014-03-20 11:44:48 +11:00
if (use_alpha) {
glDisable(GL_BLEND);
}
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
}
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
fix for building on msvc2008 (also style cleanup)
2012-09-04 01:23:50 +00:00
void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
Object *ob, DerivedMesh *dm, const int draw_flags)
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
{
DMSetDrawOptions facemask = NULL;
Mesh *me = ob->data;
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
const bool use_light = (v3d->drawtype >= OB_SOLID);
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
/* hide faces in face select mode */
fix for bug where weight paint would draw hidden faces but not draw then with the backbuffer (depth selection).
2012-12-23 08:20:44 +00:00
if (me->editflag & (ME_EDIT_PAINT_VERT_SEL | ME_EDIT_PAINT_FACE_SEL))
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
facemask = wpaint__setSolidDrawOptions_facemask;
fix for various redundant checks and possibly fix some crashes in rare situations.
2012-09-05 01:42:52 +00:00
if (ob->mode & OB_MODE_WEIGHT_PAINT) {
tweak to commit r57891, dont draw hidden faces/edges in editmode.
2013-07-01 01:25:21 +00:00
draw_mesh_paint_weight_faces(dm, use_light, facemask, me);
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
}
else if (ob->mode & OB_MODE_VERTEX_PAINT) {
Vertex Paint: use solid shading, shadeless in wire (like wpaint)
2014-03-20 11:33:33 +11:00
draw_mesh_paint_vcolor_faces(dm, use_light, facemask, me, me);
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
}
/* draw face selection on top */
fix for fix, own fix for [#31368] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint().
2012-05-10 06:32:24 +00:00
if (draw_flags & DRAW_FACE_SELECT) {
Tex Paint: hide selected face-mask edges Internal selected edges were distracting when painting images. Also remove unused flag.
2014-12-02 17:56:40 +01:00
bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
draw_mesh_face_select(rv3d, me, dm, draw_select_edges);
fix for fix, own fix for [#31368] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint().
2012-05-10 06:32:24 +00:00
}
fix [#35911] Show weights not working with a weight edit modifier in edit mode
2013-07-01 00:42:44 +00:00
else if ((use_light == false) || (ob->dtx & OB_DRAWWIRE)) {
const bool use_depth = (v3d->flag & V3D_ZBUF_SELECT) || !(ob->mode & OB_MODE_WEIGHT_PAINT);
Vertex Paint: inverted line drawing, white lines were often hard to see
2014-03-20 11:44:48 +11:00
const bool use_alpha = (ob->mode & OB_MODE_VERTEX_PAINT) == 0;
if (use_alpha == false) {
set_inverted_drawing(1);
}
draw_mesh_paint_weight_edges(rv3d, dm, use_depth, use_alpha, NULL, NULL);
if (use_alpha == false) {
set_inverted_drawing(0);
}
fix for fix, own fix for [#31368] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint().
2012-05-10 06:32:24 +00:00
}
Fix #31199 & #31112: cycles not working well with vertex/weight paint selection mask drawing. Now refactored the code a bit so that in no longer calls textured mesh drawing for the face mask drawing, just handle it as part of regular paint color drawing. Should also make the blender internal behavior more logical where it would start showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
}
Copy Permalink