griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
9c2bf9bdbcc23bb008af543b4fbbdf7c33d0decd
test2/source/blender/src/drawview.c

3799 lines
103 KiB
C
Raw Normal View History

Initial revision
2002-10-12 11:37:38 +00:00
/**
* $Id$
*
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +00:00
*
* 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
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* of the License, or (at your option) any later version.
Initial revision
2002-10-12 11:37:38 +00:00
*
* 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,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): none yet.
*
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* ***** END GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +00:00
*/
//#define NAN_LINEAR_PHYSICS
#include <math.h>
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include <string.h>
updated .c files to include: #ifdef HAVE_CONFIG_H #include <config.h> #endif Just need to finish cpp files now :) Kent -- mein@cs.umn.edu
2002-11-25 12:02:15 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
#ifndef WIN32
#include <unistd.h>
#include <sys/times.h>
#else
#include <io.h>
#endif
Tools --------------- Bugfix #5898: buffer overrun by sprintf() in v3d_editvertex_buts() caused a crash. Changed to snprintf().
2007-02-01 20:25:24 +00:00
#ifdef WIN32
#ifndef snprintf
#define snprintf _snprintf
#endif
#endif
Initial revision
2002-10-12 11:37:38 +00:00
#include "MEM_guardedalloc.h"
#include "PIL_time.h"
#include "BMF_Api.h"
#include "IMB_imbuf_types.h"
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
#include "IMB_imbuf.h"
Initial revision
2002-10-12 11:37:38 +00:00
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "DNA_action_types.h"
#include "DNA_armature_types.h"
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
#include "DNA_brush_types.h"
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
#include "DNA_camera_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "DNA_constraint_types.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "DNA_curve_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "DNA_group_types.h"
#include "DNA_image_types.h"
Patch #3126 Option to draw object name in 3d window corner, now also displays for meshes the (pinned) shape key name. Threads: warning fix, added (void) for function declaration.
2007-03-19 15:48:24 +00:00
#include "DNA_key_types.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "DNA_lattice_types.h"
Fix for undo... it didn't do the UV coords (tface) nor the vertexpaint colors. This because of the pretty weird (ab)use of load & make editmesh... For each added undo step, the load_editmesh was fed with an empty mesh to assign data to, without knowledge of what was in the original mesh. That way UV and color data got lost. Solved it in 2 steps: 1. removing the ->tface pointer from EditVlak, and make TFace a builtin struct inside EditVlak. This didnt cost much extra mem, since it already stored UV and color. This enabled some pretty cleanup in editmesh.c as well, storing tface pointers was cumbersome. 2. for each undo step, it then generates always a tface and mcol block to link to the undo Mesh. Even when it wasn't in the actual Mesh, at exit editmode the original Mesh is used as reference anyway, and undo-meshes are freed correctly. The enormous commit is because I had to change the BLI_editVert.h file, and found it was included in about every file unnecessary. I removed it there. ALso found out that subsurf has code ready (unfinished) to make UV coords for the displaylist in EditMode as well, nice to know for later...
2003-11-19 22:00:14 +00:00
#include "DNA_mesh_types.h"
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
#include "DNA_meshdata_types.h"
- added some "Transform Properties" for MetaElem (Metaball in edit mode, N key). It is locx, loxy, locz, dx, dy, dz and stiffness
2004-05-30 14:12:14 +00:00
#include "DNA_meta_types.h"
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
#include "DNA_modifier_types.h"
#include "DNA_object_force.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "DNA_object_types.h"
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
#include "DNA_particle_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "DNA_screen_types.h"
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
#include "DNA_scene_types.h"
#include "DNA_space_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "DNA_texture_types.h"
#include "DNA_userdef_types.h"
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
Fix for undo... it didn't do the UV coords (tface) nor the vertexpaint colors. This because of the pretty weird (ab)use of load & make editmesh... For each added undo step, the load_editmesh was fed with an empty mesh to assign data to, without knowledge of what was in the original mesh. That way UV and color data got lost. Solved it in 2 steps: 1. removing the ->tface pointer from EditVlak, and make TFace a builtin struct inside EditVlak. This didnt cost much extra mem, since it already stored UV and color. This enabled some pretty cleanup in editmesh.c as well, storing tface pointers was cumbersome. 2. for each undo step, it then generates always a tface and mcol block to link to the undo Mesh. Even when it wasn't in the actual Mesh, at exit editmode the original Mesh is used as reference anyway, and undo-meshes are freed correctly. The enormous commit is because I had to change the BLI_editVert.h file, and found it was included in about every file unnecessary. I removed it there. ALso found out that subsurf has code ready (unfinished) to make UV coords for the displaylist in EditMode as well, nice to know for later...
2003-11-19 22:00:14 +00:00
#include "BLI_blenlib.h"
#include "BLI_arithb.h"
#include "BLI_editVert.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_action.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "BKE_armature.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_anim.h"
#include "BKE_constraint.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "BKE_curve.h"
Added custom vertex data support to editmode. Only used for vertex groups now, others can be added later (sticky, shape keys). Beside one small fix for knife exact vertex group interpolation, is intended to work the same as before. Also fixes bug #5200, related to editmode undo and vertex groups. And corrects the editmode to faceselect mode selection conversion, that was broken in a previous commit.
2006-11-11 23:23:15 +00:00
#include "BKE_customdata.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_displist.h"
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
#include "BKE_depsgraph.h"
Complex issue in group duplicators... since they can duplicate entire animation systems, all transforms of all duplicated group members have to be set first, before drawing or converting for render. This because then still deformation can be calculated.
2006-02-28 20:43:21 +00:00
#include "BKE_DerivedMesh.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_global.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "BKE_lattice.h"
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
#include "BKE_library.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_image.h"
#include "BKE_ipo.h"
#include "BKE_key.h"
#include "BKE_main.h"
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
#include "BKE_mesh.h"
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
#include "BKE_modifier.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_object.h"
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
#include "BKE_particle.h"
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
#include "BKE_pointcache.h"
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
#include "BKE_scene.h"
== Sculpt == Fixed bad level calls in sculptmode.
2007-12-26 22:40:56 +00:00
#include "BKE_sculpt.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_texture.h"
#include "BKE_utildefines.h"
- another huge commit! read this! - removed src/buttons.c and include/BIF_buttons.h - added src/buttons.txt, which is the old buttons.c for review and adding code to new panels structure - changed internal events to match new buttonspace structure - added tabs for new shading group of buttons - removed loads of little warnings, -Wall now compiles src/ almost without error (hint: setenv NAN_QUIET to see it all better) Now I'm ready to do actual buttons -> panels conversion. I will do the raw versions first, others then can cleanup
2003-10-07 18:24:02 +00:00
#include "BIF_butspace.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BIF_drawimage.h"
#include "BIF_editgroup.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "BIF_editarmature.h"
Bugfix #2734 Added update of normals and face center after using NKey properties or do-centre option in Mesh EditMode.
2005-06-12 12:44:51 +00:00
#include "BIF_editmesh.h"
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
#include "BIF_editparticle.h"
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_interface.h"
Orange: Warning cleanup for Icons commit, missing declarations of some calls caused icon hashing not to work too. Runs smooth here :)
2005-12-21 23:39:20 +00:00
#include "BIF_interface_icons.h"
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
#include "BIF_mywindow.h"
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
#include "BIF_poseobject.h"
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
#include "BIF_previewrender.h"
== Radial Control == * Generalized the interactive brush property control from sculpt mode into a simple API * Modified sculpt mode to take advantage of this (even fixes some minor bugs!) * Added shortcuts in particle edit to set brush size/strength (FKEY/shift+FKEY) Still todo are the other modes that have brushes...
2008-01-16 07:19:21 +00:00
#include "BIF_radialcontrol.h"
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
#include "BIF_resources.h"
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
#include "BIF_retopo.h"
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
#include "BIF_screen.h"
#include "BIF_space.h"
Initial revision
2002-10-12 11:37:38 +00:00
Huge commit: VERSE - All code is in #ifdef ... #endif - Only make build system is supported and you have to add: export WITH_VERSE=true to user-def.mk file - Blender can share only mesh objects and bitmaps now - More informations can be found at wiki: http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlender http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlenderUserDoc I hope, that I didn't forget at anything
2006-08-20 15:22:56 +00:00
#ifdef WITH_VERSE
#include "BIF_verse.h"
#endif
Initial revision
2002-10-12 11:37:38 +00:00
#include "BDR_drawmesh.h"
#include "BDR_drawobject.h"
Bug #1003 Using Nkey in 3d window, you could create a parent-loop, which hangs Blender. Added here that it checks loops, as for normal CTRL+P parenting.
2004-04-06 19:16:14 +00:00
#include "BDR_editobject.h"
Added colorpicker in Panel for: - Transform properties 3d win, while Vertex/Texture paint is on - Paint panel in UV window Note; both use the same GVP struct to store current color in. Also the function used now to add picker isn't complete... might need further thinking over. Consult me when you like them in more places.
2004-07-10 17:40:40 +00:00
#include "BDR_vpaint.h"
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
#include "BDR_sculptmode.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BSE_drawview.h"
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
#include "BSE_filesel.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BSE_headerbuttons.h"
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
#include "BSE_seqaudio.h"
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
#include "BSE_sequence.h"
Added colorpicker in Panel for: - Transform properties 3d win, while Vertex/Texture paint is on - Paint panel in UV window Note; both use the same GVP struct to store current color in. Also the function used now to add picker isn't complete... might need further thinking over. Consult me when you like them in more places.
2004-07-10 17:40:40 +00:00
#include "BSE_trans_types.h"
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
#include "BSE_time.h"
#include "BSE_view.h"
Initial revision
2002-10-12 11:37:38 +00:00
Added all necessary BPY_extern.h include files to the .c files. Updated the Make environment to point to the correct location. The include paths were still pointing to source/blender/bpython/include while it should be source/blender/python. I did not encounter the build problems because I'm always working with the autoconf build environment.
2003-11-23 14:28:46 +00:00
#include "BPY_extern.h"
Bugfix #3906 Restored animated background picture, using a bad call actually, but thats clearly noted in comments in code. Is remainder work for cleaning up the whole render api. :)
2006-04-09 18:22:05 +00:00
#include "RE_render_ext.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "blendef.h"
#include "mydevice.h"
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
#include "butspace.h" // event codes
Initial revision
2002-10-12 11:37:38 +00:00
Making transform's code more Blenderish with a proper extern include file (BIF_transform.h) and extern function calls (BIF_*). On a side note, Shear was fixed in last commit, just forgot to mention it. It wasn't acting correctly in Edit Mode (and Desoto was poking me about it every sunday).
2005-02-20 01:25:10 +00:00
#include "BIF_transform.h"
Initial new transform commit. Disabled behind defines. Uncomment //#define NEWTRANSFORM in transform.h to enable. Use at your own risk For more info, see Wiki: http://wiki.blender.org/bin/view.pl/Blenderdev/TransformRefactoring And tuhopuu mailing list: http://projects.blender.org/pipermail/tuhopuu-devel/ Notes for Ton (things that could need bulldozing: - TransData conversions. Objects is ok, but others could be rechecked. (some still use totsel). Need to add pose mode support. - Need more icons in the PET mode dropdown (in the 3D view header) for the new modes - Add new transform calls to Toolbox and Menus and the one right after Extrude. That's pretty much all I can think of now.
2005-02-14 02:53:36 +00:00
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
#include "RE_pipeline.h" // make_stars
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
#include "multires.h"
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
/* For MULTISAMPLE_ARB #define.
Note that older systems like irix
may not have this, and will need a #ifdef
to disable it.*/
/* #include "GL/glext.h" Disabled for release, to avoid possibly breaking platforms.
Instead, the define we need will just be #defined if it's not in the platform opengl.h.
*/
Initial revision
2002-10-12 11:37:38 +00:00
/* Modules used */
#include "radio.h"
/* locals */
void drawname(Object *ob);
Restored the pretty lousy but still popular stars render in blender. Hope our sky guru can come with something cooler for next release!
2006-06-13 20:00:14 +00:00
static void star_stuff_init_func(void)
Initial revision
2002-10-12 11:37:38 +00:00
{
cpack(-1);
glPointSize(1.0);
glBegin(GL_POINTS);
}
Restored the pretty lousy but still popular stars render in blender. Hope our sky guru can come with something cooler for next release!
2006-06-13 20:00:14 +00:00
static void star_stuff_vertex_func(float* i)
Initial revision
2002-10-12 11:37:38 +00:00
{
glVertex3fv(i);
}
Restored the pretty lousy but still popular stars render in blender. Hope our sky guru can come with something cooler for next release!
2006-06-13 20:00:14 +00:00
static void star_stuff_term_func(void)
Initial revision
2002-10-12 11:37:38 +00:00
{
glEnd();
}
void default_gl_light(void)
{
int a;
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
/* initialize */
if(U.light[0].flag==0 && U.light[1].flag==0 && U.light[2].flag==0) {
U.light[0].flag= 1;
U.light[0].vec[0]= -0.3; U.light[0].vec[1]= 0.3; U.light[0].vec[2]= 0.9;
U.light[0].col[0]= 0.8; U.light[0].col[1]= 0.8; U.light[0].col[2]= 0.8;
U.light[0].spec[0]= 0.5; U.light[0].spec[1]= 0.5; U.light[0].spec[2]= 0.5;
U.light[0].spec[3]= 1.0;
- restored default one 'solid' light - subsurd level '0' is possible again. however; it was changed to '1' because convert-to-mesh crashes. the subsurf code doesnt give a result when level is '0', causing the convert routines to either crash, or deliver empty mesh... I added a warning in the convert routine now, and dont do anything then. - changed all glFlush() in glFinish() in editobject.c, which seems to be the right magical call to show frontbuffer drawing.
2003-10-26 20:45:52 +00:00
U.light[1].flag= 0;
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
U.light[1].vec[0]= 0.5; U.light[1].vec[1]= 0.5; U.light[1].vec[2]= 0.1;
U.light[1].col[0]= 0.4; U.light[1].col[1]= 0.4; U.light[1].col[2]= 0.8;
U.light[1].spec[0]= 0.3; U.light[1].spec[1]= 0.3; U.light[1].spec[2]= 0.5;
U.light[1].spec[3]= 1.0;
U.light[2].flag= 0;
U.light[2].vec[0]= 0.3; U.light[2].vec[1]= -0.3; U.light[2].vec[2]= -0.2;
U.light[2].col[0]= 0.8; U.light[2].col[1]= 0.5; U.light[2].col[2]= 0.4;
U.light[2].spec[0]= 0.5; U.light[2].spec[1]= 0.4; U.light[2].spec[2]= 0.3;
U.light[2].spec[3]= 1.0;
}
glLightfv(GL_LIGHT0, GL_POSITION, U.light[0].vec);
glLightfv(GL_LIGHT0, GL_DIFFUSE, U.light[0].col);
glLightfv(GL_LIGHT0, GL_SPECULAR, U.light[0].spec);
- fixed bug: 'header select' themecolor had no alpha, causing antialiased lines not drawn (triangles in buttons for example) - correct colors for channels in texture buttons - fixed bug: using proportional editing, the extra wire draw had incorrect matrix - fixed bug: drawing in imagewindow didnt work anymore... was a very old one! the wrong pointer was read, and it accidentally went OK, until now - selecting vertices with multiple 3d wins open works again
2003-10-22 17:34:51 +00:00
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
glLightfv(GL_LIGHT1, GL_POSITION, U.light[1].vec);
glLightfv(GL_LIGHT1, GL_DIFFUSE, U.light[1].col);
glLightfv(GL_LIGHT1, GL_SPECULAR, U.light[1].spec);
Initial revision
2002-10-12 11:37:38 +00:00
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
glLightfv(GL_LIGHT2, GL_POSITION, U.light[2].vec);
glLightfv(GL_LIGHT2, GL_DIFFUSE, U.light[2].col);
glLightfv(GL_LIGHT2, GL_SPECULAR, U.light[2].spec);
- fixed bug: 'header select' themecolor had no alpha, causing antialiased lines not drawn (triangles in buttons for example) - correct colors for channels in texture buttons - fixed bug: using proportional editing, the extra wire draw had incorrect matrix - fixed bug: drawing in imagewindow didnt work anymore... was a very old one! the wrong pointer was read, and it accidentally went OK, until now - selecting vertices with multiple 3d wins open works again
2003-10-22 17:34:51 +00:00
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
for(a=0; a<8; a++) {
if(a<3) {
if(U.light[a].flag) glEnable(GL_LIGHT0+a);
else glDisable(GL_LIGHT0+a);
- fixed an oldie! When using a spotlamp in 'potato' textured drawmode, the normal opengl light didnt work proper anymore.
2003-11-20 17:51:37 +00:00
// clear stuff from other opengl lamp usage
glLightf(GL_LIGHT0+a, GL_SPOT_CUTOFF, 180.0);
glLightf(GL_LIGHT0+a, GL_CONSTANT_ATTENUATION, 1.0);
glLightf(GL_LIGHT0+a, GL_LINEAR_ATTENUATION, 0.0);
New feature! You now can adjust the way the default 'solid opengl' drawing happens. It provides three lights now, all still located around your viewpoint. In the UserSettings menu you can set them on/off, give location and color / specularity. Very nice to enhance modeling in solid drawmode :) By default blender starts with 2 lights on now, but this is something we can define in the default .b.blend later on.
2003-10-25 16:53:50 +00:00
}
else glDisable(GL_LIGHT0+a);
}
Initial revision
2002-10-12 11:37:38 +00:00
glDisable(GL_LIGHTING);
glDisable(GL_COLOR_MATERIAL);
}
Two fixes; - borderselect draws cleaner info in bottom/left corner window - OGL render (in view3d header) option didn't work on successive renders. was due to removing hack that reopened the window each time. But now it needed to be assigned correctly to blender's 'mywindow' system.
2004-09-29 10:49:19 +00:00
/* also called when render 'ogl' */
Initial revision
2002-10-12 11:37:38 +00:00
void init_gl_stuff(void)
{
Default openGL material had a tiny ambient set, causing black to be not black really! :)
2005-10-26 19:00:40 +00:00
float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 };
Initial revision
2002-10-12 11:37:38 +00:00
float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 };
float mat_shininess[] = { 35.0 };
int a, x, y;
GLubyte pat[32*32];
const GLubyte *patc= pat;
Default openGL material had a tiny ambient set, causing black to be not black really! :)
2005-10-26 19:00:40 +00:00
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
Initial revision
2002-10-12 11:37:38 +00:00
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
default_gl_light();
/* no local viewer, looks ugly in ortho mode */
/* glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, &one); */
glDepthFunc(GL_LEQUAL);
/* scaling matrices */
glEnable(GL_NORMALIZE);
glShadeModel(GL_FLAT);
glDisable(GL_ALPHA_TEST);
glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
glDisable(GL_FOG);
glDisable(GL_LIGHTING);
glDisable(GL_LOGIC_OP);
glDisable(GL_STENCIL_TEST);
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
Step one in migrating to use glArray calls in Blender - Curve/Nurbs/Font/MBall now all draw arrays. - had to flip abgr to rgba in shaded drawing - Mesh drawing can't be easily done; the indices for faces are not in in one chunk. Also need a way to gether trias/quads, per material. Speedup results are mixed. Something between 2-4 times. Especially for text it seems to help.
2006-11-20 21:25:02 +00:00
/* default on, disable/enable should be local per function */
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_NORMAL_ARRAY);
Initial revision
2002-10-12 11:37:38 +00:00
glPixelTransferi(GL_MAP_COLOR, GL_FALSE);
glPixelTransferi(GL_RED_SCALE, 1);
glPixelTransferi(GL_RED_BIAS, 0);
glPixelTransferi(GL_GREEN_SCALE, 1);
glPixelTransferi(GL_GREEN_BIAS, 0);
glPixelTransferi(GL_BLUE_SCALE, 1);
glPixelTransferi(GL_BLUE_BIAS, 0);
glPixelTransferi(GL_ALPHA_SCALE, 1);
glPixelTransferi(GL_ALPHA_BIAS, 0);
Zbuf-selection fix: while drawing vertices, it accepted writing in zbuf for it too... giving (sometimes) no selection, and possible for linux the solution too!
2004-09-25 15:15:26 +00:00
Two nice workflow improvements; - Zbuffer clipped selection Based on same algos as for drawing (blender polygon offset) vertices, edges and faces now are clipped for draw and selection when Zbuffer is used. Note that it works for endpoint vertices of edges, and for facecenters. Also works for border and circle-select - Optimal draw subsurfs This now draws optimal with faces and edges selected/unselected, hiding the original 'cage' (mesh) completely. TODO: edge select, which still uses original (invisible) edge. http://www.blender3d.org/cms/Mesh_editing_rewrite.425.0.html
2004-09-25 13:42:31 +00:00
glPixelTransferi(GL_DEPTH_BIAS, 0);
glPixelTransferi(GL_DEPTH_SCALE, 1);
Zbuf-selection fix: while drawing vertices, it accepted writing in zbuf for it too... giving (sometimes) no selection, and possible for linux the solution too!
2004-09-25 15:15:26 +00:00
glDepthRange(0.0, 1.0);
Initial revision
2002-10-12 11:37:38 +00:00
a= 0;
for(x=0; x<32; x++) {
for(y=0; y<4; y++) {
if( (x) & 1) pat[a++]= 0x88;
else pat[a++]= 0x22;
}
}
glPolygonStipple(patc);
init_realtime_GL();
}
void circf(float x, float y, float rad)
{
GLUquadricObj *qobj = gluNewQuadric();
gluQuadricDrawStyle(qobj, GLU_FILL);
glPushMatrix();
glTranslatef(x, y, 0.);
gluDisk( qobj, 0.0, rad, 32, 1);
glPopMatrix();
gluDeleteQuadric(qobj);
}
void circ(float x, float y, float rad)
{
GLUquadricObj *qobj = gluNewQuadric();
gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
glPushMatrix();
glTranslatef(x, y, 0.);
gluDisk( qobj, 0.0, rad, 32, 1);
glPopMatrix();
gluDeleteQuadric(qobj);
}
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* ********** ********** */
Initial revision
2002-10-12 11:37:38 +00:00
static void draw_bgpic(void)
{
BGpic *bgpic;
Image *ima;
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
ImBuf *ibuf= NULL;
- replaced call to project_short_noclip with direct implementation because project_short_noclip doesn't do the calculation if the value would be near-clipped. For background picture we don't care about this.
2005-03-08 18:58:27 +00:00
float vec[4], fac, asp, zoomx, zoomy;
- switch draW_bgpic to calculate window coordinates as floats, smoother zooming of background pic now.
2005-03-08 19:18:40 +00:00
float x1, y1, x2, y2, cx, cy;
Initial revision
2002-10-12 11:37:38 +00:00
bgpic= G.vd->bgpic;
Bugfix #3702 Background image in 3d window didn't react on "reload image" options in UV WIndow or Buttons Window.
2006-04-10 13:27:06 +00:00
if(bgpic==NULL) return;
Initial revision
2002-10-12 11:37:38 +00:00
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
ima= bgpic->ima;
Initial revision
2002-10-12 11:37:38 +00:00
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
if(ima)
ibuf= BKE_image_get_ibuf(ima, &bgpic->iuser);
if(ibuf==NULL || (ibuf->rect==NULL && ibuf->rect_float==NULL) )
return;
if(ibuf->channels!=4)
return;
if(ibuf->rect==NULL)
IMB_rect_from_float(ibuf);
Bugfix #3702 Background image in 3d window didn't react on "reload image" options in UV WIndow or Buttons Window.
2006-04-10 13:27:06 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
if(G.vd->persp==2) {
Bugreport #4787 mentioned subpixel render issues, especially for small images (like used for rendering icons). When working during Orange on new render pipeline, I've left this topic alone for a while... subpixel precision testing is very time consuming and needs concentration for a while. :) This commit brings back precision as it was for 2.41. Below a short explanation of the solved issues. - the window matrix for rendering is kept constant during all OSA passes, this to ensure clipping happens for each pass identically. - a subpixel offset is only applied on filling in the z-buffer - this offset is inverse corrected for shadepixel code, only on 2 places Another nasty issue is that for filtered rendering (gauss etc), the tiles (or entire image) is temporally increased 2 pixel in size. This caused a 'dark' (or sky color) edge on the rendering. During Orange that was solved with a hardcoded clipping offset value, which only corrected for larger pictures (like > 500 pixels in size). Now this clipping offset is correctly calculated, based on render size. Last issue: the view border in 3d window was calculated using integers, giving small errors in display too. Now it uses float, so visually the view border is more close to what a render shows.
2006-08-12 11:27:00 +00:00
rctf vb;
Initial revision
2002-10-12 11:37:38 +00:00
calc_viewborder(G.vd, &vb);
x1= vb.xmin;
y1= vb.ymin;
x2= vb.xmax;
y2= vb.ymax;
}
else {
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
float sco[2];
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* calc window coord */
Initial revision
2002-10-12 11:37:38 +00:00
initgrabz(0.0, 0.0, 0.0);
window_to_3d(vec, 1, 0);
fac= MAX3( fabs(vec[0]), fabs(vec[1]), fabs(vec[1]) );
fac= 1.0/fac;
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
asp= ( (float)ibuf->y)/(float)ibuf->x;
- replaced call to project_short_noclip with direct implementation because project_short_noclip doesn't do the calculation if the value would be near-clipped. For background picture we don't care about this.
2005-03-08 18:58:27 +00:00
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
vec[0] = vec[1] = vec[2] = 0.0;
view3d_project_float(curarea, vec, sco, G.vd->persmat);
cx = sco[0];
cy = sco[1];
Initial revision
2002-10-12 11:37:38 +00:00
x1= cx+ fac*(bgpic->xof-bgpic->size);
y1= cy+ asp*fac*(bgpic->yof-bgpic->size);
x2= cx+ fac*(bgpic->xof+bgpic->size);
y2= cy+ asp*fac*(bgpic->yof+bgpic->size);
}
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* complete clip? */
Initial revision
2002-10-12 11:37:38 +00:00
if(x2 < 0 ) return;
if(y2 < 0 ) return;
if(x1 > curarea->winx ) return;
if(y1 > curarea->winy ) return;
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
zoomx= (x2-x1)/ibuf->x;
zoomy= (y2-y1)/ibuf->y;
/* for some reason; zoomlevels down refuses to use GL_ALPHA_SCALE */
if(zoomx < 1.0f || zoomy < 1.0f) {
float tzoom= MIN2(zoomx, zoomy);
int mip= 0;
if(ibuf->mipmap[0]==NULL)
IMB_makemipmap(ibuf, 0);
while(tzoom < 1.0f && mip<8 && ibuf->mipmap[mip]) {
tzoom*= 2.0f;
zoomx*= 2.0f;
zoomy*= 2.0f;
mip++;
}
if(mip>0)
ibuf= ibuf->mipmap[mip-1];
}
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->zbuf) glDisable(GL_DEPTH_TEST);
Initial revision
2002-10-12 11:37:38 +00:00
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Added push/pop matrix for 3d window + new agl draw pixels
2005-01-07 22:17:56 +00:00
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
glaDefine2DArea(&curarea->winrct);
This is patch [#6772] Background image drawing speedup Thanks goto Matthew Plough (meestaplu) I've tested it on linux with both an nvidia and an ATI card, I've also tested it on a mac and solaris, as well as through a remote display. So I think this one is pretty safe. If it causes problems on older systems we can revert it but I don't think we will have any issues with it. Kent
2007-09-13 14:33:21 +00:00
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
glEnable(GL_BLEND);
This is patch [#6772] Background image drawing speedup Thanks goto Matthew Plough (meestaplu) I've tested it on linux with both an nvidia and an ATI card, I've also tested it on a mac and solaris, as well as through a remote display. So I think this one is pretty safe. If it causes problems on older systems we can revert it but I don't think we will have any issues with it. Kent
2007-09-13 14:33:21 +00:00
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
glPixelZoom(zoomx, zoomy);
This is patch [#6772] Background image drawing speedup Thanks goto Matthew Plough (meestaplu) I've tested it on linux with both an nvidia and an ATI card, I've also tested it on a mac and solaris, as well as through a remote display. So I think this one is pretty safe. If it causes problems on older systems we can revert it but I don't think we will have any issues with it. Kent
2007-09-13 14:33:21 +00:00
glColor4f(1.0, 1.0, 1.0, 1.0-bgpic->blend);
glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
Should have done ages ago! This commit replaces the glDrawPixels and rectwrite_part with the very nice (thanks zr!) glaDrawPixelsSafe() call. Result is: - 3d window background image displays correctly onto the edges when zoomed in extreme - same for UV image window and sequence preview - preview render now doesnt disappear when left part is outside window (zr also deserves kick in butt for not doing this himself in NaN days!) Especially from preview drawing quite some old hacks were deleted. It is even quite some faster. Please notify me when it doesnt work on your card... this now is just 100% according opengl guidelines though :) Also fixes bug #2100
2005-01-07 21:48:25 +00:00
glPixelZoom(1.0, 1.0);
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
- replaced call to project_short_noclip with direct implementation because project_short_noclip doesn't do the calculation if the value would be near-clipped. For background picture we don't care about this.
2005-03-08 18:58:27 +00:00
Added push/pop matrix for 3d window + new agl draw pixels
2005-01-07 22:17:56 +00:00
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
Initial revision
2002-10-12 11:37:38 +00:00
glDisable(GL_BLEND);
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->zbuf) glEnable(GL_DEPTH_TEST);
Bug fix (from own collection) After using clip-safe pixeldraw from glutil.c (preview render, bg picture) the current viewport had to be re-set. Not doing so caused a 1 pixel offset for live updates buttons (on mouse over)
2005-01-30 13:13:31 +00:00
areawinset(curarea->win); // restore viewport / scissor
Initial revision
2002-10-12 11:37:38 +00:00
}
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
static void drawgrid_draw(float wx, float wy, float x, float y, float dx)
{
float fx, fy;
x+= (wx);
y+= (wy);
fx= x/dx;
fx= x-dx*floor(fx);
while(fx< curarea->winx) {
fdrawline(fx, 0.0, fx, (float)curarea->winy);
fx+= dx;
}
fy= y/dx;
fy= y-dx*floor(fy);
while(fy< curarea->winy) {
fdrawline(0.0, fy, (float)curarea->winx, fy);
fy+= dx;
}
}
Initial revision
2002-10-12 11:37:38 +00:00
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
// not intern, called in editobject for constraint axis too
void make_axis_color(char *col, char *col2, char axis)
{
if(axis=='x') {
col2[0]= col[0]>219?255:col[0]+36;
col2[1]= col[1]<26?0:col[1]-26;
col2[2]= col[2]<26?0:col[2]-26;
}
else if(axis=='y') {
col2[0]= col[0]<46?0:col[0]-36;
col2[1]= col[1]>189?255:col[1]+66;
col2[2]= col[2]<46?0:col[2]-36;
}
else {
col2[0]= col[0]<26?0:col[0]-26;
col2[1]= col[1]<26?0:col[1]-26;
col2[2]= col[2]>209?255:col[2]+46;
}
}
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
static void drawgrid(void)
Initial revision
2002-10-12 11:37:38 +00:00
{
/* extern short bgpicmode; */
float wx, wy, x, y, fw, fx, fy, dx;
float vec4[4];
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
char col[3], col2[3];
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
short sublines = G.vd->gridsubdiv;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
vec4[0]=vec4[1]=vec4[2]=0.0;
vec4[3]= 1.0;
Mat4MulVec4fl(G.vd->persmat, vec4);
fx= vec4[0];
fy= vec4[1];
fw= vec4[3];
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
wx= (curarea->winx/2.0); /* because of rounding errors, grid at wrong location */
Initial revision
2002-10-12 11:37:38 +00:00
wy= (curarea->winy/2.0);
x= (wx)*fx/fw;
y= (wy)*fy/fw;
vec4[0]=vec4[1]=G.vd->grid;
vec4[2]= 0.0;
vec4[3]= 1.0;
Mat4MulVec4fl(G.vd->persmat, vec4);
fx= vec4[0];
fy= vec4[1];
fw= vec4[3];
dx= fabs(x-(wx)*fx/fw);
if(dx==0) dx= fabs(y-(wy)*fy/fw);
More fixes in object drawing: - transparent faces in editmode don't write in zbuffer anymore (prevents drawing errors) but still read (so behind the subsurf faces for example) - improved drawing 'handles' for subsurf editing - going in editmode to Solid view, will draw extra wire always, including transparent faces when set - works in all combos... http://www.blender.org/docs/ton/subsurf.html - fixed error; padplus/padminus didnt work in buttonswindow anymore - improved buttonswin: when dragging window edge, the buttons dont rescale, but stay same size
2003-10-22 09:06:30 +00:00
glDepthMask(0); // disable write in zbuffer
New feature, since long on todo; The grid function (transform translate, snap-to) now uses the grid step as displayed in the 3d window, so it depends on how much you zoomed in/out. The threshold for it is a bit tricky... it follows the drawing, but the blending in/out of grid makes it sometimes not obvious. might need slight tweak?
2005-03-23 14:24:43 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
/* check zoom out */
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
persp(PERSP_WIN);
New feature, since long on todo; The grid function (transform translate, snap-to) now uses the grid step as displayed in the 3d window, so it depends on how much you zoomed in/out. The threshold for it is a bit tricky... it follows the drawing, but the blending in/out of grid makes it sometimes not obvious. might need slight tweak?
2005-03-23 14:24:43 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
if(dx<6.0) {
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
G.vd->gridview*= sublines;
dx*= sublines;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(dx<6.0) {
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
G.vd->gridview*= sublines;
dx*= sublines;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
if(dx<6.0) {
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
G.vd->gridview*= sublines;
dx*=sublines;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(dx<6.0);
else {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
}
}
else { // start blending out
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColorBlend(TH_BACK, TH_GRID, dx/60.0);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
drawgrid_draw(wx, wy, x, y, sublines*dx);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
else { // start blending out (6 < dx < 60)
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColorBlend(TH_BACK, TH_GRID, dx/60.0);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
drawgrid_draw(wx, wy, x, y, sublines*dx);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
}
else {
if(dx>60.0) { // start blending in
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
G.vd->gridview/= sublines;
dx/= sublines;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(dx>60.0) { // start blending in
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
G.vd->gridview/= sublines;
dx/= sublines;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(dx>60.0) {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
}
else {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColorBlend(TH_BACK, TH_GRID, dx/60.0);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
drawgrid_draw(wx, wy, x, y, dx*sublines);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
}
else {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColorBlend(TH_BACK, TH_GRID, dx/60.0);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
drawgrid_draw(wx, wy, x, y, dx);
Commit for the 4 aforementioned "features": - "Global Pivot": Maintains a global Pivot and Align mode setting for all 3d views when enabled, instead of seperate settings per 3d view - "Auto Perspective": Switch to ortho mode automatically on 1/3/7, and to Perspective when the view is rotated with the mouse - "Align mode": As suggested on the list, when enabled, transformations on several objects only transform their locations, not their sizes or rotations. - Grid dotted when not 1:1 ***ATTENTION***! The User Interface parts of these features have not been committed, as I work on my own modified UI here. The three features need toggle buttons to turn them on and off. I used the following 3 buttons (first two features are in userprefs, third as a 3d view setting): uiDefButBitS(block, TOG, USER_AUTOPERSP, B_DRAWINFO, "Auto Persp", (xpos+edgespace+(3*medprefbut)+(3*midspace)+smallprefbut+2),y3+10,smallprefbut,buth, &(U.uiflag), 0, 0, 0, 0, "Automatically switch between orthographic and perspective"); uiDefButBitS(block, TOG, USER_LOCKAROUND, B_DRAWINFO, "Global Pivot", (xpos+edgespace+(4*midspace)+(4*medprefbut)),y3+10,smallprefbut,buth, &(U.uiflag), 0, 0, 0, 0, "Use global pivot setting for all 3d views"); uiDefIconButS(block, TOG|BIT|10, B_AROUND, ICON_ALIGN, xco+=XIC,0,XIC,YIC, &G.vd->flag, 0, 0, 0, 0, "Translate only (align)"); Someone needs to add these to the interface in an appropriate manner! Thanks.
2004-07-15 13:31:18 +00:00
BIF_ThemeColor(TH_GRID);
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
drawgrid_draw(wx, wy, x, y, dx*sublines);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
}
else {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColorBlend(TH_BACK, TH_GRID, dx/60.0);
Uncommited dashed lines to indicated 1x1 zoom. While it did look nice and useful, it caused some rather nasty slowdown on some 3D cards. It was decided to push the feature as well as further discussions on it (zooming indicator in corner or others means of showing zoom level) for after 2.34.
2004-07-27 23:24:56 +00:00
drawgrid_draw(wx, wy, x, y, dx);
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_GRID);
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
drawgrid_draw(wx, wy, x, y, dx*sublines);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
x+= (wx);
y+= (wy);
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_GetThemeColor3ubv(TH_GRID, col);
Oops. Forgot to restore setlinestyle(0); after drawing the dotted grid.
2004-07-15 16:40:01 +00:00
setlinestyle(0);
Initial revision
2002-10-12 11:37:38 +00:00
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* center cross */
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
if(G.vd->view==3) make_axis_color(col, col2, 'y');
else make_axis_color(col, col2, 'x');
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
glColor3ubv((GLubyte *)col2);
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
fdrawline(0.0, y, (float)curarea->winx, y);
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
if(G.vd->view==7) make_axis_color(col, col2, 'y');
else make_axis_color(col, col2, 'z');
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
glColor3ubv((GLubyte *)col2);
Initial revision
2002-10-12 11:37:38 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
fdrawline(x, 0.0, x, (float)curarea->winy);
Initial revision
2002-10-12 11:37:38 +00:00
More fixes in object drawing: - transparent faces in editmode don't write in zbuffer anymore (prevents drawing errors) but still read (so behind the subsurf faces for example) - improved drawing 'handles' for subsurf editing - going in editmode to Solid view, will draw extra wire always, including transparent faces when set - works in all combos... http://www.blender.org/docs/ton/subsurf.html - fixed error; padplus/padminus didnt work in buttonswindow anymore - improved buttonswin: when dragging window edge, the buttons dont rescale, but stay same size
2003-10-22 09:06:30 +00:00
glDepthMask(1); // enable write in zbuffer
- fixed editing vertices again! I had to clean up very old calls to switch matrices for 3d windows. To make it more clear, I've introduced defines for the infamous persp() function: persp(PERSP_WIN); sets matrices at pixel level window persp(PERSP_VIEW); restores matrices back to 3d drawing persp(PERSP_STORE); only called once, to store correct matrices I will now check on frontbuffer drawing of vertices... it's very doubtful if it's used still correctly, was only meant for visual speed in the early nineties you know. :)
2003-10-16 09:39:19 +00:00
persp(PERSP_VIEW);
Initial revision
2002-10-12 11:37:38 +00:00
}
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
static void drawfloor(void)
Initial revision
2002-10-12 11:37:38 +00:00
{
View3D *vd;
float vert[3], grid;
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
int a, gridlines, emphasise;
Cleaned up new constraint line drawing while grab/rot/scale - uses callback mechanism to tell main drawing routine what to do - for that reason it doesn't use frontbuffer drawing anymore and it shows up in all 3d windows as well - it uses the same colors as for the grid axes (I tweaked it a bit, this is based at themecolors, and also should work in different background and grid color) - I disabled drawing lines through every object or every vertex. The current display method is clear and not distracting - when in 'local' transform (double press X/Y/Z), it displays a nice axis in the center of transform for vertices. In object-mode, local transform differs per object, so constraint lines and axes are drawn for each individually... Also: - fixed an old bug in rotate transform(). Using a constraint for rotation (X, Y, Z) didn't work for multiple objects at all!
2003-10-23 16:15:05 +00:00
char col[3], col2[3];
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
short draw_line = 0;
Initial revision
2002-10-12 11:37:38 +00:00
vd= curarea->spacedata.first;
vert[2]= 0.0;
if(vd->gridlines<3) return;
Two small fixes for previous commit; - new zbuf-clipped select was always on - drawing the 'floor' now doesnt write in zbuffer when in editmode
2004-09-25 14:21:09 +00:00
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->zbuf && G.obedit) glDepthMask(0); // for zbuffer-select
Two small fixes for previous commit; - new zbuf-clipped select was always on - drawing the 'floor' now doesnt write in zbuffer when in editmode
2004-09-25 14:21:09 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
gridlines= vd->gridlines/2;
grid= gridlines*vd->grid;
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_GetThemeColor3ubv(TH_GRID, col);
*Bugfix - uninitialized variable used during division.
2006-06-07 15:01:40 +00:00
BIF_GetThemeColor3ubv(TH_BACK, col2);
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
/* emphasise division lines lighter instead of darker, if background is darker than grid */
* Fix for my commit a while ago to correct the grid floor highting for darker backgrounds, some of the logic was bakwards.
2006-06-25 06:00:22 +00:00
if ( ((col[0]+col[1]+col[2])/3+10) > (col2[0]+col2[1]+col2[2])/3 )
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
emphasise = 20;
* Fix for my commit a while ago to correct the grid floor highting for darker backgrounds, some of the logic was bakwards.
2006-06-25 06:00:22 +00:00
else
emphasise = -10;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
/* draw the Y axis and/or grid lines */
Initial revision
2002-10-12 11:37:38 +00:00
for(a= -gridlines;a<=gridlines;a++) {
if(a==0) {
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
/* check for the 'show Y axis' preference */
if (vd->gridflag & V3D_SHOW_Y) {
make_axis_color(col, col2, 'y');
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
glColor3ubv((GLubyte *)col2);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
draw_line = 1;
} else if (vd->gridflag & V3D_SHOW_FLOOR) {
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
BIF_ThemeColorShade(TH_GRID, emphasise);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
} else {
draw_line = 0;
}
} else {
/* check for the 'show grid floor' preference */
if (vd->gridflag & V3D_SHOW_FLOOR) {
if( (a % 10)==0) {
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
BIF_ThemeColorShade(TH_GRID, emphasise);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
}
else BIF_ThemeColorShade(TH_GRID, 10);
draw_line = 1;
} else {
draw_line = 0;
}
Initial revision
2002-10-12 11:37:38 +00:00
}
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
if (draw_line) {
glBegin(GL_LINE_STRIP);
vert[0]= a*vd->grid;
vert[1]= grid;
glVertex3fv(vert);
vert[1]= -grid;
glVertex3fv(vert);
glEnd();
}
Initial revision
2002-10-12 11:37:38 +00:00
}
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
/* draw the X axis and/or grid lines */
Initial revision
2002-10-12 11:37:38 +00:00
for(a= -gridlines;a<=gridlines;a++) {
if(a==0) {
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
/* check for the 'show X axis' preference */
if (vd->gridflag & V3D_SHOW_X) {
make_axis_color(col, col2, 'x');
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
glColor3ubv((GLubyte *)col2);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
draw_line = 1;
} else if (vd->gridflag & V3D_SHOW_FLOOR) {
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
BIF_ThemeColorShade(TH_GRID, emphasise);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
} else {
draw_line = 0;
}
} else {
/* check for the 'show grid floor' preference */
if (vd->gridflag & V3D_SHOW_FLOOR) {
if( (a % 10)==0) {
* Made the emphasis on every 10th 3D View grid line brighten instead of darken, if the grid colour is brigher than the background colour (so it increases contrast in all situations)
2006-06-05 02:17:24 +00:00
BIF_ThemeColorShade(TH_GRID, emphasise);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
}
else BIF_ThemeColorShade(TH_GRID, 10);
draw_line = 1;
} else {
draw_line = 0;
}
Initial revision
2002-10-12 11:37:38 +00:00
}
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
if (draw_line) {
glBegin(GL_LINE_STRIP);
vert[1]= a*vd->grid;
vert[0]= grid;
glVertex3fv(vert );
vert[0]= -grid;
glVertex3fv(vert);
glEnd();
Initial revision
2002-10-12 11:37:38 +00:00
}
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
/* draw the Z axis line */
/* check for the 'show Z axis' preference */
if (vd->gridflag & V3D_SHOW_Z) {
make_axis_color(col, col2, 'z');
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
glColor3ubv((GLubyte *)col2);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
glBegin(GL_LINE_STRIP);
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
vert[0]= 0;
vert[1]= 0;
vert[2]= grid;
glVertex3fv(vert );
vert[2]= -grid;
glVertex3fv(vert);
Initial revision
2002-10-12 11:37:38 +00:00
glEnd();
}
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->zbuf && G.obedit) glDepthMask(1);
Two small fixes for previous commit; - new zbuf-clipped select was always on - drawing the 'floor' now doesnt write in zbuffer when in editmode
2004-09-25 14:21:09 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
}
Bug report #3092 Excluded the 3D cursor from being clipped with the new ALT+B clipping. Also added a refresh for the object that gets (Pkey) separated in mesh editmode, might solve issue reported by Campbell.
2005-09-23 07:28:15 +00:00
static void drawcursor(View3D *v3d)
Initial revision
2002-10-12 11:37:38 +00:00
{
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
short mx,my,co[2];
Bug report #3092 Excluded the 3D cursor from being clipped with the new ALT+B clipping. Also added a refresh for the object that gets (Pkey) separated in mesh editmode, might solve issue reported by Campbell.
2005-09-23 07:28:15 +00:00
int flag;
Initial revision
2002-10-12 11:37:38 +00:00
Bug report #3092 Excluded the 3D cursor from being clipped with the new ALT+B clipping. Also added a refresh for the object that gets (Pkey) separated in mesh editmode, might solve issue reported by Campbell.
2005-09-23 07:28:15 +00:00
/* we dont want the clipping for cursor */
flag= v3d->flag;
v3d->flag= 0;
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
project_short( give_cursor(), co);
Bug report #3092 Excluded the 3D cursor from being clipped with the new ALT+B clipping. Also added a refresh for the object that gets (Pkey) separated in mesh editmode, might solve issue reported by Campbell.
2005-09-23 07:28:15 +00:00
v3d->flag= flag;
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
mx = co[0];
my = co[1];
Initial revision
2002-10-12 11:37:38 +00:00
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(mx!=IS_CLIPPED) {
Initial revision
2002-10-12 11:37:38 +00:00
setlinestyle(0);
cpack(0xFF);
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
circ((float)mx, (float)my, 10.0);
Initial revision
2002-10-12 11:37:38 +00:00
setlinestyle(4);
cpack(0xFFFFFF);
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
circ((float)mx, (float)my, 10.0);
Initial revision
2002-10-12 11:37:38 +00:00
setlinestyle(0);
cpack(0x0);
- added view3d_get_object_project_mat function, returns mat to project object cos into screenspace without mucking with gl matrices. - added view3d_project_ functions, take arguments instead of using globals - removed View3D.{mx,my,mxo,myo} - switch drawobject foreachScreenVert functions to use new projection functions - switch edge slide to use new projection functions, fixes erratic behavior (project was using wrong mat I believe) - bug fix in edgeslide, nearest edge to start was one-off
2005-08-15 04:10:02 +00:00
sdrawline(mx-20, my, mx-5, my);
sdrawline(mx+5, my, mx+20, my);
sdrawline(mx, my-20, mx, my-5);
sdrawline(mx, my+5, mx, my+20);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
/* ********* custom clipping *********** */
static void view3d_draw_clipping(View3D *v3d)
{
BoundBox *bb= v3d->clipbb;
BIF_ThemeColorShade(TH_BACK, -8);
glBegin(GL_QUADS);
glVertex3fv(bb->vec[0]); glVertex3fv(bb->vec[1]); glVertex3fv(bb->vec[2]); glVertex3fv(bb->vec[3]);
glVertex3fv(bb->vec[0]); glVertex3fv(bb->vec[4]); glVertex3fv(bb->vec[5]); glVertex3fv(bb->vec[1]);
glVertex3fv(bb->vec[4]); glVertex3fv(bb->vec[7]); glVertex3fv(bb->vec[6]); glVertex3fv(bb->vec[5]);
glVertex3fv(bb->vec[7]); glVertex3fv(bb->vec[3]); glVertex3fv(bb->vec[2]); glVertex3fv(bb->vec[6]);
glVertex3fv(bb->vec[1]); glVertex3fv(bb->vec[5]); glVertex3fv(bb->vec[6]); glVertex3fv(bb->vec[2]);
glVertex3fv(bb->vec[7]); glVertex3fv(bb->vec[4]); glVertex3fv(bb->vec[0]); glVertex3fv(bb->vec[3]);
glEnd();
}
void view3d_set_clipping(View3D *v3d)
{
double plane[4];
int a;
Left in a testing value for clipping... tsk! Did only three planes :)
2005-08-20 19:45:34 +00:00
for(a=0; a<4; a++) {
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
QUATCOPY(plane, v3d->clip[a]);
glClipPlane(GL_CLIP_PLANE0+a, plane);
glEnable(GL_CLIP_PLANE0+a);
}
}
void view3d_clr_clipping(void)
{
int a;
for(a=0; a<4; a++) {
glDisable(GL_CLIP_PLANE0+a);
}
}
int view3d_test_clipping(View3D *v3d, float *vec)
{
/* vec in world coordinates, returns 1 if clipped */
float view[3];
VECCOPY(view, vec);
if(0.0f < v3d->clip[0][3] + INPR(view, v3d->clip[0]))
if(0.0f < v3d->clip[1][3] + INPR(view, v3d->clip[1]))
if(0.0f < v3d->clip[2][3] + INPR(view, v3d->clip[2]))
if(0.0f < v3d->clip[3][3] + INPR(view, v3d->clip[3]))
return 0;
return 1;
}
/* ********* end custom clipping *********** */
Initial revision
2002-10-12 11:37:38 +00:00
static void view3d_get_viewborder_size(View3D *v3d, float size_r[2])
{
float winmax= MAX2(v3d->area->winx, v3d->area->winy);
float aspect= (float) (G.scene->r.xsch*G.scene->r.xasp)/(G.scene->r.ysch*G.scene->r.yasp);
if(aspect>1.0) {
size_r[0]= winmax;
size_r[1]= winmax/aspect;
} else {
size_r[0]= winmax*aspect;
size_r[1]= winmax;
}
}
Bugreport #4787 mentioned subpixel render issues, especially for small images (like used for rendering icons). When working during Orange on new render pipeline, I've left this topic alone for a while... subpixel precision testing is very time consuming and needs concentration for a while. :) This commit brings back precision as it was for 2.41. Below a short explanation of the solved issues. - the window matrix for rendering is kept constant during all OSA passes, this to ensure clipping happens for each pass identically. - a subpixel offset is only applied on filling in the z-buffer - this offset is inverse corrected for shadepixel code, only on 2 places Another nasty issue is that for filtered rendering (gauss etc), the tiles (or entire image) is temporally increased 2 pixel in size. This caused a 'dark' (or sky color) edge on the rendering. During Orange that was solved with a hardcoded clipping offset value, which only corrected for larger pictures (like > 500 pixels in size). Now this clipping offset is correctly calculated, based on render size. Last issue: the view border in 3d window was calculated using integers, giving small errors in display too. Now it uses float, so visually the view border is more close to what a render shows.
2006-08-12 11:27:00 +00:00
void calc_viewborder(struct View3D *v3d, rctf *viewborder_r)
Initial revision
2002-10-12 11:37:38 +00:00
{
float zoomfac, size[2];
Orange: Hold SHIFT+MMB in camera view shifts the viewports around.
2006-01-04 21:16:09 +00:00
float dx= 0.0f, dy= 0.0f;
Initial revision
2002-10-12 11:37:38 +00:00
view3d_get_viewborder_size(v3d, size);
/* magic zoom calculation, no idea what
* it signifies, if you find out, tell me! -zr
*/
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* simple, its magic dude!
* well, to be honest, this gives a natural feeling zooming
* with multiple keypad presses (ton)
*/
Initial revision
2002-10-12 11:37:38 +00:00
zoomfac= (M_SQRT2 + v3d->camzoom/50.0);
zoomfac= (zoomfac*zoomfac)*0.25;
size[0]= size[0]*zoomfac;
size[1]= size[1]*zoomfac;
/* center in window */
viewborder_r->xmin= 0.5*v3d->area->winx - 0.5*size[0];
viewborder_r->ymin= 0.5*v3d->area->winy - 0.5*size[1];
viewborder_r->xmax= viewborder_r->xmin + size[0];
viewborder_r->ymax= viewborder_r->ymin + size[1];
Orange: Hold SHIFT+MMB in camera view shifts the viewports around.
2006-01-04 21:16:09 +00:00
Bugfix #5100 The camera view shift didn't allow to view the entire image when zoomed in. Added a correction for zoomfactor.
2006-11-03 16:37:27 +00:00
dx= v3d->area->winx*G.vd->camdx*zoomfac*2.0f;
dy= v3d->area->winy*G.vd->camdy*zoomfac*2.0f;
Orange: Hold SHIFT+MMB in camera view shifts the viewports around.
2006-01-04 21:16:09 +00:00
/* apply offset */
viewborder_r->xmin-= dx;
viewborder_r->ymin-= dy;
viewborder_r->xmax-= dx;
viewborder_r->ymax-= dy;
Patch #4940, by Wybren van Keulen The 2-point perspecitve Architecture Camera! http://www.funnyfarm.tv/patch_lens_shift/patch_lens_shift.mov Full log: https://projects.blender.org/tracker/index.php?func=detail&aid=4940&group_id=9&atid=127
2006-11-06 15:42:38 +00:00
if(v3d->camera && v3d->camera->type==OB_CAMERA) {
Camera *cam= v3d->camera->data;
float w = viewborder_r->xmax - viewborder_r->xmin;
float h = viewborder_r->ymax - viewborder_r->ymin;
float side = MAX2(w, h);
viewborder_r->xmin+= cam->shiftx*side;
viewborder_r->xmax+= cam->shiftx*side;
viewborder_r->ymin+= cam->shifty*side;
viewborder_r->ymax+= cam->shifty*side;
}
Initial revision
2002-10-12 11:37:38 +00:00
}
void view3d_set_1_to_1_viewborder(View3D *v3d)
{
float size[2];
int im_width= (G.scene->r.size*G.scene->r.xsch)/100;
view3d_get_viewborder_size(v3d, size);
v3d->camzoom= (sqrt(4.0*im_width/size[0]) - M_SQRT2)*50.0;
v3d->camzoom= CLAMPIS(v3d->camzoom, -30, 300);
}
Replaced old fly mode for a fly mode that works in all 3 view types - ortho, perspective and camera (cheating, but its still usefull) This one uses the 3d perspective view rather then the camera, and is nicer and easier to control then the old fly mode. it also gives some help in the header. Shift+F to try it.
2006-06-08 18:10:41 +00:00
static void drawviewborder_flymode(void)
{
/* draws 4 edge brackets that frame the safe area where the
mouse can move during fly mode without spinning the view */
float x1, x2, y1, y2;
x1= 0.45*(float)curarea->winx;
y1= 0.45*(float)curarea->winy;
x2= 0.55*(float)curarea->winx;
y2= 0.55*(float)curarea->winy;
cpack(0);
glBegin(GL_LINES);
/* bottom left */
glVertex2f(x1,y1);
glVertex2f(x1,y1+5);
glVertex2f(x1,y1);
glVertex2f(x1+5,y1);
/* top right */
glVertex2f(x2,y2);
glVertex2f(x2,y2-5);
glVertex2f(x2,y2);
glVertex2f(x2-5,y2);
/* top left */
glVertex2f(x1,y2);
glVertex2f(x1,y2-5);
glVertex2f(x1,y2);
glVertex2f(x1+5,y2);
/* bottom right */
glVertex2f(x2,y1);
glVertex2f(x2,y1+5);
glVertex2f(x2,y1);
glVertex2f(x2-5,y1);
glEnd();
}
Initial revision
2002-10-12 11:37:38 +00:00
static void drawviewborder(void)
{
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad); // interface_panel.c
Initial revision
2002-10-12 11:37:38 +00:00
float fac, a;
float x1, x2, y1, y2;
float x3, y3, x4, y4;
Bugreport #4787 mentioned subpixel render issues, especially for small images (like used for rendering icons). When working during Orange on new render pipeline, I've left this topic alone for a while... subpixel precision testing is very time consuming and needs concentration for a while. :) This commit brings back precision as it was for 2.41. Below a short explanation of the solved issues. - the window matrix for rendering is kept constant during all OSA passes, this to ensure clipping happens for each pass identically. - a subpixel offset is only applied on filling in the z-buffer - this offset is inverse corrected for shadepixel code, only on 2 places Another nasty issue is that for filtered rendering (gauss etc), the tiles (or entire image) is temporally increased 2 pixel in size. This caused a 'dark' (or sky color) edge on the rendering. During Orange that was solved with a hardcoded clipping offset value, which only corrected for larger pictures (like > 500 pixels in size). Now this clipping offset is correctly calculated, based on render size. Last issue: the view border in 3d window was calculated using integers, giving small errors in display too. Now it uses float, so visually the view border is more close to what a render shows.
2006-08-12 11:27:00 +00:00
rctf viewborder;
Crasher bug from andy: loading a file with "No UI" crashes when that file has no camera, and current project has camera view. Found out the new camera decoration code needs prevention from reading data from non-camera objects too.
2005-11-22 16:14:07 +00:00
Camera *ca= NULL;
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
Crasher bug from andy: loading a file with "No UI" crashes when that file has no camera, and current project has camera view. Found out the new camera decoration code needs prevention from reading data from non-camera objects too.
2005-11-22 16:14:07 +00:00
if(G.vd->camera==NULL)
return;
if(G.vd->camera->type==OB_CAMERA)
ca = G.vd->camera->data;
Version 1.0 of the new Outliner The outliner is a hierarchical diagram displaying a list of data in Blender and its dependencies. The 'databrowse' doesn't really show it, and Oops is too chaotic still. And most of all, the former two don't offer much tools. After discussions on irc, Matt came with this design proposal; http://mke3.net/blender/interface/layout/outliner/ Which is closely followed for the implementation. The current version only shows all 'library data' in Blender (objects, meshes, ipos, etc) and not the 'direct data' such as vertex groups or NLA. I decided to make it inside the Oopw window, as an option. You can find the option in the "View" pulldown, or directly invoke it with ALT+SHIFT+F9 Here's a quick overview of the Outliner GUI: - Header pulldown has options what it can show (Visible = in current layers) - click on triangle arrow to open/close - press AKEY to open/close all - Leftmouse click on an item activates; and does based on type a couple of extra things: - activates a scene - selects/activates the Object - enters editmode (if clicked on Mesh, Curve, etc) - shows the appropriate Shading buttons (Lamp, Material, Texture) - sets the IpoWindow to the current IPO - activates the Ipo-channel in an Action - Selected and Active objects are drawn in its Theme selection color - SHIFT+click on Object does extend-select - Press DOTkey to get the current active data in center of view TODO; - rightmouse selection; for indicating operations like delete or duplicate - showing more data types - icon (re)design... - lotsof options as described in Matts paper still...
2004-10-06 18:55:00 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
calc_viewborder(G.vd, &viewborder);
x1= viewborder.xmin;
y1= viewborder.ymin;
x2= viewborder.xmax;
y2= viewborder.ymax;
Added a slider to control camera passepartout darkness in camera edit buttons.
2005-11-16 16:03:01 +00:00
/* passepartout, specified in camera edit buttons */
drawview.c - Passepartout, only do GL alpha when not 1.0 alpha buttons_editing.c - negative camera lense was possible with (Deg) button enabled export_cal3d.c - minor changes object_batch_name_edit.py - check for data and object libdata before renaming.
2007-04-26 19:05:22 +00:00
if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT) && ca->passepartalpha > 0.000001) {
if (ca->passepartalpha == 1.0) {
glColor3f(0, 0, 0);
} else {
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glEnable(GL_BLEND);
glColor4f(0, 0, 0, ca->passepartalpha);
}
Orange; last commit didnt draw passepartout correctly. Also added a limit, so you cannot screw up the entire view :)
2006-01-04 21:29:32 +00:00
if (x1 > 0.0)
Last fix for previous commit; New option "passepartout" for drawing a darkened area around viewborder in Camera view. Provided by Wybren van Keulen. Added button in F10 buttons, just above "DispView". Would like feedback if this is a temporal or real feature :)
2004-10-06 19:21:57 +00:00
glRectf(0.0, (float)curarea->winy, x1, 0.0);
Orange; last commit didnt draw passepartout correctly. Also added a limit, so you cannot screw up the entire view :)
2006-01-04 21:29:32 +00:00
if (x2 < (float)curarea->winx)
Last fix for previous commit; New option "passepartout" for drawing a darkened area around viewborder in Camera view. Provided by Wybren van Keulen. Added button in F10 buttons, just above "DispView". Would like feedback if this is a temporal or real feature :)
2004-10-06 19:21:57 +00:00
glRectf(x2, (float)curarea->winy, (float)curarea->winx, 0.0);
Orange; last commit didnt draw passepartout correctly. Also added a limit, so you cannot screw up the entire view :)
2006-01-04 21:29:32 +00:00
if (y2 < (float)curarea->winy)
Last fix for previous commit; New option "passepartout" for drawing a darkened area around viewborder in Camera view. Provided by Wybren van Keulen. Added button in F10 buttons, just above "DispView". Would like feedback if this is a temporal or real feature :)
2004-10-06 19:21:57 +00:00
glRectf(x1, (float)curarea->winy, x2, y2);
Orange; last commit didnt draw passepartout correctly. Also added a limit, so you cannot screw up the entire view :)
2006-01-04 21:29:32 +00:00
if (y2 > 0.0)
Last fix for previous commit; New option "passepartout" for drawing a darkened area around viewborder in Camera view. Provided by Wybren van Keulen. Added button in F10 buttons, just above "DispView". Would like feedback if this is a temporal or real feature :)
2004-10-06 19:21:57 +00:00
glRectf(x1, y1, x2, 0.0);
Orange; last commit didnt draw passepartout correctly. Also added a limit, so you cannot screw up the entire view :)
2006-01-04 21:29:32 +00:00
Last fix for previous commit; New option "passepartout" for drawing a darkened area around viewborder in Camera view. Provided by Wybren van Keulen. Added button in F10 buttons, just above "DispView". Would like feedback if this is a temporal or real feature :)
2004-10-06 19:21:57 +00:00
glDisable(GL_BLEND);
Version 1.0 of the new Outliner The outliner is a hierarchical diagram displaying a list of data in Blender and its dependencies. The 'databrowse' doesn't really show it, and Oops is too chaotic still. And most of all, the former two don't offer much tools. After discussions on irc, Matt came with this design proposal; http://mke3.net/blender/interface/layout/outliner/ Which is closely followed for the implementation. The current version only shows all 'library data' in Blender (objects, meshes, ipos, etc) and not the 'direct data' such as vertex groups or NLA. I decided to make it inside the Oopw window, as an option. You can find the option in the "View" pulldown, or directly invoke it with ALT+SHIFT+F9 Here's a quick overview of the Outliner GUI: - Header pulldown has options what it can show (Visible = in current layers) - click on triangle arrow to open/close - press AKEY to open/close all - Leftmouse click on an item activates; and does based on type a couple of extra things: - activates a scene - selects/activates the Object - enters editmode (if clicked on Mesh, Curve, etc) - shows the appropriate Shading buttons (Lamp, Material, Texture) - sets the IpoWindow to the current IPO - activates the Ipo-channel in an Action - Selected and Active objects are drawn in its Theme selection color - SHIFT+click on Object does extend-select - Press DOTkey to get the current active data in center of view TODO; - rightmouse selection; for indicating operations like delete or duplicate - showing more data types - icon (re)design... - lotsof options as described in Matts paper still...
2004-10-06 18:55:00 +00:00
}
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* edge */
Initial revision
2002-10-12 11:37:38 +00:00
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
setlinestyle(0);
BIF_ThemeColor(TH_BACK);
glRectf(x1, y1, x2, y2);
setlinestyle(3);
BIF_ThemeColor(TH_WIRE);
glRectf(x1, y1, x2, y2);
New stuff & fixes in Blender OSA filtering. While investigating alternative filters (Mitchell), I found two small errors in the Gauss code, it clipped wrong and multiplied wrong, causing settings other than filter size 1.0 to not work properly. Took the last-minute liberty to add more filter types in Blender too. Also wrote an extensive log about how sampling & filtering in Blender works. http://www.blender3d.org/cms/Samples_and_Filtering.723.0.html
2005-11-23 15:20:45 +00:00
Image Stamping patch by Diego (and peach request)- stamps image info into metadata and optionally draws into the frame. This patch includes some changes I made... * use blenders bitmap fonts (rather then own fonts) * select font size * user interface layout changes * Marker as another image stamp option Also added some new API calls BMF_GetFontHeight(font); BMF_DrawStringBuf(...); - so we can draw text into an imbuf's image buffer. get_frame_marker(frame) - get the last marker from the frame. IMB_rectfill_area(...) - fill in an image buffer with a rectangle area of color. TODO - draw stamp info in 3d view, at the moment it just displays in the animation.
2007-10-20 16:17:27 +00:00
/* camera name - draw in highlighted text color */
Crasher bug from andy: loading a file with "No UI" crashes when that file has no camera, and current project has camera view. Found out the new camera decoration code needs prevention from reading data from non-camera objects too.
2005-11-22 16:14:07 +00:00
if (ca && (ca->flag & CAM_SHOWNAME)) {
Bugfix #6915: Passepartout function hides camera name (show name). Now it uses the Text-Highlighted theme colour instead.
2007-07-15 04:35:56 +00:00
BIF_ThemeColor(TH_TEXT_HI);
Small fix: need set the color before call glRasterPos or don't work.
2007-07-16 19:04:42 +00:00
glRasterPos2f(x1, y1-15);
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
Fix: the 'draw name in camera view' now draws the view's active camera's name rather than the scene's, so it's not misleading when you have unlocked 3D views. (#3324)
2005-11-01 18:39:54 +00:00
BMF_DrawString(G.font, G.vd->camera->id.name+2);
Bugfix #6915: Passepartout function hides camera name (show name). Now it uses the Text-Highlighted theme colour instead.
2007-07-15 04:35:56 +00:00
BIF_ThemeColor(TH_WIRE);
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
/* border */
if(G.scene->r.mode & R_BORDER) {
cpack(0);
x3= x1+ G.scene->r.border.xmin*(x2-x1);
y3= y1+ G.scene->r.border.ymin*(y2-y1);
x4= x1+ G.scene->r.border.xmax*(x2-x1);
y4= y1+ G.scene->r.border.ymax*(y2-y1);
cpack(0x4040FF);
glRectf(x3, y3, x4, y4);
}
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* safety border */
Crasher bug from andy: loading a file with "No UI" crashes when that file has no camera, and current project has camera view. Found out the new camera decoration code needs prevention from reading data from non-camera objects too.
2005-11-22 16:14:07 +00:00
if (ca && (ca->flag & CAM_SHOWTITLESAFE)) {
Camera visualisation changes and features (from tuho) * Made the in-camera view dashed border lines less jarring and disturbing. We will give it some testing here, feedback is welcome. * Showing the title safe zone is now an option in the camera edit buttons. It's not very useful if you're not making stuff for video/broadcast so you can turn it off. * Passepartout is now a flag per camera, rather than per scene. It never really belonged in the render buttons or as Scene data, though it could be up for debate whether it's better as camera data or view data (i.e. in the view properties panel). Old files get converted over nicely with this so if you had passepartout on before, it stays on the cameras. * Added an option to show the current camera's name at the bottom of the in-camera view, to help keep track of which one you're seeing when using multiple cameras. * In the 3D View (non-camera view) the active camera is drawn with a solid line as before, while non-active cameras are drawn with a dashed line, to help visualise which one is active.
2005-10-27 11:28:43 +00:00
fac= 0.1;
a= fac*(x2-x1);
x1+= a;
x2-= a;
a= fac*(y2-y1);
y1+= a;
y2-= a;
BIF_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
uiSetRoundBox(15);
gl_round_box(GL_LINE_LOOP, x1, y1, x2, y2, 12.0);
}
Initial revision
2002-10-12 11:37:38 +00:00
setlinestyle(0);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
void backdrawview3d(int test)
{
struct Base *base;
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
/*for 2.43 release, don't use glext and just define the constant.
this to avoid possibly breaking platforms before release.*/
#ifndef GL_MULTISAMPLE_ARB
#define GL_MULTISAMPLE_ARB 0x809D
#endif
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
#ifdef GL_MULTISAMPLE_ARB
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
int m;
#endif
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
Changes to "Face Select" mode * Does not indicate that UV's exist, nor does it add UV's when used. * Only accessible for texturepaint, vertexpaint and weightpaint from a button in the header (Paint Selection Mask) * Not accessible from the mode menu, this is only an option that applies to paint modes. This dosnt effect DNA, face select (G_FACESELECT) can be enabled at any time but is only used when paint modes are enabled. Other changes * UKey is uv unwrap in editmode, Ukey for undo was editmode only anyway. * UVCalc in editmode adds a UV Layer if there is not one alredy. * texture draw in editmode does not draw the face dots (they are get in the way of texturing) * some missing updates were added. * removed manipulator from when paint modes are enabled since the manipulator is not drawn in the 3d view.
2007-09-10 19:32:44 +00:00
if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT);
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
else if(G.obedit && G.vd->drawtype>OB_WIRE && (G.vd->flag & V3D_ZBUF_SELECT));
Initial revision
2002-10-12 11:37:38 +00:00
else {
G.vd->flag &= ~V3D_NEEDBACKBUFDRAW;
return;
}
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
if( !(G.vd->flag & V3D_NEEDBACKBUFDRAW) ) return;
Initial revision
2002-10-12 11:37:38 +00:00
if(test) {
if(qtest()) {
addafterqueue(curarea->win, BACKBUFDRAW, 1);
return;
}
}
fixed bugs: - faceselect mode works again - selecting vertices for lattices, surfaces and curves works again - in previewrender sometimes a square was drawn, which was texture-crop
2003-10-21 12:23:38 +00:00
persp(PERSP_VIEW);
AFAIK... last issue with new Z-culling selection. Since the new menu system draws in backbuffer, the selectionbuffer then needs a refresh after. Solved by nicely signalling stuff.
2004-10-30 17:13:10 +00:00
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
/*Disable FSAA for backbuffer selection.
Only works if GL_MULTISAMPLE_ARB is defined by the header
file, which is should be for every OS that supports FSAA.*/
#ifdef GL_MULTISAMPLE_ARB
m = glIsEnabled(GL_MULTISAMPLE_ARB);
if (m) glDisable(GL_MULTISAMPLE_ARB);
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
#endif
- OSX bugfix: drawing selection code for vpaint and faceselect happens in AUX buffers now. It only works nice at OSX (tested, linux and windows do not support it nicely) This fixes the annoying flashing during paint or select
2003-06-11 15:43:20 +00:00
#ifdef __APPLE__
glDrawBuffer(GL_AUX0);
#endif
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->drawtype > OB_WIRE) G.vd->zbuf= TRUE;
Initial revision
2002-10-12 11:37:38 +00:00
curarea->win_swap &= ~WIN_BACK_OK;
glDisable(GL_DITHER);
glClearColor(0.0, 0.0, 0.0, 0.0);
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(G.vd->zbuf) {
Initial revision
2002-10-12 11:37:38 +00:00
glEnable(GL_DEPTH_TEST);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
else {
glClear(GL_COLOR_BUFFER_BIT);
glDisable(GL_DEPTH_TEST);
}
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(G.vd->flag & V3D_CLIPPING)
view3d_set_clipping(G.vd);
Initial revision
2002-10-12 11:37:38 +00:00
G.f |= G_BACKBUFSEL;
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
base= (G.scene->basact);
if(base && (base->lay & G.vd->lay)) {
draw_object_backbufsel(base->object);
Initial revision
2002-10-12 11:37:38 +00:00
}
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
G.vd->flag &= ~V3D_NEEDBACKBUFDRAW;
Initial revision
2002-10-12 11:37:38 +00:00
G.f &= ~G_BACKBUFSEL;
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
G.vd->zbuf= FALSE;
Initial revision
2002-10-12 11:37:38 +00:00
glDisable(GL_DEPTH_TEST);
glEnable(GL_DITHER);
- OSX bugfix: drawing selection code for vpaint and faceselect happens in AUX buffers now. It only works nice at OSX (tested, linux and windows do not support it nicely) This fixes the annoying flashing during paint or select
2003-06-11 15:43:20 +00:00
#ifdef __APPLE__
glDrawBuffer(GL_BACK); /* we were in aux buffers */
#endif
- fix for reported error in drawing 3d window buttons Panel when you have VertexPaint or FaceSelect mode on. The error was caused by not resetting to 2d buttons matrix after drawing the color codes for selection in backbuffer.
2003-12-01 13:01:18 +00:00
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(G.vd->flag & V3D_CLIPPING)
view3d_clr_clipping();
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
=FSAA fix= This commit gets rid of the #ifdef WIN32 I did for the FSAA code. However it still manually defines the constant (if it's not already defined) for FSAA, as I'm not sure which platforms have glext.h and I don't want to risk breaking platforms before release. Joe
2007-01-26 14:30:43 +00:00
#ifdef GL_MULTISAMPLE_ARB
if (m) glEnable(GL_MULTISAMPLE_ARB);
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
#endif
- fix for reported error in drawing 3d window buttons Panel when you have VertexPaint or FaceSelect mode on. The error was caused by not resetting to 2d buttons matrix after drawing the color codes for selection in backbuffer.
2003-12-01 13:01:18 +00:00
/* it is important to end a view in a transform compatible with buttons */
persp(PERSP_WIN); // set ortho
bwin_scalematrix(curarea->win, G.vd->blockscale, G.vd->blockscale, G.vd->blockscale);
Initial revision
2002-10-12 11:37:38 +00:00
}
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
void check_backbuf(void)
{
if(G.vd->flag & V3D_NEEDBACKBUFDRAW)
backdrawview3d(0);
}
/* samples a single pixel (copied from vpaint) */
unsigned int sample_backbuf(int x, int y)
{
unsigned int col;
if(x>=curarea->winx || y>=curarea->winy) return 0;
x+= curarea->winrct.xmin;
y+= curarea->winrct.ymin;
check_backbuf(); // actually not needed for apple
#ifdef __APPLE__
glReadBuffer(GL_AUX0);
#endif
glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &col);
glReadBuffer(GL_BACK);
if(G.order==B_ENDIAN) SWITCH_INT(col);
return framebuffer_to_index(col);
}
/* reads full rect, converts indices */
ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax)
{
unsigned int *dr, *rd;
struct ImBuf *ibuf, *ibuf1;
int a;
short xminc, yminc, xmaxc, ymaxc, xs, ys;
/* clip */
if(xmin<0) xminc= 0; else xminc= xmin;
if(xmax>=curarea->winx) xmaxc= curarea->winx-1; else xmaxc= xmax;
if(xminc > xmaxc) return NULL;
if(ymin<0) yminc= 0; else yminc= ymin;
if(ymax>=curarea->winy) ymaxc= curarea->winy-1; else ymaxc= ymax;
if(yminc > ymaxc) return NULL;
Bugfix #4652 Using TAB to type values in button sequences, didn't execute button callbacks on the 2nd and and 3rd etc. Error could be noticed in the Node Editor, Mapping node. That one didn't pass on changes to shading code.
2006-07-10 14:49:20 +00:00
ibuf= IMB_allocImBuf((xmaxc-xminc+1), (ymaxc-yminc+1), 32, IB_rect,0);
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
check_backbuf(); // actually not needed for apple
#ifdef __APPLE__
glReadBuffer(GL_AUX0);
#endif
glReadPixels(curarea->winrct.xmin+xminc, curarea->winrct.ymin+yminc, (xmaxc-xminc+1), (ymaxc-yminc+1), GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
glReadBuffer(GL_BACK);
if(G.order==B_ENDIAN) IMB_convert_rgba_to_abgr(ibuf);
a= (xmaxc-xminc+1)*(ymaxc-yminc+1);
dr= ibuf->rect;
while(a--) {
if(*dr) *dr= framebuffer_to_index(*dr);
dr++;
}
/* put clipped result back, if needed */
Bugfix #4652 Using TAB to type values in button sequences, didn't execute button callbacks on the 2nd and and 3rd etc. Error could be noticed in the Node Editor, Mapping node. That one didn't pass on changes to shading code.
2006-07-10 14:49:20 +00:00
if(xminc==xmin && xmaxc==xmax && yminc==ymin && ymaxc==ymax)
return ibuf;
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
ibuf1= IMB_allocImBuf( (xmax-xmin+1),(ymax-ymin+1),32,IB_rect,0);
rd= ibuf->rect;
dr= ibuf1->rect;
for(ys= ymin; ys<=ymax; ys++) {
for(xs= xmin; xs<=xmax; xs++, dr++) {
if( xs>=xminc && xs<=xmaxc && ys>=yminc && ys<=ymaxc) {
*dr= *rd;
rd++;
}
}
}
IMB_freeImBuf(ibuf);
return ibuf1;
}
/* smart function to sample a rect spiralling outside, nice for backbuf selection */
-> Fix for bug #5472 Vertex snapping now works with backbuffered selection modes. Previously backbuffer sampling had no way to check whether or not the indices that it retrieved were selected or not. To resolve this I added two optional arguments to sample_backbuf_rect in drawview.c. The first argument tells the function that some additional testing of the retrieved index values needs to be done and the second argument is a pointer to a function to do the testing. findnearestvert() in editmesh_mods.c now makes use of this and passes sample_backbuf_rect() the appropriate argument when being used for vertex snapping.
2007-01-01 09:41:10 +00:00
unsigned int sample_backbuf_rect(short mval[2], int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned int (*indextest)(unsigned int index))
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
{
struct ImBuf *buf;
unsigned int *bufmin, *bufmax, *tbuf;
int minx, miny;
int a, b, rc, nr, amount, dirvec[4][2];
Bugfix #5224 Prob: selection sometimes gave wrong edges/faces Selection code for editmesh was still using a short for calculating the distance of a projected vertex/edge/face from the mouse position. In zoomed in cases that'll give overflows and unpredictable results. It was fixed only half before... now all shorts are removed for distance calculus.
2006-11-15 10:02:57 +00:00
int distance=0;
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
unsigned int index = 0;
-> Fix for bug #5472 Vertex snapping now works with backbuffered selection modes. Previously backbuffer sampling had no way to check whether or not the indices that it retrieved were selected or not. To resolve this I added two optional arguments to sample_backbuf_rect in drawview.c. The first argument tells the function that some additional testing of the retrieved index values needs to be done and the second argument is a pointer to a function to do the testing. findnearestvert() in editmesh_mods.c now makes use of this and passes sample_backbuf_rect() the appropriate argument when being used for vertex snapping.
2007-01-01 09:41:10 +00:00
short indexok = 0;
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
amount= (size-1)/2;
minx = mval[0]-(amount+1);
miny = mval[1]-(amount+1);
buf = read_backbuf(minx, miny, minx+size-1, miny+size-1);
if (!buf) return 0;
rc= 0;
dirvec[0][0]= 1; dirvec[0][1]= 0;
dirvec[1][0]= 0; dirvec[1][1]= -size;
dirvec[2][0]= -1; dirvec[2][1]= 0;
dirvec[3][0]= 0; dirvec[3][1]= size;
bufmin = buf->rect;
tbuf = buf->rect;
bufmax = buf->rect + size*size;
tbuf+= amount*size+ amount;
for(nr=1; nr<=size; nr++) {
Initial revision
2002-10-12 11:37:38 +00:00
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
for(a=0; a<2; a++) {
for(b=0; b<nr; b++, distance++) {
-> Fix for bug #5472 Vertex snapping now works with backbuffered selection modes. Previously backbuffer sampling had no way to check whether or not the indices that it retrieved were selected or not. To resolve this I added two optional arguments to sample_backbuf_rect in drawview.c. The first argument tells the function that some additional testing of the retrieved index values needs to be done and the second argument is a pointer to a function to do the testing. findnearestvert() in editmesh_mods.c now makes use of this and passes sample_backbuf_rect() the appropriate argument when being used for vertex snapping.
2007-01-01 09:41:10 +00:00
if (*tbuf && *tbuf>=min && *tbuf<max) { //we got a hit
if(strict){
indexok = indextest(*tbuf - min+1);
if(indexok){
*dist= (short) sqrt( (float)distance );
index = *tbuf - min+1;
goto exit;
}
}
else{
*dist= (short) sqrt( (float)distance ); // XXX, this distance is wrong -
index = *tbuf - min+1; // messy yah, but indices start at 1
goto exit;
}
Seam Cutting in Faceselect Mode: - Mark Border Seam: mark edges on the border of face selection as seam. - Clear Seam: clears seams in selected faces. Hotkey: Ctrl+E - Alt+RMB Click: mark/clear edge as seam - Alt+Shift+RMB Click: mark/clear seams along the shortest/straightest path from last marked seam. The cost of the path also includes some measure of 'straightness' next to the typical distance to make things work more predicatble and edgeloop friendly. Note that this cuts a path from edge to edge, not vertex to vertex. That gives some nice control over the direction of the seam. Also includes: - Removed old LSCM code. - Fix updates glitches with DerivedMesh/Subsurf drawing in FaceSelect mode. Now there's a drawMappedFacesTex instead of drawFacesTex. - Minimize Stretch menu entry called Limit Stitch. - Removed the lasttface global, was being set before it was used anyway, so might as wel return from a function. - Moved some backbuf sampling code to drawview.c from editmesh, so it can be used by Faceselect and VPaint. - Use BLI_heap in parametrizer.c.
2006-02-08 21:01:00 +00:00
}
tbuf+= (dirvec[rc][0]+dirvec[rc][1]);
if(tbuf<bufmin || tbuf>=bufmax) {
goto exit;
}
}
rc++;
rc &= 3;
}
}
exit:
IMB_freeImBuf(buf);
return index;
}
Initial revision
2002-10-12 11:37:38 +00:00
void drawname(Object *ob)
{
cpack(0x404040);
glRasterPos3f(0.0, 0.0, 0.0);
BMF_DrawString(G.font, " ");
BMF_DrawString(G.font, ob->id.name+2);
}
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
static void draw_selected_name(Object *ob)
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
{
char info[128];
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
short offset=30;
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
if(ob->type==OB_ARMATURE) {
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
bArmature *arm= ob->data;
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
char *name= NULL;
if(ob==G.obedit) {
EditBone *ebo;
for (ebo=G.edbo.first; ebo; ebo=ebo->next){
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if ((ebo->flag & BONE_ACTIVE) && (ebo->layer & arm->layer)) {
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
name= ebo->name;
break;
}
}
}
else if(ob->pose && (ob->flag & OB_POSEMODE)) {
bPoseChannel *pchan;
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if((pchan->bone->flag & BONE_ACTIVE) && (pchan->bone->layer & arm->layer)) {
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
name= pchan->name;
break;
}
}
}
if(name)
sprintf(info, "(%d) %s %s", CFRA, ob->id.name+2, name);
else
sprintf(info, "(%d) %s", CFRA, ob->id.name+2);
}
Bugfix #6433 Armature bones did not draw name in window corner anymore. Caused by patch for drawing shape key names...
2007-03-24 12:44:55 +00:00
else if(ob->type==OB_MESH) {
Patch #3126 Option to draw object name in 3d window corner, now also displays for meshes the (pinned) shape key name. Threads: warning fix, added (void) for function declaration.
2007-03-19 15:48:24 +00:00
Key *key= NULL;
KeyBlock *kb = NULL;
char shapes[75];
Fix gcc warnings (assignment makes integer from pointer without a cast).
2007-03-24 05:10:03 +00:00
shapes[0] = 0;
Patch #3126 Option to draw object name in 3d window corner, now also displays for meshes the (pinned) shape key name. Threads: warning fix, added (void) for function declaration.
2007-03-19 15:48:24 +00:00
key = ob_get_key(ob);
if(key){
kb = BLI_findlink(&key->block, ob->shapenr-1);
if(kb){
sprintf(shapes, ": %s ", kb->name);
if(ob->shapeflag == OB_SHAPE_LOCK){
sprintf(shapes, "%s (Pinned)",shapes);
}
}
}
sprintf(info, "(%d) %s %s", CFRA, ob->id.name+2, shapes);
}
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
else sprintf(info, "(%d) %s", CFRA, ob->id.name+2);
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_ThemeColor(TH_TEXT_HI);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
if (U.uiflag & USER_SHOW_ROTVIEWICON)
offset = 14 + (U.rvisize * 2);
glRasterPos2i(offset, 10);
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
BMF_DrawString(G.fonts, info);
}
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
/* Draw a live substitute of the view icon, which is always shown */
static void draw_view_axis(void)
{
const float k = U.rvisize; /* axis size */
const float toll = 0.5; /* used to see when view is quasi-orthogonal */
const float start = k + 1.0; /* axis center in screen coordinates, x=y */
float ydisp = 0.0; /* vertical displacement to allow obj info text */
/* rvibright ranges approx. from original axis icon color to gizmo color */
Trying a new method for setting the brightness of the mini axis. Let's see how this goes.
2006-04-26 01:42:35 +00:00
float bright = U.rvibright / 15.0f;
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
unsigned char col[3];
unsigned char gridcol[3];
Trying a new method for setting the brightness of the mini axis. Let's see how this goes.
2006-04-26 01:42:35 +00:00
float colf[3];
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
float vec[4];
float dx, dy;
float h, s, v;
* Made the "mini axis" draw with lines proportional to it's size. Currently, the thick lines are a bit too thick at larger sizes, but it's better than having slower viewports. * Fixed bug with IPO-transform. When "Switch Mouse Buttons" is on, click-drag transforms of keys didn't work.
2008-01-24 00:03:16 +00:00
/* thickness of lines is proportional to k */
/* (log(k)-1) gives a more suitable thickness, but fps decreased by about 3 fps */
glLineWidth(k / 10);
//glLineWidth(log(k)-1); // a bit slow
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
BIF_GetThemeColor3ubv(TH_GRID, (char *)gridcol);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
/* X */
vec[0] = vec[3] = 1;
vec[1] = vec[2] = 0;
QuatMulVecf(G.vd->viewquat, vec);
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
make_axis_color((char *)gridcol, (char *)col, 'x');
Trying a new method for setting the brightness of the mini axis. Let's see how this goes.
2006-04-26 01:42:35 +00:00
rgb_to_hsv(col[0]/255.0f, col[1]/255.0f, col[2]/255.0f, &h, &s, &v);
s = s<0.5 ? s+0.5 : 1.0;
v = 0.3;
v = (v<1.0-(bright) ? v+bright : 1.0);
hsv_to_rgb(h, s, v, colf, colf+1, colf+2);
glColor3fv(colf);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
dx = vec[0] * k;
dy = vec[1] * k;
fdrawline(start, start + ydisp, start + dx, start + dy + ydisp);
if (fabs(dx) > toll || fabs(dy) > toll) {
glRasterPos2i(start + dx + 2, start + dy + ydisp + 2);
BMF_DrawString(G.fonts, "x");
}
/* Y */
vec[1] = vec[3] = 1;
vec[0] = vec[2] = 0;
QuatMulVecf(G.vd->viewquat, vec);
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
make_axis_color((char *)gridcol, (char *)col, 'y');
Trying a new method for setting the brightness of the mini axis. Let's see how this goes.
2006-04-26 01:42:35 +00:00
rgb_to_hsv(col[0]/255.0f, col[1]/255.0f, col[2]/255.0f, &h, &s, &v);
s = s<0.5 ? s+0.5 : 1.0;
v = 0.3;
v = (v<1.0-(bright) ? v+bright : 1.0);
hsv_to_rgb(h, s, v, colf, colf+1, colf+2);
glColor3fv(colf);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
dx = vec[0] * k;
dy = vec[1] * k;
fdrawline(start, start + ydisp, start + dx, start + dy + ydisp);
if (fabs(dx) > toll || fabs(dy) > toll) {
glRasterPos2i(start + dx + 2, start + dy + ydisp + 2);
BMF_DrawString(G.fonts, "y");
}
/* Z */
vec[2] = vec[3] = 1;
vec[1] = vec[0] = 0;
QuatMulVecf(G.vd->viewquat, vec);
Fix various gcc warning related to signed/unsigned parameters passed to OpenGL functions.
2007-03-17 14:15:02 +00:00
make_axis_color((char *)gridcol, (char *)col, 'z');
Trying a new method for setting the brightness of the mini axis. Let's see how this goes.
2006-04-26 01:42:35 +00:00
rgb_to_hsv(col[0]/255.0f, col[1]/255.0f, col[2]/255.0f, &h, &s, &v);
s = s<0.5 ? s+0.5 : 1.0;
v = 0.5;
v = (v<1.0-(bright) ? v+bright : 1.0);
hsv_to_rgb(h, s, v, colf, colf+1, colf+2);
glColor3fv(colf);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
dx = vec[0] * k;
dy = vec[1] * k;
fdrawline(start, start + ydisp, start + dx, start + dy + ydisp);
if (fabs(dx) > toll || fabs(dy) > toll) {
glRasterPos2i(start + dx + 2, start + dy + ydisp + 2);
BMF_DrawString(G.fonts, "z");
}
* Made the "mini axis" draw with lines proportional to it's size. Currently, the thick lines are a bit too thick at larger sizes, but it's better than having slower viewports. * Fixed bug with IPO-transform. When "Switch Mouse Buttons" is on, click-drag transforms of keys didn't work.
2008-01-24 00:03:16 +00:00
/* restore line-width */
glLineWidth(1.0);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
static void draw_view_icon(void)
{
BIFIconID icon;
if(G.vd->view==7) icon= ICON_AXIS_TOP;
else if(G.vd->view==1) icon= ICON_AXIS_FRONT;
else if(G.vd->view==3) icon= ICON_AXIS_SIDE;
else return ;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Big commit in orange: Interface icons for materials, textures world and lamp. Also for images in pupmenus. Also preparation for work on using preview images in imagebrowser. -- Andrea
2005-12-21 22:21:43 +00:00
BIF_icon_draw(5.0, 5.0, icon);
Initial revision
2002-10-12 11:37:38 +00:00
glDisable(GL_BLEND);
}
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
static void draw_viewport_name(ScrArea *sa)
{
char *name = NULL;
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
char *printable = NULL;
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
switch(G.vd->view) {
case 1:
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
if (G.vd->persp == V3D_ORTHO)
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Ortho" : "Front Ortho";
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Persp" : "Front Persp";
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
break;
case 3:
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
if (G.vd->persp == V3D_ORTHO)
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Ortho" : "Right Ortho";
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Persp" : "Right Persp";
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
break;
case 7:
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
if (G.vd->persp == V3D_ORTHO)
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Ortho" : "Top Ortho";
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Persp" : "Top Persp";
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
break;
default:
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
if (G.vd->persp==V3D_CAMOB) {
Several fixes: * DNA_action_types.h - fixes for typos that broke compiling (own error) * transform.c - fix for implicit definition of a function (missing header) * outliner.c - commented out a few unused vars (as a result of constraints refactor) * editsima.c - fixed uninitialised var warning * drawview.c - bugfix #7598 load without ui crashes if there is no camera. Patch provided by Daniel Genrich (genscher)
2007-10-22 06:28:39 +00:00
if ((G.vd->camera) && (G.vd->camera->type == OB_CAMERA)) {
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
Camera *cam;
cam = G.vd->camera->data;
name = (cam->type != CAM_ORTHO) ? "Camera Persp" : "Camera Ortho";
} else {
name = "Object as Camera";
}
} else {
replace magic numbers with constants for (G.vd->persp), view naming was also using persp as a flag which worked but isnt correct.
2008-04-16 08:48:49 +00:00
name = (G.vd->persp == V3D_ORTHO) ? "User Ortho" : "User Persp";
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
}
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
}
interface_draw.c - when the char panel was displayed it would mess up font size for other panels. drawview.c - removed unneeded comment (as GSR pointed out)
2007-06-04 10:53:37 +00:00
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
if (G.vd->localview) {
printable = malloc(strlen(name) + strlen(" (Local)_")); /* '_' gives space for '\0' */
strcpy(printable, name);
strcat(printable, " (Local)");
} else {
printable = name;
}
if (printable) {
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
BIF_ThemeColor(TH_TEXT_HI);
glRasterPos2i(10, sa->winy-20);
Patch from GSR [#6595] Ortho/Persp reporting in the View names
2007-06-04 00:35:19 +00:00
BMF_DrawString(G.fonts, printable);
}
if (G.vd->localview) {
free(printable);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
}
}
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
/* ******************* view3d space & buttons ************** */
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
/* temporal struct for storing transform properties */
typedef struct {
float ob_eul[4]; // used for quat too....
float ob_scale[3]; // need temp space due to linked values
float ob_dims[3];
short link_scale;
float ve_median[5];
int curdef;
float *defweightp;
} TransformProperties;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
/* is used for both read and write... */
static void v3d_editvertex_buts(uiBlock *block, Object *ob, float lim)
{
- replaced G.{edve,eded,edvl} with G.editMesh, atm just a structure to hold the three lists, nothing major, but gives a place to hang data off of and a single "mesh" structure to pass around for editing functions.
2004-03-28 08:46:35 +00:00
EditMesh *em = G.editMesh;
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
EditVert *eve, *evedef=NULL;
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
EditEdge *eed;
Missing check for pointer being NULL in last commit, could crash on entering editmode.
2006-11-12 10:53:30 +00:00
MDeformVert *dvert=NULL;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
TransformProperties *tfp= G.vd->properties_storage;
Fix for bug #7986: tab in edit introduces garbage values.
2008-03-18 10:55:07 +00:00
float median[5], ve_median[5];
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
int tot, totw, totweight, totedge;
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
char defstr[320];
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
median[0]= median[1]= median[2]= median[3]= median[4]= 0.0;
tot= totw= totweight= totedge= 0;
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
defstr[0]= 0;
Made weight-painting more bearable :) - Hotkey CTRL+TAB toggles weightpaint on/off - If Mesh has no vertex groups yet, it still accepts Weight Paint mode. Then, on a first painting stroke it creates a default group. - When combining WeightPaint mode with Bone selecting, if you select a Bone without vertex group it draws Mesh dark blue. On a first painting stroke it then also creates a new group, with the Bone name.
2005-08-21 20:09:50 +00:00
if(ob->type==OB_MESH) {
- replaced G.{edve,eded,edvl} with G.editMesh, atm just a structure to hold the three lists, nothing major, but gives a place to hang data off of and a single "mesh" structure to pass around for editing functions.
2004-03-28 08:46:35 +00:00
eve= em->verts.first;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
while(eve) {
find external files wasnt finding the biggest screen area for the file selector, other minor changes. renamed "Dump Screen" to "Screenshot" in the file menu.
2008-01-01 02:20:13 +00:00
if(eve->f & SELECT) {
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
evedef= eve;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
tot++;
VecAddf(median, median, eve->co);
}
eve= eve->next;
}
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
eed= em->edges.first;
while(eed) {
if((eed->f & SELECT)) {
totedge++;
median[3]+= eed->crease;
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
}
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
eed= eed->next;
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
}
Added custom vertex data support to editmode. Only used for vertex groups now, others can be added later (sticky, shape keys). Beside one small fix for knife exact vertex group interpolation, is intended to work the same as before. Also fixes bug #5200, related to editmode undo and vertex groups. And corrects the editmode to faceselect mode selection conversion, that was broken in a previous commit.
2006-11-11 23:23:15 +00:00
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
/* check for defgroups */
Missing check for pointer being NULL in last commit, could crash on entering editmode.
2006-11-12 10:53:30 +00:00
if(evedef)
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
dvert= CustomData_em_get(&em->vdata, evedef->data, CD_MDEFORMVERT);
Missing check for pointer being NULL in last commit, could crash on entering editmode.
2006-11-12 10:53:30 +00:00
if(tot==1 && dvert && dvert->totweight) {
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
bDeformGroup *dg;
int i, max=1, init=1;
=NKey Panel Fix= The weightgroup menu in the NKEY panel in the 3D viewport was using a two-small string variable, which could cause crashes on msvc compilers (which detects stack mangling at runtime, nice!). This should fix bug #6097, though it's hard for me to test as my default compiler (gcc) is much more lenient :S
2007-02-26 20:36:03 +00:00
char str[320];
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
Added custom vertex data support to editmode. Only used for vertex groups now, others can be added later (sticky, shape keys). Beside one small fix for knife exact vertex group interpolation, is intended to work the same as before. Also fixes bug #5200, related to editmode undo and vertex groups. And corrects the editmode to faceselect mode selection conversion, that was broken in a previous commit.
2006-11-11 23:23:15 +00:00
for (i=0; i<dvert->totweight; i++){
dg = BLI_findlink (&ob->defbase, dvert->dw[i].def_nr);
With the commit last week to have curve bevels nice circular (when no front/back is selected), the UV coordinates for curves should also be corrected. This commit re-uses the same code as for Nurbs, to make sure UV coordinates wrap around nicely. BUT! I've noticed that Daniel's commit of august in this code actually broke this UV correction... in his craze to cleanup old code, he missed the actual functionality. Meaning that in 2.40 and 2.41, "UV orco" texture coordinates wrap around ugly in Nurbs Surfaces, something that was fixed in NaN days. Got no time for tracker now... but I'm sure it's in there! :)
2006-03-11 12:34:50 +00:00
if(dg) {
Tools --------------- Bugfix #5898: buffer overrun by sprintf() in v3d_editvertex_buts() caused a crash. Changed to snprintf().
2007-02-01 20:25:24 +00:00
max+= snprintf(str, sizeof(str), "%s %%x%d|", dg->name, dvert->dw[i].def_nr);
With the commit last week to have curve bevels nice circular (when no front/back is selected), the UV coordinates for curves should also be corrected. This commit re-uses the same code as for Nurbs, to make sure UV coordinates wrap around nicely. BUT! I've noticed that Daniel's commit of august in this code actually broke this UV correction... in his craze to cleanup old code, he missed the actual functionality. Meaning that in 2.40 and 2.41, "UV orco" texture coordinates wrap around ugly in Nurbs Surfaces, something that was fixed in NaN days. Got no time for tracker now... but I'm sure it's in there! :)
2006-03-11 12:34:50 +00:00
if(max<320) strcat(defstr, str);
}
else printf("oh no!\n");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
if(tfp->curdef==dvert->dw[i].def_nr) {
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
init= 0;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->defweightp= &dvert->dw[i].weight;
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
}
}
if(init) { // needs new initialized
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->curdef= dvert->dw[0].def_nr;
tfp->defweightp= &dvert->dw[0].weight;
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
}
}
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
else if(ob->type==OB_CURVE || ob->type==OB_SURF) {
extern ListBase editNurb; /* editcurve.c */
Nurb *nu;
BPoint *bp;
BezTriple *bezt;
int a;
nu= editNurb.first;
while(nu) {
* Shrink/Fatten for bevelled curves This is a much faster and easier way to give a bevelled curve a taper, without using taper curves. Each point on a curve now has a 'radius' value that you can shrink and fatten using Alt S, which will influence the taper when the curve is bevelled (either with a bevob, or with front/back turned off and a bevel dept set). Alt S shrinks and fattens the selected points in an interactive transform, and you can set an absolute radius for selected points with 'Set Radius' in the curve specials menu. See demo: http://mke3.net/blender/etc/curve_shrinkfatten-h264.mov This can be a quick way to create revolved surfaces (eg. http://mke3.net/blender/etc/wineglass-h264.mov ) and it would be very interesting to use this radius value in other tools, such as a 'freehand curve' tool that would let you draw a curve freehand, with the radius affected by pen pressure, or even using the radius at each point to control curve guides for particles more precisely, rather than the continous maxdist.
2006-08-13 07:37:51 +00:00
if((nu->type & 7)==CU_BEZIER) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f2 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(median, median, bezt->vec[1]);
tot++;
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
median[4]+= bezt->weight;
totweight++;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
else {
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f1 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(median, median, bezt->vec[0]);
tot++;
}
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f3 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(median, median, bezt->vec[2]);
tot++;
}
}
bezt++;
}
}
else {
bp= nu->bp;
a= nu->pntsu*nu->pntsv;
while(a--) {
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
if(bp->f1 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(median, median, bp->vec);
- Nurbs curve/surface Nkey editmode now displays the W value again! was lost in 2.30 makeover.
2004-01-24 16:56:12 +00:00
median[3]+= bp->vec[3];
totw++;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
tot++;
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
median[4]+= bp->weight;
totweight++;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
bp++;
}
}
nu= nu->next;
}
}
More softbody goodness; - Added Softbody effect for Lattices (not too useful yet without vertexgroups though) - Added default vertex "goal" value + button, to be assigned when no vertexgroup exists (or vertex isn't in the group) - Made softmin and softmax work as documented (defining min and max range) - made changes in buttons send 'update' signal to softbody And: - added Nkey Properties to show lattice coordinates
2005-04-02 19:52:32 +00:00
else if(ob->type==OB_LATTICE) {
BPoint *bp;
int a;
a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
bp= editLatt->def;
while(a--) {
if(bp->f1 & SELECT) {
VecAddf(median, median, bp->vec);
tot++;
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
median[4]+= bp->weight;
totweight++;
More softbody goodness; - Added Softbody effect for Lattices (not too useful yet without vertexgroups though) - Added default vertex "goal" value + button, to be assigned when no vertexgroup exists (or vertex isn't in the group) - Made softmin and softmax work as documented (defining min and max range) - made changes in buttons send 'update' signal to softbody And: - added Nkey Properties to show lattice coordinates
2005-04-02 19:52:32 +00:00
}
bp++;
}
}
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(tot==0) return;
median[0] /= (float)tot;
median[1] /= (float)tot;
median[2] /= (float)tot;
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
if(totedge) median[3] /= (float)totedge;
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
else if(totw) median[3] /= (float)totw;
if(totweight) median[4] /= (float)totweight;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
More stats-junk stuff! Added in Nkey panel (transform properties) option to show in editmode at choice the global or local coordinate values. Same option works for the "Tech draw" options. :)
2005-04-29 18:43:17 +00:00
if(G.vd->flag & V3D_GLOBAL_STATS)
Mat4MulVecfl(ob->obmat, median);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(block) { // buttons
find external files wasnt finding the biggest screen area for the file selector, other minor changes. renamed "Dump Screen" to "Screenshot" in the file menu.
2008-01-01 02:20:13 +00:00
int but_y;
if((ob->parent) && (ob->partype == PARBONE)) but_y = 135;
else but_y = 150;
More stats-junk stuff! Added in Nkey panel (transform properties) option to show in editmode at choice the global or local coordinate values. Same option works for the "Tech draw" options. :)
2005-04-29 18:43:17 +00:00
uiBlockBeginAlign(block);
find external files wasnt finding the biggest screen area for the file selector, other minor changes. renamed "Dump Screen" to "Screenshot" in the file menu.
2008-01-01 02:20:13 +00:00
uiDefButBitS(block, TOG, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Global", 160, but_y, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays global values");
uiDefButBitS(block, TOGN, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Local", 230, but_y, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays local values");
uiBlockEndAlign(block);
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
memcpy(tfp->ve_median, median, sizeof(tfp->ve_median));
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
if(tot==1) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Vertex X:", 10, 110, 290, 19, &(tfp->ve_median[0]), -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Vertex Y:", 10, 90, 290, 19, &(tfp->ve_median[1]), -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Vertex Z:", 10, 70, 290, 19, &(tfp->ve_median[2]), -lim, lim, 10, 3, "");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
if(totw==1)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Vertex W:", 10, 50, 290, 19, &(tfp->ve_median[3]), 0.01, 100.0, 10, 3, "");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
uiBlockEndAlign(block);
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
if(defstr[0]) {
uiDefBut(block, LABEL, 1, "Vertex Deform Groups", 10, 40, 290, 20, NULL, 0.0, 0.0, 0, 0, "");
uiBlockBeginAlign(block);
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_NOP, "Weight:", 10, 20, 150, 19, tfp->defweightp, 0.0f, 1.0f, 10, 3, "Weight value");
uiDefButI(block, MENU, REDRAWVIEW3D, defstr, 160, 20, 140, 19, &tfp->curdef, 0.0, 0.0, 0, 0, "Current Vertex Group");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
uiBlockEndAlign(block);
More armature stuff; - The "Skinnable" option for Bones now is taken into account for the Envelope drawmode. If not Skinnable, it also doesn't draw the soft deform area. Maybe bone should be hidden... dunno yet. - Use CTRL+LMB in weightpaint mode to sample the weight in a mesh. Note; it returns the weight of the closest visible vertex, not of a Blended result. - NKey Panel for Mesh edit now shows a menu with the VertexGroup name(s) of a selected Vertex, plus the Weight. Fix: - while scaling Bone points in editmode (Envelope drawtype), the Bone root scale was not copied from (or to) the parent tip. This was not visible (is not drawn) but deform did use it... causing weird errors. For those who saw this error today: just go into editmode, select all Bones, press Skey, enter. That fixes it :)
2005-08-19 21:37:29 +00:00
}
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
else if(totweight)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Weight:", 10, 20, 290, 19, &(tfp->ve_median[4]), 0.0, 1.0, 10, 3, "");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
else {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median X:", 10, 110, 290, 19, &(tfp->ve_median[0]), -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Y:", 10, 90, 290, 19, &(tfp->ve_median[1]), -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Z:", 10, 70, 290, 19, &(tfp->ve_median[2]), -lim, lim, 10, 3, "");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
if(totw==tot)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median W:", 10, 50, 290, 19, &(tfp->ve_median[3]), 0.01, 100.0, 10, 3, "");
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
uiBlockEndAlign(block);
if(totweight)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Weight:", 10, 20, 290, 19, &(tfp->ve_median[4]), 0.0, 1.0, 10, 3, "Weight is used for SoftBody Goal");
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
added buttons in the Transform Properties for changing curve handle types, (Similar to how Metaballs can be selected) for easier access then H,Shift H, V keys
2007-11-10 15:31:41 +00:00
if(ob->type==OB_CURVE && (totw==0)) { /* bez curves have no w */
uiBlockBeginAlign(block);
uiDefBut(block, BUT,B_SETPT_AUTO,"Auto", 10, 44, 72, 19, 0, 0, 0, 0, 0, "Auto handles (Shift H)");
uiDefBut(block, BUT,B_SETPT_VECTOR,"Vector",82, 44, 73, 19, 0, 0, 0, 0, 0, "Vector handles (V)");
uiDefBut(block, BUT,B_SETPT_ALIGN,"Align",155, 44, 73, 19, 0, 0, 0, 0, 0, "Align handles (H Toggles)");
uiDefBut(block, BUT,B_SETPT_FREE,"Free", 227, 44, 72, 19, 0, 0, 0, 0, 0, "Align handles (H Toggles)");
uiBlockEndAlign(block);
}
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
if(totedge==1)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Crease W:", 10, 30, 290, 19, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, "");
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
else if(totedge>1)
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Crease W:", 10, 30, 290, 19, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, "");
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
else { // apply
Fix for bug #7986: tab in edit introduces garbage values.
2008-03-18 10:55:07 +00:00
memcpy(ve_median, tfp->ve_median, sizeof(tfp->ve_median));
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
More stats-junk stuff! Added in Nkey panel (transform properties) option to show in editmode at choice the global or local coordinate values. Same option works for the "Tech draw" options. :)
2005-04-29 18:43:17 +00:00
if(G.vd->flag & V3D_GLOBAL_STATS) {
Mat4Invert(ob->imat, ob->obmat);
Mat4MulVecfl(ob->imat, median);
Fix for bug #7986: tab in edit introduces garbage values.
2008-03-18 10:55:07 +00:00
Mat4MulVecfl(ob->imat, ve_median);
More stats-junk stuff! Added in Nkey panel (transform properties) option to show in editmode at choice the global or local coordinate values. Same option works for the "Tech draw" options. :)
2005-04-29 18:43:17 +00:00
}
Fix for bug #7986: tab in edit introduces garbage values.
2008-03-18 10:55:07 +00:00
VecSubf(median, ve_median, median);
median[3]= ve_median[3]-median[3];
median[4]= ve_median[4]-median[4];
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(ob->type==OB_MESH) {
Three fixes in edge/crease edit for Transform Properties Panel (NKEY) - code wasn't edge-select aware yet - the "Median" button now allows to move a "median" correctly around, also to 0 or 1 in a single step - missing undo push here.
2004-12-09 16:43:37 +00:00
- replaced G.{edve,eded,edvl} with G.editMesh, atm just a structure to hold the three lists, nothing major, but gives a place to hang data off of and a single "mesh" structure to pass around for editing functions.
2004-03-28 08:46:35 +00:00
eve= em->verts.first;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
while(eve) {
find external files wasnt finding the biggest screen area for the file selector, other minor changes. renamed "Dump Screen" to "Screenshot" in the file menu.
2008-01-01 02:20:13 +00:00
if(eve->f & SELECT) {
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
VecAddf(eve->co, eve->co, median);
}
eve= eve->next;
}
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
Three fixes in edge/crease edit for Transform Properties Panel (NKEY) - code wasn't edge-select aware yet - the "Median" button now allows to move a "median" correctly around, also to 0 or 1 in a single step - missing undo push here.
2004-12-09 16:43:37 +00:00
for(eed= em->edges.first; eed; eed= eed->next) {
if(eed->f & SELECT) {
Bugfix #5144 Nkey panel for creases median didn't work properly. Now it does as follows: - if set to 0 or 1 it applies that value to all creases - else it adds the diffference of median crease value and the button value Bugfix #5122 Paths drawing option for Poses now uses entire startframe-endframe range. Before it skipped the last frame for drawing.
2006-11-04 10:09:05 +00:00
/* ensure the median can be set to zero or one */
Fix for bug #7986: tab in edit introduces garbage values.
2008-03-18 10:55:07 +00:00
if(ve_median[3]==0.0f) eed->crease= 0.0f;
else if(ve_median[3]==1.0f) eed->crease= 1.0f;
Bugfix #5144 Nkey panel for creases median didn't work properly. Now it does as follows: - if set to 0 or 1 it applies that value to all creases - else it adds the diffference of median crease value and the button value Bugfix #5122 Paths drawing option for Poses now uses entire startframe-endframe range. Before it skipped the last frame for drawing.
2006-11-04 10:09:05 +00:00
else {
eed->crease+= median[3];
CLAMP(eed->crease, 0.0, 1.0);
}
Added crease value in NKey menu editmode
2004-07-28 16:45:00 +00:00
}
}
Bugfix #2734 Added update of normals and face center after using NKey properties or do-centre option in Mesh EditMode.
2005-06-12 12:44:51 +00:00
recalc_editnormals();
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
else if(ob->type==OB_CURVE || ob->type==OB_SURF) {
extern ListBase editNurb; /* editcurve.c */
Nurb *nu;
BPoint *bp;
BezTriple *bezt;
int a;
nu= editNurb.first;
while(nu) {
if((nu->type & 7)==1) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f2 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(bezt->vec[0], bezt->vec[0], median);
VecAddf(bezt->vec[1], bezt->vec[1], median);
VecAddf(bezt->vec[2], bezt->vec[2], median);
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
bezt->weight+= median[4];
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
else {
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f1 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(bezt->vec[0], bezt->vec[0], median);
}
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
2007-12-01 23:25:00 +00:00
if(bezt->f3 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(bezt->vec[2], bezt->vec[2], median);
}
}
bezt++;
}
}
else {
bp= nu->bp;
a= nu->pntsu*nu->pntsv;
while(a--) {
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
if(bp->f1 & SELECT) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VecAddf(bp->vec, bp->vec, median);
- Nurbs curve/surface Nkey editmode now displays the W value again! was lost in 2.30 makeover.
2004-01-24 16:56:12 +00:00
bp->vec[3]+= median[3];
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
bp->weight+= median[4];
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
bp++;
}
}
test2DNurb(nu);
testhandlesNurb(nu); /* test for bezier too */
nu= nu->next;
}
}
More softbody goodness; - Added Softbody effect for Lattices (not too useful yet without vertexgroups though) - Added default vertex "goal" value + button, to be assigned when no vertexgroup exists (or vertex isn't in the group) - Made softmin and softmax work as documented (defining min and max range) - made changes in buttons send 'update' signal to softbody And: - added Nkey Properties to show lattice coordinates
2005-04-02 19:52:32 +00:00
else if(ob->type==OB_LATTICE) {
BPoint *bp;
int a;
a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
bp= editLatt->def;
while(a--) {
if(bp->f1 & SELECT) {
VecAddf(bp->vec, bp->vec, median);
Another Orange sneak-in feature: SoftBody support for Curves & Surfaces. Well, it already worked a bit, but without weight options or edge stiffness. You now can set the weights using the "Properties" Panel in the 3D Window (allows multiple selections too) or with Wkey in Edit Mode. Bezier curves have this too. NOTE: Lattice SoftBody Goal created yesterday won't work anymore! I've had to recode weight support for Nurbs Points, using a new weight variable... this because the existing W variable was in use for Nurbs already. Also Lattices have this new Weight variable, so the code is nice uniform. Sorry for the artists who already created complex Lattices... :) NOTE2: Surface Objects don't support edge stiffness yet NOTE3: I've removed ancient screen coordinates from the Bezier struct, which makes - even with added weight and padding - the struct smaller! Demo file: http://download.blender.org/demo/test/2.40/softbody_curve_lattice.blend
2005-11-17 11:40:57 +00:00
bp->weight+= median[4];
More softbody goodness; - Added Softbody effect for Lattices (not too useful yet without vertexgroups though) - Added default vertex "goal" value + button, to be assigned when no vertexgroup exists (or vertex isn't in the group) - Made softmin and softmax work as documented (defining min and max range) - made changes in buttons send 'update' signal to softbody And: - added Nkey Properties to show lattice coordinates
2005-04-02 19:52:32 +00:00
}
bp++;
}
}
Three fixes in edge/crease edit for Transform Properties Panel (NKEY) - code wasn't edge-select aware yet - the "Median" button now allows to move a "median" correctly around, also to 0 or 1 in a single step - missing undo push here.
2004-12-09 16:43:37 +00:00
BIF_undo_push("Transform properties");
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
/* assumes armature active */
static void validate_bonebutton_cb(void *bonev, void *namev)
{
Object *ob= OBACT;
if(ob && ob->type==OB_ARMATURE) {
Bone *bone= bonev;
char oldname[32], newname[32];
/* need to be on the stack */
BLI_strncpy(newname, bone->name, 32);
BLI_strncpy(oldname, (char *)namev, 32);
/* restore */
BLI_strncpy(bone->name, oldname, 32);
armature_bone_rename(ob->data, oldname, newname); // editarmature.c
allqueue(REDRAWALL, 0);
}
}
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
static void v3d_posearmature_buts(uiBlock *block, Object *ob, float lim)
{
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
uiBut *but;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
bArmature *arm;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
bPoseChannel *pchan;
Armature Proxy bugfix: synchronizing the pose went wrong when the proxy had new dependencies added internally (like constraints), changing the evaluation order for pose channels. My optimized code didn't like it, so now it falls back to a reliable slower method. Bug showed as totally messed up characters for proxies... Also: increased range for 3D Window properties clip-start/end, this is still a bad construct though...
2006-12-13 08:50:11 +00:00
Bone *bone= NULL;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
TransformProperties *tfp= G.vd->properties_storage;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
arm = get_armature(OBACT);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if (!arm || !ob->pose) return;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
bone = pchan->bone;
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if(bone && (bone->flag & BONE_ACTIVE) && (bone->layer & arm->layer))
break;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
}
Armature Proxy bugfix: synchronizing the pose went wrong when the proxy had new dependencies added internally (like constraints), changing the evaluation order for pose channels. My optimized code didn't like it, so now it falls back to a reliable slower method. Bug showed as totally messed up characters for proxies... Also: increased range for 3D Window properties clip-start/end, this is still a bad construct though...
2006-12-13 08:50:11 +00:00
if (!pchan || !bone) return;
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
if((ob->parent) && (ob->partype == PARBONE))
but= uiDefBut (block, TEX, B_DIFF, "Bone:", 160, 130, 140, 19, bone->name, 1, 31, 0, 0, "");
else
but= uiDefBut(block, TEX, B_DIFF, "Bone:", 160, 140, 140, 19, bone->name, 1, 31, 0, 0, "");
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
uiButSetFunc(but, validate_bonebutton_cb, bone, NULL);
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
QuatToEul(pchan->quat, tfp->ob_eul);
tfp->ob_eul[0]*= 180.0/M_PI;
tfp->ob_eul[1]*= 180.0/M_PI;
tfp->ob_eul[2]*= 180.0/M_PI;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
New: Write Protection for transform values. You now can set, in NKEY Transform Properties Panel, per XYZ rot/loc/size, a protection for Transform tools to not change these values anymore. This now works for Objects or for Bones in PoseMode. Usage is especially for character animation, to give Bones in a Pose defaults for rotation axes, so you don't have to worry about the correct limitations (or setup complex IK limits). Of course, this feature doesn't influence the animation system. As an extra also the Transform Widgets then draw less handles. Note this is based on the actual locked value, and depends still on Manipulator orientation whether it can be used really. Implementation warning: I had to remove the 'return' in the middle of the editobject.c compatible_eul() call. It now makes nice compatible eulers when they're simple (single axis rotations). Unfortunately there was no note in the code why it was ever removed... ALso: fix for crash in using Crease Transform and Mirror modifier.
2005-10-29 20:08:25 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCX, REDRAWVIEW3D, ICON_UNLOCKED, 10,140,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_ARMATUREPANEL2, "LocX:", 30, 140, 120, 19, pchan->loc, -lim, lim, 100, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCY, REDRAWVIEW3D, ICON_UNLOCKED, 10,120,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_ARMATUREPANEL2, "LocY:", 30, 120, 120, 19, pchan->loc+1, -lim, lim, 100, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCZ, REDRAWVIEW3D, ICON_UNLOCKED, 10,100,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
My first commit! This commit fixes the name of the LocZ number field in n-key panel for pose-mode bones.
2006-11-09 08:09:54 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL2, "LocZ:", 30, 100, 120, 19, pchan->loc+2, -lim, lim, 100, 3, "");
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
New: Write Protection for transform values. You now can set, in NKEY Transform Properties Panel, per XYZ rot/loc/size, a protection for Transform tools to not change these values anymore. This now works for Objects or for Bones in PoseMode. Usage is especially for character animation, to give Bones in a Pose defaults for rotation axes, so you don't have to worry about the correct limitations (or setup complex IK limits). Of course, this feature doesn't influence the animation system. As an extra also the Transform Widgets then draw less handles. Note this is based on the actual locked value, and depends still on Manipulator orientation whether it can be used really. Implementation warning: I had to remove the 'return' in the middle of the editobject.c compatible_eul() call. It now makes nice compatible eulers when they're simple (single axis rotations). Unfortunately there was no note in the code why it was ever removed... ALso: fix for crash in using Crease Transform and Mirror modifier.
2005-10-29 20:08:25 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTX, REDRAWVIEW3D, ICON_UNLOCKED, 10,70,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL3, "RotX:", 30, 70, 120, 19, tfp->ob_eul, -1000.0, 1000.0, 100, 3, "");
New: Write Protection for transform values. You now can set, in NKEY Transform Properties Panel, per XYZ rot/loc/size, a protection for Transform tools to not change these values anymore. This now works for Objects or for Bones in PoseMode. Usage is especially for character animation, to give Bones in a Pose defaults for rotation axes, so you don't have to worry about the correct limitations (or setup complex IK limits). Of course, this feature doesn't influence the animation system. As an extra also the Transform Widgets then draw less handles. Note this is based on the actual locked value, and depends still on Manipulator orientation whether it can be used really. Implementation warning: I had to remove the 'return' in the middle of the editobject.c compatible_eul() call. It now makes nice compatible eulers when they're simple (single axis rotations). Unfortunately there was no note in the code why it was ever removed... ALso: fix for crash in using Crease Transform and Mirror modifier.
2005-10-29 20:08:25 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTY, REDRAWVIEW3D, ICON_UNLOCKED, 10,50,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL3, "RotY:", 30, 50, 120, 19, tfp->ob_eul+1, -1000.0, 1000.0, 100, 3, "");
New: Write Protection for transform values. You now can set, in NKEY Transform Properties Panel, per XYZ rot/loc/size, a protection for Transform tools to not change these values anymore. This now works for Objects or for Bones in PoseMode. Usage is especially for character animation, to give Bones in a Pose defaults for rotation axes, so you don't have to worry about the correct limitations (or setup complex IK limits). Of course, this feature doesn't influence the animation system. As an extra also the Transform Widgets then draw less handles. Note this is based on the actual locked value, and depends still on Manipulator orientation whether it can be used really. Implementation warning: I had to remove the 'return' in the middle of the editobject.c compatible_eul() call. It now makes nice compatible eulers when they're simple (single axis rotations). Unfortunately there was no note in the code why it was ever removed... ALso: fix for crash in using Crease Transform and Mirror modifier.
2005-10-29 20:08:25 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTZ, REDRAWVIEW3D, ICON_UNLOCKED, 10,30,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL3, "RotZ:", 30, 30, 120, 19, tfp->ob_eul+2, -1000.0, 1000.0, 100, 3, "");
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEX, REDRAWVIEW3D, ICON_UNLOCKED, 160,70,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Changed some references to 'size' to now refer to 'scale'. If anybody sees a reference to size, as it pertains to a 3D object, please let me know.
2006-06-15 04:13:26 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleX:", 180, 70, 120, 19, pchan->size, -lim, lim, 10, 3, "");
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEY, REDRAWVIEW3D, ICON_UNLOCKED, 160,50,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Changed some references to 'size' to now refer to 'scale'. If anybody sees a reference to size, as it pertains to a 3D object, please let me know.
2006-06-15 04:13:26 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleY:", 180, 50, 120, 19, pchan->size+1, -lim, lim, 10, 3, "");
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEZ, REDRAWVIEW3D, ICON_UNLOCKED, 160,30,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Changed some references to 'size' to now refer to 'scale'. If anybody sees a reference to size, as it pertains to a 3D object, please let me know.
2006-06-15 04:13:26 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleZ:", 180, 30, 120, 19, pchan->size+2, -lim, lim, 10, 3, "");
- Added button align code: uiBlockBeginAlign(block, 'v'); 'v'= vertical. 'h'=horizontal ..... (button def calls) uiBlockEndAlign(block); this will allow new themes to have buttons nicely drawn together. - added new rounded draw theme, to test & illustrate the above. - only did parts of button code with align... rest for later - fixed 'minimal' theme to make it usable (with some decoration) - put back 'oldskool' theme... but it just looks plain ugly! remove? Lazy people: http://www.blender.org/bf/rt.jpg check the top header, or Nkey menu, to see the meaning of 'align'.
2003-11-14 00:44:48 +00:00
uiBlockEndAlign(block);
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
static void v3d_editarmature_buts(uiBlock *block, Object *ob, float lim)
{
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
bArmature *arm= G.obedit->data;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
EditBone *ebone;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
uiBut *but;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
TransformProperties *tfp= G.vd->properties_storage;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
ebone= G.edbo.first;
for (ebone = G.edbo.first; ebone; ebone=ebone->next){
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if ((ebone->flag & BONE_ACTIVE) && (ebone->layer & arm->layer))
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
break;
}
if (!ebone)
return;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
if((ob->parent) && (ob->partype == PARBONE))
but= uiDefBut(block, TEX, B_DIFF, "Bone:", 160, 130, 140, 19, ebone->name, 1, 31, 0, 0, "");
else
but= uiDefBut(block, TEX, B_DIFF, "Bone:", 160, 150, 140, 19, ebone->name, 1, 31, 0, 0, "");
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
uiButSetFunc(but, validate_editbonebutton_cb, ebone, NULL);
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Renamed Root/Tip X/Y/Z buttons in Armature Editmode Transform Panel (NKEY) to Head/Tail for consistency with the rest of Blender.
2007-09-12 07:33:18 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL1, "HeadX:", 10, 70, 140, 19, ebone->head, -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_ARMATUREPANEL1, "HeadY:", 10, 50, 140, 19, ebone->head+1, -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_ARMATUREPANEL1, "HeadZ:", 10, 30, 140, 19, ebone->head+2, -lim, lim, 10, 3, "");
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Renamed Root/Tip X/Y/Z buttons in Armature Editmode Transform Panel (NKEY) to Head/Tail for consistency with the rest of Blender.
2007-09-12 07:33:18 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL1, "TailX:", 160, 70, 140, 19, ebone->tail, -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_ARMATUREPANEL1, "TailY:", 160, 50, 140, 19, ebone->tail+1, -lim, lim, 10, 3, "");
uiDefButF(block, NUM, B_ARMATUREPANEL1, "TailZ:", 160, 30, 140, 19, ebone->tail+2, -lim, lim, 10, 3, "");
- Added button align code: uiBlockBeginAlign(block, 'v'); 'v'= vertical. 'h'=horizontal ..... (button def calls) uiBlockEndAlign(block); this will allow new themes to have buttons nicely drawn together. - added new rounded draw theme, to test & illustrate the above. - only did parts of button code with align... rest for later - fixed 'minimal' theme to make it usable (with some decoration) - put back 'oldskool' theme... but it just looks plain ugly! remove? Lazy people: http://www.blender.org/bf/rt.jpg check the top header, or Nkey menu, to see the meaning of 'align'.
2003-11-14 00:44:48 +00:00
uiBlockEndAlign(block);
== Bone Roll - Align to Cursor == In this commit, a new way to set the bone roll is introduced. It aligns the z-axis of the selected bone(s) to the 3D-Cursor, so that the cursor intersects with the YZ plane. This makes it easier to align bone rolls to a target, for use in rigs where arms/legs are not horizontal/vertical. To use this, just press Ctrl N, and choose the "Align Z-Axis to 3D-Cursor" option. Credits go to Robert Christian (wavez) for providing the method as a working BPy script, that demonstrated this in action.
2007-08-03 11:16:12 +00:00
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->ob_eul[0]= 180.0*ebone->roll/M_PI;
uiDefButF(block, NUM, B_ARMATUREPANEL1, "Roll:", 10, 100, 140, 19, tfp->ob_eul, -lim, lim, 1000, 3, "");
Fixed a mistake where the hrad/tail radius UI numinput didnt check weather the bobne was connected before using the parents tail value for its head.
2006-03-10 02:55:18 +00:00
Added UI numeric access to bone radius (for envelopes), needed to accsess the other day to make bones the same radius and had to guess. See the edit bone properties. Just added a comment to DNA_armature_types.h about rad_head and rad_tail override, if a parant exists.
2006-02-23 14:45:59 +00:00
uiBlockBeginAlign(block);
Some more tip->tail naming conversions for consistency in the UI.
2007-09-13 05:15:55 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL1, "TailRadius:", 10, 150, 140, 19, &ebone->rad_tail, 0, lim, 10, 3, "");
Fixed a mistake where the hrad/tail radius UI numinput didnt check weather the bobne was connected before using the parents tail value for its head.
2006-03-10 02:55:18 +00:00
if (ebone->parent && ebone->flag & BONE_CONNECTED )
Added UI numeric access to bone radius (for envelopes), needed to accsess the other day to make bones the same radius and had to guess. See the edit bone properties. Just added a comment to DNA_armature_types.h about rad_head and rad_tail override, if a parant exists.
2006-02-23 14:45:59 +00:00
uiDefButF(block, NUM, B_ARMATUREPANEL1, "HeadRadius:", 10, 130, 140, 19, &ebone->parent->rad_tail, 0, lim, 10, 3, "");
else
uiDefButF(block, NUM, B_ARMATUREPANEL1, "HeadRadius:", 10, 130, 140, 19, &ebone->rad_head, 0, lim, 10, 3, "");
uiBlockEndAlign(block);
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
- added some "Transform Properties" for MetaElem (Metaball in edit mode, N key). It is locx, loxy, locz, dx, dy, dz and stiffness
2004-05-30 14:12:14 +00:00
static void v3d_editmetaball_buts(uiBlock *block, Object *ob, float lim)
{
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
extern MetaElem *lastelem;
- added some items to the MetaBall menu in view3d header - Snap menu - Transform menu - Transform Properties - correction of some typo in drawview.c
2005-01-06 21:27:53 +00:00
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
if(lastelem) {
uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "LocX:", 10, 70, 140, 19, &lastelem->x, -lim, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "LocY:", 10, 50, 140, 19, &lastelem->y, -lim, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "LocZ:", 10, 30, 140, 19, &lastelem->z, -lim, lim, 100, 3, "");
- added some items to the MetaBall menu in view3d header - Snap menu - Transform menu - Transform Properties - correction of some typo in drawview.c
2005-01-06 21:27:53 +00:00
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
uiBlockBeginAlign(block);
if(lastelem->type!=MB_BALL)
active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead). added radius, and type menu to the 3d properties panel.
2006-09-16 04:26:22 +00:00
uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, "");
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE))
active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead). added radius, and type menu to the 3d properties panel.
2006-09-16 04:26:22 +00:00
uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, "");
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE))
active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead). added radius, and type menu to the 3d properties panel.
2006-09-16 04:26:22 +00:00
uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, "");
- added some items to the MetaBall menu in view3d header - Snap menu - Transform menu - Transform Properties - correction of some typo in drawview.c
2005-01-06 21:27:53 +00:00
active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead). added radius, and type menu to the 3d properties panel.
2006-09-16 04:26:22 +00:00
uiBlockEndAlign(block);
- added some items to the MetaBall menu in view3d header - Snap menu - Transform menu - Transform Properties - correction of some typo in drawview.c
2005-01-06 21:27:53 +00:00
active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead). added radius, and type menu to the 3d properties panel.
2006-09-16 04:26:22 +00:00
uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "Radius:", 10, 120, 140, 19, &lastelem->rad, 0, lim, 100, 3, "Size of the active metaball");
uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, 10, 100, 3, "Stiffness of the active metaball");
uiBlockEndAlign(block);
uiDefButS(block, MENU, B_RECALCMBALL, "Type%t|Ball%x0|Tube%x4|Plane%x5|Elipsoid%x6|Cube%x7", 160, 120, 140, 19, &lastelem->type, 0.0, 0.0, 0, 0, "Set active element type");
Bug #1459 New buttons in editmode for mball forgot to check on NULL pointer.
2004-07-21 17:44:44 +00:00
}
- added some "Transform Properties" for MetaElem (Metaball in edit mode, N key). It is locx, loxy, locz, dx, dy, dz and stiffness
2004-05-30 14:12:14 +00:00
}
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
void do_viewbuts(unsigned short event)
{
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
BoundBox *bb;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
View3D *vd;
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
Object *ob= OBACT;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
TransformProperties *tfp= G.vd->properties_storage;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
vd= G.vd;
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
if(vd==NULL) return;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
switch(event) {
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
case B_OBJECTPANEL:
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 1);
break;
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
case B_OBJECTPANELROT:
if(ob) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
ob->rot[0]= M_PI*tfp->ob_eul[0]/180.0;
ob->rot[1]= M_PI*tfp->ob_eul[1]/180.0;
ob->rot[2]= M_PI*tfp->ob_eul[2]/180.0;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
allqueue(REDRAWVIEW3D, 1);
}
break;
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
case B_OBJECTPANELSCALE:
if(ob) {
Bugfix #6078 Transform Properties panel in 3d window: Using TAB on size buttons didn't work well; the code was assuming events with only 1 change per event.
2007-04-09 10:01:46 +00:00
/* link scale; figure out which axis changed */
if (tfp->link_scale) {
float ratio, tmp, max = 0.0;
int axis;
axis = 0;
max = fabs(tfp->ob_scale[0] - ob->size[0]);
tmp = fabs(tfp->ob_scale[1] - ob->size[1]);
if (tmp > max) {
axis = 1;
max = tmp;
}
tmp = fabs(tfp->ob_scale[2] - ob->size[2]);
if (tmp > max) {
axis = 2;
max = tmp;
}
if (ob->size[axis] != tfp->ob_scale[axis]) {
One half of Bug #4320 fixed: The 'linked scale' button in the transform properties panel now handles negative numbers. I don't know how to solve the half of the bug related to the tab key though ... More info here: http://projects.blender.org/tracker/index.php?func=detail&aid=4320&group_id=9&atid=125
2006-06-13 05:19:43 +00:00
if (fabs(ob->size[axis]) > FLT_EPSILON) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
ratio = tfp->ob_scale[axis] / ob->size[axis];
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
ob->size[0] *= ratio;
ob->size[1] *= ratio;
ob->size[2] *= ratio;
}
}
}
Bugfix #6078 Transform Properties panel in 3d window: Using TAB on size buttons didn't work well; the code was assuming events with only 1 change per event.
2007-04-09 10:01:46 +00:00
else {
VECCOPY(ob->size, tfp->ob_scale);
}
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 1);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
}
break;
case B_OBJECTPANELDIMS:
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
bb= object_get_boundbox(ob);
if(bb) {
float old_dims[3], scale[3], ratio, len[3];
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
int axis;
Mat4ToSize(ob->obmat, scale);
len[0] = bb->vec[4][0] - bb->vec[0][0];
len[1] = bb->vec[2][1] - bb->vec[0][1];
len[2] = bb->vec[1][2] - bb->vec[0][2];
old_dims[0] = fabs(scale[0]) * len[0];
old_dims[1] = fabs(scale[1]) * len[1];
old_dims[2] = fabs(scale[2]) * len[2];
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
/* for each axis changed */
for (axis = 0; axis<3; axis++) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
if (fabs(old_dims[axis] - tfp->ob_dims[axis]) > 0.0001) {
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
if (old_dims[axis] > 0.0) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
ratio = tfp->ob_dims[axis] / old_dims[axis];
if (tfp->link_scale) {
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
ob->size[0] *= ratio;
ob->size[1] *= ratio;
ob->size[2] *= ratio;
break;
}
else {
ob->size[axis] *= ratio;
}
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
}
else {
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
if (len[axis] > 0) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
ob->size[axis] = tfp->ob_dims[axis] / len[axis];
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
}
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
}
}
}
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
/* prevent multiple B_OBJECTPANELDIMS events to keep scaling, cycling with TAB on buttons can cause that */
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
VECCOPY(tfp->ob_dims, old_dims);
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 1);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
}
break;
Bug #1003 Using Nkey in 3d window, you could create a parent-loop, which hangs Blender. Added here that it checks loops, as for normal CTRL+P parenting.
2004-04-06 19:16:14 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
case B_OBJECTPANELMEDIAN:
if(ob) {
v3d_editvertex_buts(NULL, ob, 1.0);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
allqueue(REDRAWVIEW3D, 1);
}
break;
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
/* note; this case also used for parbone */
Bug #1003 Using Nkey in 3d window, you could create a parent-loop, which hangs Blender. Added here that it checks loops, as for normal CTRL+P parenting.
2004-04-06 19:16:14 +00:00
case B_OBJECTPANELPARENT:
if(ob) {
Bug 4474 When using the Object buttons (F7) menu to parent an object, a check was missing if object might have been library data.
2006-06-25 17:31:13 +00:00
if(ob->id.lib || test_parent_loop(ob->parent, ob) )
Bug #1003 Using Nkey in 3d window, you could create a parent-loop, which hangs Blender. Added here that it checks loops, as for normal CTRL+P parenting.
2004-04-06 19:16:14 +00:00
ob->parent= NULL;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
else {
DAG_scene_sort(G.scene);
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
}
Bug 4474 When using the Object buttons (F7) menu to parent an object, a check was missing if object might have been library data.
2006-06-25 17:31:13 +00:00
allqueue(REDRAWVIEW3D, 1);
allqueue(REDRAWBUTSOBJECT, 0);
Bugfix #13667: Outliner doesn't update when changing Parent in Transform Properties There was a missing refresh call for the Outliner.
2008-06-08 10:46:30 +00:00
allqueue(REDRAWOOPS, 0);
Bug #1003 Using Nkey in 3d window, you could create a parent-loop, which hangs Blender. Added here that it checks loops, as for normal CTRL+P parenting.
2004-04-06 19:16:14 +00:00
}
break;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
case B_ARMATUREPANEL1:
{
Using NKey panel in 3d window on editmode armature now applies the new 'mirror edit' as well. Including the 'roll'. PLease note that roll values can differ a lot when you have modeled without 'mirror' mode. You can enforce the roll to match by first moving the Bone a little bit, so the other one aligns perfectly.
2005-08-15 14:44:51 +00:00
bArmature *arm= G.obedit->data;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
EditBone *ebone, *child;
for (ebone = G.edbo.first; ebone; ebone=ebone->next){
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if ((ebone->flag & BONE_ACTIVE) && (ebone->layer & arm->layer))
break;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
}
if (ebone) {
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
ebone->roll= M_PI*tfp->ob_eul[0]/180.0;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
// Update our parent
Integration of new IK lib features in Armature Poses. Best is to forget yesterday's commit and old docs. New docs are underway... Here's how IK works now; - IK chains can go all the way to the furthest parent Bone. Disregarding the old option "IK to Parent" and disgregarding whether a Bone has an offset to its parent (offsets now work for IK, so you can also make T-bones). - The old "IK to Parent" option now only does what it should do: it denotes whether a Bone is directly connected to a Parent Bone, or not. In the UI and in code this option is now called "Connected". - You can also define yourself which Bone will become the "Root" for an IK chain. This can be any Parent of the IK tip (where the IK constraint is). By default it goes all the way, unless you set a value for the new IK Constraint Panel option "Chain Lenght". - "Tree IK" now is detected automatic, when multiple IK Roots are on the same Bone, and when there's a branched structure. Multiple IK's on a single chain (no branches) is still executed as usual, doing the IK's sequentially. - Note: Branched structures, with _partial_ overlapping IK chains, that don't share the same Root will possibly disconnect branches. - When you select a Bone with IK, it now draws a yellow dashed line to its Root. - The IK options "Location Weight" and "Rotation Weight" are relative, in case there's a Tree IK structure. These weights cannot be set to zero. To animate or disable IK Targets, use the "Influence" slider. - This new IK is backwards and upwards compatible for Blender files. Of course, the new features won't show in older Blender binaries! :) Other changes & notes; - In PoseMode, the Constraint Panel now also draws in Editing Buttons, next to the Bones Panel. - IK Constraint Panel was redesigned... it's still a bit squished - Buttons "No X DoF" is now called "Lock X". This to follow convention to name options positive. - Added Undo push for Make/Clear Parent in Editmode Armature - Use CTRL+P "Make Parent" on a single selected Bone to make it become connected (ALT+P had already "Disconnect"). On todo next; Visualizing & review of Bone DoF limits and stiffness
2005-08-28 12:23:06 +00:00
if (ebone->parent && ebone->flag & BONE_CONNECTED){
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VECCOPY (ebone->parent->tail, ebone->head);
}
// Update our children if necessary
for (child = G.edbo.first; child; child=child->next){
Integration of new IK lib features in Armature Poses. Best is to forget yesterday's commit and old docs. New docs are underway... Here's how IK works now; - IK chains can go all the way to the furthest parent Bone. Disregarding the old option "IK to Parent" and disgregarding whether a Bone has an offset to its parent (offsets now work for IK, so you can also make T-bones). - The old "IK to Parent" option now only does what it should do: it denotes whether a Bone is directly connected to a Parent Bone, or not. In the UI and in code this option is now called "Connected". - You can also define yourself which Bone will become the "Root" for an IK chain. This can be any Parent of the IK tip (where the IK constraint is). By default it goes all the way, unless you set a value for the new IK Constraint Panel option "Chain Lenght". - "Tree IK" now is detected automatic, when multiple IK Roots are on the same Bone, and when there's a branched structure. Multiple IK's on a single chain (no branches) is still executed as usual, doing the IK's sequentially. - Note: Branched structures, with _partial_ overlapping IK chains, that don't share the same Root will possibly disconnect branches. - When you select a Bone with IK, it now draws a yellow dashed line to its Root. - The IK options "Location Weight" and "Rotation Weight" are relative, in case there's a Tree IK structure. These weights cannot be set to zero. To animate or disable IK Targets, use the "Influence" slider. - This new IK is backwards and upwards compatible for Blender files. Of course, the new features won't show in older Blender binaries! :) Other changes & notes; - In PoseMode, the Constraint Panel now also draws in Editing Buttons, next to the Bones Panel. - IK Constraint Panel was redesigned... it's still a bit squished - Buttons "No X DoF" is now called "Lock X". This to follow convention to name options positive. - Added Undo push for Make/Clear Parent in Editmode Armature - Use CTRL+P "Make Parent" on a single selected Bone to make it become connected (ALT+P had already "Disconnect"). On todo next; Visualizing & review of Bone DoF limits and stiffness
2005-08-28 12:23:06 +00:00
if (child->parent == ebone && (child->flag & BONE_CONNECTED)){
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
VECCOPY (child->head, ebone->tail);
}
}
Using NKey panel in 3d window on editmode armature now applies the new 'mirror edit' as well. Including the 'roll'. PLease note that roll values can differ a lot when you have modeled without 'mirror' mode. You can enforce the roll to match by first moving the Bone a little bit, so the other one aligns perfectly.
2005-08-15 14:44:51 +00:00
if(arm->flag & ARM_MIRROR_EDIT) {
EditBone *eboflip= armature_bone_get_mirrored(ebone);
if(eboflip) {
eboflip->roll= -ebone->roll;
eboflip->head[0]= -ebone->head[0];
eboflip->tail[0]= -ebone->tail[0];
// Update our parent
Integration of new IK lib features in Armature Poses. Best is to forget yesterday's commit and old docs. New docs are underway... Here's how IK works now; - IK chains can go all the way to the furthest parent Bone. Disregarding the old option "IK to Parent" and disgregarding whether a Bone has an offset to its parent (offsets now work for IK, so you can also make T-bones). - The old "IK to Parent" option now only does what it should do: it denotes whether a Bone is directly connected to a Parent Bone, or not. In the UI and in code this option is now called "Connected". - You can also define yourself which Bone will become the "Root" for an IK chain. This can be any Parent of the IK tip (where the IK constraint is). By default it goes all the way, unless you set a value for the new IK Constraint Panel option "Chain Lenght". - "Tree IK" now is detected automatic, when multiple IK Roots are on the same Bone, and when there's a branched structure. Multiple IK's on a single chain (no branches) is still executed as usual, doing the IK's sequentially. - Note: Branched structures, with _partial_ overlapping IK chains, that don't share the same Root will possibly disconnect branches. - When you select a Bone with IK, it now draws a yellow dashed line to its Root. - The IK options "Location Weight" and "Rotation Weight" are relative, in case there's a Tree IK structure. These weights cannot be set to zero. To animate or disable IK Targets, use the "Influence" slider. - This new IK is backwards and upwards compatible for Blender files. Of course, the new features won't show in older Blender binaries! :) Other changes & notes; - In PoseMode, the Constraint Panel now also draws in Editing Buttons, next to the Bones Panel. - IK Constraint Panel was redesigned... it's still a bit squished - Buttons "No X DoF" is now called "Lock X". This to follow convention to name options positive. - Added Undo push for Make/Clear Parent in Editmode Armature - Use CTRL+P "Make Parent" on a single selected Bone to make it become connected (ALT+P had already "Disconnect"). On todo next; Visualizing & review of Bone DoF limits and stiffness
2005-08-28 12:23:06 +00:00
if (eboflip->parent && eboflip->flag & BONE_CONNECTED){
Using NKey panel in 3d window on editmode armature now applies the new 'mirror edit' as well. Including the 'roll'. PLease note that roll values can differ a lot when you have modeled without 'mirror' mode. You can enforce the roll to match by first moving the Bone a little bit, so the other one aligns perfectly.
2005-08-15 14:44:51 +00:00
VECCOPY (eboflip->parent->tail, eboflip->head);
}
// Update our children if necessary
for (child = G.edbo.first; child; child=child->next){
Integration of new IK lib features in Armature Poses. Best is to forget yesterday's commit and old docs. New docs are underway... Here's how IK works now; - IK chains can go all the way to the furthest parent Bone. Disregarding the old option "IK to Parent" and disgregarding whether a Bone has an offset to its parent (offsets now work for IK, so you can also make T-bones). - The old "IK to Parent" option now only does what it should do: it denotes whether a Bone is directly connected to a Parent Bone, or not. In the UI and in code this option is now called "Connected". - You can also define yourself which Bone will become the "Root" for an IK chain. This can be any Parent of the IK tip (where the IK constraint is). By default it goes all the way, unless you set a value for the new IK Constraint Panel option "Chain Lenght". - "Tree IK" now is detected automatic, when multiple IK Roots are on the same Bone, and when there's a branched structure. Multiple IK's on a single chain (no branches) is still executed as usual, doing the IK's sequentially. - Note: Branched structures, with _partial_ overlapping IK chains, that don't share the same Root will possibly disconnect branches. - When you select a Bone with IK, it now draws a yellow dashed line to its Root. - The IK options "Location Weight" and "Rotation Weight" are relative, in case there's a Tree IK structure. These weights cannot be set to zero. To animate or disable IK Targets, use the "Influence" slider. - This new IK is backwards and upwards compatible for Blender files. Of course, the new features won't show in older Blender binaries! :) Other changes & notes; - In PoseMode, the Constraint Panel now also draws in Editing Buttons, next to the Bones Panel. - IK Constraint Panel was redesigned... it's still a bit squished - Buttons "No X DoF" is now called "Lock X". This to follow convention to name options positive. - Added Undo push for Make/Clear Parent in Editmode Armature - Use CTRL+P "Make Parent" on a single selected Bone to make it become connected (ALT+P had already "Disconnect"). On todo next; Visualizing & review of Bone DoF limits and stiffness
2005-08-28 12:23:06 +00:00
if (child->parent == eboflip && (child->flag & BONE_CONNECTED)){
Using NKey panel in 3d window on editmode armature now applies the new 'mirror edit' as well. Including the 'roll'. PLease note that roll values can differ a lot when you have modeled without 'mirror' mode. You can enforce the roll to match by first moving the Bone a little bit, so the other one aligns perfectly.
2005-08-15 14:44:51 +00:00
VECCOPY (child->head, eboflip->tail);
}
}
}
}
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
allqueue(REDRAWVIEW3D, 1);
}
}
break;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
case B_ARMATUREPANEL3: // rotate button on channel
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
{
bArmature *arm;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
bPoseChannel *pchan;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
Bone *bone;
Bugfix #4973 Pose mode; the Nkey "Properties" panel, using TAB to move to next button assigned wrong values to rotation.
2006-09-10 09:18:33 +00:00
float eul[3];
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
arm = get_armature(OBACT);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if (!arm || !ob->pose) return;
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
bone = pchan->bone;
Orange: Made Nkey and info text in 3d window respect Bone Layers.
2005-12-07 23:25:43 +00:00
if(bone && (bone->flag & BONE_ACTIVE) && (bone->layer & arm->layer))
break;
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
}
if (!pchan) return;
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
Bugfix #4973 Pose mode; the Nkey "Properties" panel, using TAB to move to next button assigned wrong values to rotation.
2006-09-10 09:18:33 +00:00
/* make a copy to eul[3], to allow TAB on buttons to work */
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
eul[0]= M_PI*tfp->ob_eul[0]/180.0;
eul[1]= M_PI*tfp->ob_eul[1]/180.0;
eul[2]= M_PI*tfp->ob_eul[2]/180.0;
Bugfix #4973 Pose mode; the Nkey "Properties" panel, using TAB to move to next button assigned wrong values to rotation.
2006-09-10 09:18:33 +00:00
EulToQuat(eul, pchan->quat);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
}
/* no break, pass on */
case B_ARMATUREPANEL2:
{
Orange; stuff for the animation department! - Found the potential crasher for sound playback & undo. Test! - PoseMode: NKey panel didn't work when actions where assigned - NLA: "Add action strip" now displays in menu to which active object the actions are added.
2006-01-03 12:04:05 +00:00
ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);
Killed silly modal PoseMode mode! :) - PoseMode now is a state Armature Objects can be in. So, while in PoseMode for an Armature, you can just select another Object or Armature. - The old PoseMode options (transform, insert keys etc) are accessible with making the Armature Object 'active' (and have object in PoseMode). - At this moment no multiple Poses can be transformed/edited at the same time. - The old hotkey CTRL+TAB, and view3d header menu, still work to set an Object's PoseMode It was quite a lot recode, so tests & reports are welcome. Oh, as a bonus I added Lasso Select for Bones in PoseMode! It selects using only the line between root and tip of the Bone.
2005-07-23 18:52:31 +00:00
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
allqueue(REDRAWVIEW3D, 1);
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
break;
=== Custom Transform Orientation === Custom Orientations can be added with Ctrl-Shift-C (hotkey suggestions are welcomed), this adds and select the new alignment. Custom Orientations can also be added, deleted, selected from the Transform Orientations panel (View -> Transform Orientations). Standard orientations (global, local, normal, view) can also be selected from this panel. If you plan on using only a single custom orientation and don't really need a list, I suggest you use the hotkey as it adds and selects at the same time. Custom Orientations are save in the scene and are selected per 3D view (like normal orientation). Adding from an object, the orientation is a normalized version of the object's orientation. Adding from mesh data, a single element (vertex, edge, face) must be selected in its respective selection mode. Vertex orientation Z-axis is based on the normal, edge Z-axis on the edge itself (X-axis is on the XoY plane when possible, Y-axis is perpendicular to the rest). Face orientation Z-axis is the face normal, X-axis is perpendicular to the first edge, Y-axis is perpendicular to the rest. (More logical orientations can be suggested). I plan to add: 2 vertice (connected or not) => edge orientation , 3 vertice = face orientation Differences from the patch: - orientations no longer link back to the object they came from, everything is copy on creation. - orientations are overwritten based on name (if you add an orientation with the same name as one that already exists, it overwrites the old one)
2008-01-13 18:24:09 +00:00
case B_TRANSFORMSPACEADD:
BIF_manageTransformOrientation(1, 0);
allqueue(REDRAWVIEW3D, 1);
break;
case B_TRANSFORMSPACECLEAR:
BIF_clearTransformOrientation();
allqueue(REDRAWVIEW3D, 1);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
}
=== Custom Transform Orientation === Custom Orientations can be added with Ctrl-Shift-C (hotkey suggestions are welcomed), this adds and select the new alignment. Custom Orientations can also be added, deleted, selected from the Transform Orientations panel (View -> Transform Orientations). Standard orientations (global, local, normal, view) can also be selected from this panel. If you plan on using only a single custom orientation and don't really need a list, I suggest you use the hotkey as it adds and selects at the same time. Custom Orientations are save in the scene and are selected per 3D view (like normal orientation). Adding from an object, the orientation is a normalized version of the object's orientation. Adding from mesh data, a single element (vertex, edge, face) must be selected in its respective selection mode. Vertex orientation Z-axis is based on the normal, edge Z-axis on the edge itself (X-axis is on the XoY plane when possible, Y-axis is perpendicular to the rest). Face orientation Z-axis is the face normal, X-axis is perpendicular to the first edge, Y-axis is perpendicular to the rest. (More logical orientations can be suggested). I plan to add: 2 vertice (connected or not) => edge orientation , 3 vertice = face orientation Differences from the patch: - orientations no longer link back to the object they came from, everything is copy on creation. - orientations are overwritten based on name (if you add an orientation with the same name as one that already exists, it overwrites the old one)
2008-01-13 18:24:09 +00:00
void removeTransformOrientation_func(void *target, void *unused)
{
BIF_removeTransformOrientation((TransformOrientation *) target);
}
void selectTransformOrientation_func(void *target, void *unused)
{
BIF_selectTransformOrientation((TransformOrientation *) target);
}
static void view3d_panel_transform_spaces(short cntrl)
{
ListBase *transform_spaces = &G.scene->transform_spaces;
TransformOrientation *ts = transform_spaces->first;
uiBlock *block;
uiBut *but;
int xco = 20, yco = 70, height = 140;
int index;
block= uiNewBlock(&curarea->uiblocks, "view3d_panel_transform", UI_EMBOSS, UI_HELV, curarea->win);
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
uiSetPanelHandler(VIEW3D_HANDLER_TRANSFORM); // for close and esc
if(uiNewPanel(curarea, block, "Transform Orientations", "View3d", 10, 230, 318, height)==0) return;
uiNewPanelHeight(block, height);
uiBlockBeginAlign(block);
if (G.obedit)
uiDefBut(block, BUT, B_TRANSFORMSPACEADD, "Add", xco,120,80,20, 0, 0, 0, 0, 0, "Add the selected element as a Transform Orientation");
else
uiDefBut(block, BUT, B_TRANSFORMSPACEADD, "Add", xco,120,80,20, 0, 0, 0, 0, 0, "Add the active object as a Transform Orientation");
uiDefBut(block, BUT, B_TRANSFORMSPACECLEAR, "Clear", xco + 80,120,80,20, 0, 0, 0, 0, 0, "Removal all Transform Orientations");
uiBlockEndAlign(block);
Bugfix for Transform Orientation Panel: Removed a pair of uiPanelPush()/uiPanelPop() calls from the Transform Orientation panel, which were causing minor redraw/refresh problems for the panel's buttons here.
2008-01-14 02:49:25 +00:00
=== Custom Transform Orientation === Custom Orientations can be added with Ctrl-Shift-C (hotkey suggestions are welcomed), this adds and select the new alignment. Custom Orientations can also be added, deleted, selected from the Transform Orientations panel (View -> Transform Orientations). Standard orientations (global, local, normal, view) can also be selected from this panel. If you plan on using only a single custom orientation and don't really need a list, I suggest you use the hotkey as it adds and selects at the same time. Custom Orientations are save in the scene and are selected per 3D view (like normal orientation). Adding from an object, the orientation is a normalized version of the object's orientation. Adding from mesh data, a single element (vertex, edge, face) must be selected in its respective selection mode. Vertex orientation Z-axis is based on the normal, edge Z-axis on the edge itself (X-axis is on the XoY plane when possible, Y-axis is perpendicular to the rest). Face orientation Z-axis is the face normal, X-axis is perpendicular to the first edge, Y-axis is perpendicular to the rest. (More logical orientations can be suggested). I plan to add: 2 vertice (connected or not) => edge orientation , 3 vertice = face orientation Differences from the patch: - orientations no longer link back to the object they came from, everything is copy on creation. - orientations are overwritten based on name (if you add an orientation with the same name as one that already exists, it overwrites the old one)
2008-01-13 18:24:09 +00:00
uiBlockBeginAlign(block);
uiDefButS(block, ROW, REDRAWHEADERS, "Global", xco, 90, 40,20, &G.vd->twmode, 5.0, (float)V3D_MANIP_GLOBAL,0, 0, "Global Transform Orientation");
uiDefButS(block, ROW, REDRAWHEADERS, "Local", xco + 40, 90, 40,20, &G.vd->twmode, 5.0, (float)V3D_MANIP_LOCAL, 0, 0, "Local Transform Orientation");
uiDefButS(block, ROW, REDRAWHEADERS, "Normal", xco + 80, 90, 40,20, &G.vd->twmode, 5.0, (float)V3D_MANIP_NORMAL,0, 0, "Normal Transform Orientation");
uiDefButS(block, ROW, REDRAWHEADERS, "View", xco + 120, 90, 40,20, &G.vd->twmode, 5.0, (float)V3D_MANIP_VIEW, 0, 0, "View Transform Orientation");
for (index = V3D_MANIP_CUSTOM, ts = transform_spaces->first ; ts ; ts = ts->next, index++) {
BIF_ThemeColor(TH_BUT_ACTION);
=== Custom Orientations === Change selection icon in the panel to the more appropriate Checkbox icon.
2008-01-28 01:15:21 +00:00
if (G.vd->twmode == index) {
but = uiDefIconButS(block,ROW, REDRAWHEADERS, ICON_CHECKBOX_HLT, xco,yco,XIC,YIC, &G.vd->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
}
else {
but = uiDefIconButS(block,ROW, REDRAWHEADERS, ICON_CHECKBOX_DEHLT, xco,yco,XIC,YIC, &G.vd->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
}
=== Custom Transform Orientation === Custom Orientations can be added with Ctrl-Shift-C (hotkey suggestions are welcomed), this adds and select the new alignment. Custom Orientations can also be added, deleted, selected from the Transform Orientations panel (View -> Transform Orientations). Standard orientations (global, local, normal, view) can also be selected from this panel. If you plan on using only a single custom orientation and don't really need a list, I suggest you use the hotkey as it adds and selects at the same time. Custom Orientations are save in the scene and are selected per 3D view (like normal orientation). Adding from an object, the orientation is a normalized version of the object's orientation. Adding from mesh data, a single element (vertex, edge, face) must be selected in its respective selection mode. Vertex orientation Z-axis is based on the normal, edge Z-axis on the edge itself (X-axis is on the XoY plane when possible, Y-axis is perpendicular to the rest). Face orientation Z-axis is the face normal, X-axis is perpendicular to the first edge, Y-axis is perpendicular to the rest. (More logical orientations can be suggested). I plan to add: 2 vertice (connected or not) => edge orientation , 3 vertice = face orientation Differences from the patch: - orientations no longer link back to the object they came from, everything is copy on creation. - orientations are overwritten based on name (if you add an orientation with the same name as one that already exists, it overwrites the old one)
2008-01-13 18:24:09 +00:00
uiButSetFunc(but, selectTransformOrientation_func, ts, NULL);
uiDefBut(block, TEX, 0, "", xco+=XIC, yco,100+XIC,20, &ts->name, 0, 30, 0, 0, "Edits the name of this Transform Orientation");
but = uiDefIconBut(block, BUT, REDRAWVIEW3D, ICON_X, xco+=100+XIC,yco,XIC,YIC, 0, 0, 0, 0, 0, "Deletes this Transform Orientation");
uiButSetFunc(but, removeTransformOrientation_func, ts, NULL);
xco = 20;
yco -= 25;
}
uiBlockEndAlign(block);
if(yco < 0) uiNewPanelHeight(block, height-yco);
}
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
static void view3d_panel_object(short cntrl) // VIEW3D_HANDLER_OBJECT
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
{
uiBlock *block;
Sorry sorry... new feature while in freeze mode, bad bad bad! But this was promised on conference, and have to keep that promise. :) Buttons in Blender now allow copy/paste values and strings. Also works for object names! Mouse over button and press CTRL+C or CTRL+V for copy/paste (Macs can do Apple key) Plus bugfix: name button for object in Nkey panel didn't check name
2004-11-08 22:10:20 +00:00
uiBut *bt;
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
Object *ob= OBACT;
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
TransformProperties *tfp;
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
float lim;
Beware, coded between 10 phone calls and 20 sudden surprises, but I still hope it's somehow usable :-) Colourpicker update: ------------------- 1) Converted numbuts to sliders and made the colourpicker wider. Sliders are more useful for something like RGB and HSV because they're fixed range values 2) Added a hex button for entering HTML-like color (#RRGGBB, can be entered both with and without the hash sign). This should completely replace the former strange NKEY functionality in buttonswindows, and even add hex support for buttons which didn't have it before. Please test thoroughly, I never coded something in a hurry like this. There are small rounding errors still... Maybe someone finds the reason? :)
2005-10-04 21:23:19 +00:00
static char hexcol[128];
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
if(ob==NULL) return;
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
/* make sure we got storage */
if(G.vd->properties_storage==NULL)
G.vd->properties_storage= MEM_callocN(sizeof(TransformProperties), "TransformProperties");
tfp= G.vd->properties_storage;
Another mega commit... loadsof restructure, and a pretty good one! :) - changed the BIF_DrawString() function. it used to work different for AA fonts as for default fonts. Now it's identical. Setting color for fonts can just be done with OpenGL, for both font types. Removed: BIF_DrawStringRGB() - added theme color options for Buttons - recoded DefButton, so it automatically chooses the right color. - had to remove a 1000 uiBlockSetCol() calls for that reason... - uiBlockSetCol() still works, to override automatic color - removed entirely the silly old color system (BIFColorID). All color calls can now be done with a BIF_ThemeColor() call, including fonts and buttons and opengl stuff - all buttons in button header have headercolor by default - recoded drawing icons, it was a really bad & old loop doing manually colorshading and blending... which was per pixel a load of code! Now it uses a single OpenGL call to blend or colorize. Quite faster! - (as test, for review) icons don't colorize anymore with button color, but have a different alpha to blend in (when not active) - recoded the entire interface_draw.c file...: - drawing buttons is separated in three parts: 1. main drawing function for text and icons 2. free definable callback for button itself 3. free definable callback for slider - removed a load of redundant code for this! - coded a minimal theme, and adjusted Matt's buttons to match new callback system - adding new drawing themes is piece of cake now - for coders, default 'themes' to be aware of: UI_EMBOSS : the themable drawing style UI_EMBOSSP: the pulldown menu system (apart from color not themable) UI_EMBOSSN: draw nothing, only text and/or icon UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call. TODO: make UI API call for button alignment (plus removed another series of warnings from code...) Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
2003-10-20 15:40:20 +00:00
block= uiNewBlock(&curarea->uiblocks, "view3d_panel_object", UI_EMBOSS, UI_HELV, curarea->win);
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
uiSetPanelHandler(VIEW3D_HANDLER_OBJECT); // for close and esc
- calculation of position within HSVCUBE button (picker) had wrong Y coordinate, only noticable in Panel versions of picker - the fix to give Transform properties new name "Paint" can't work with this code... this due to fact that panel positions are saved in files or looked up on re-open based on their names. Giving the Panel a new new name then causes it jump to another position, and back on end of painting. Needs to be solved in another way. Not feasible for 2.34...
2004-07-31 22:05:46 +00:00
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
if((G.f & G_SCULPTMODE) && !G.obedit) {
== Sculpt Mode == Applying Stephan Kassemeyer's patch (#6750) to add a curve modifier for sculpting. A few changes from the patch: * The default curve is closer to the old behavior * Fixed loading files already saved in sculpt mode * Changed the interface; split the brush texture controls off into a third sculpt tab, and put the curve (and curve reset) into the Brush tab.
2007-12-20 19:07:47 +00:00
if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 234))
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
return;
} else if(G.f & G_PARTICLEEDIT && !G.obedit){
if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 234))
return;
} else {
if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204))
return;
}
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
new function object_is_libdata - checks ob->id.lib but also accounts for proxy's. Object panels were using object_data_is_libdata, which meant linked obdata could not have object settings changed. curve2tree - option to face leaves up or down - random pitch and roll options - place 2 leaves on a point for denser leaves - random seed entry so you can get reproducible results
2007-11-27 19:23:26 +00:00
uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
Fixed various errors with Blender allowing editing Library linked data. CTRL+V on buttons NKEY Panels join mesh join curve editing buttons boolean vpaint faceselect Manipulator Also; Transform() got in useless loop when you entered without anything selected. Not sure why Martin recoded it this way... maybe as a first step to handlerify it? For evil Python Aussie Bosses? :P
2005-05-12 19:17:12 +00:00
Changes to "Face Select" mode * Does not indicate that UV's exist, nor does it add UV's when used. * Only accessible for texturepaint, vertexpaint and weightpaint from a button in the header (Paint Selection Mask) * Not accessible from the mode menu, this is only an option that applies to paint modes. This dosnt effect DNA, face select (G_FACESELECT) can be enabled at any time but is only used when paint modes are enabled. Other changes * UKey is uv unwrap in editmode, Ukey for undo was editmode only anyway. * UVCalc in editmode adds a UV Layer if there is not one alredy. * texture draw in editmode does not draw the face dots (they are get in the way of texturing) * some missing updates were added. * removed manipulator from when paint modes are enabled since the manipulator is not drawn in the 3d view.
2007-09-10 19:32:44 +00:00
if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT|G_WEIGHTPAINT)) {
Fix for new UI system and vertexpaint/faceselect/weightpaint/texturepaint If backbuffer is in use for selection codes, the system switches back to frontbuffer drawing temporally. Is easier solution now. Next commit; fix for new 'zbuffer clipped selection', which also doesnt work after using a pulldown or popup menu.
2004-10-03 20:02:22 +00:00
uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER); // force old style frontbuffer draw
}
else {
the input fields for data name had an inconsistant limit for input fields, making it hard to fix problems with library linking when a name changed. some were 18, most 19, and others 21. made all 21 since this is the real limit. Also new image name limit length of input field to 21 (was 255 but shortened to 21) The one place this could be useful is if somebody names a metaball with a 21 char name, the copy will not use the motherball. but this is not as bad as having to use the python console for fixing library linking problems.
2007-04-11 17:10:57 +00:00
bt= uiDefBut(block, TEX, B_IDNAME, "OB: ", 10,180,140,20, ob->id.name+2, 0.0, 21.0, 0, 0, "");
Huge commit: VERSE - All code is in #ifdef ... #endif - Only make build system is supported and you have to add: export WITH_VERSE=true to user-def.mk file - Blender can share only mesh objects and bitmaps now - More informations can be found at wiki: http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlender http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlenderUserDoc I hope, that I didn't forget at anything
2006-08-20 15:22:56 +00:00
#ifdef WITH_VERSE
if(ob->vnode) uiButSetFunc(bt, test_and_send_idbutton_cb, ob, ob->id.name);
else uiButSetFunc(bt, test_idbutton_cb, ob->id.name, NULL);
#else
Sorry sorry... new feature while in freeze mode, bad bad bad! But this was promised on conference, and have to keep that promise. :) Buttons in Blender now allow copy/paste values and strings. Also works for object names! Mouse over button and press CTRL+C or CTRL+V for copy/paste (Macs can do Apple key) Plus bugfix: name button for object in Nkey panel didn't check name
2004-11-08 22:10:20 +00:00
uiButSetFunc(bt, test_idbutton_cb, ob->id.name, NULL);
Huge commit: VERSE - All code is in #ifdef ... #endif - Only make build system is supported and you have to add: export WITH_VERSE=true to user-def.mk file - Blender can share only mesh objects and bitmaps now - More informations can be found at wiki: http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlender http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlenderUserDoc I hope, that I didn't forget at anything
2006-08-20 15:22:56 +00:00
#endif
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
if((G.f & G_PARTICLEEDIT)==0) {
uiBlockBeginAlign(block);
uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_OBJECTPANELPARENT, "Par:", 160, 180, 140, 20, &ob->parent, "Parent Object");
if((ob->parent) && (ob->partype == PARBONE)) {
bt= uiDefBut(block, TEX, B_OBJECTPANELPARENT, "ParBone:", 160, 160, 140, 20, ob->parsubstr, 0, 30, 0, 0, "");
uiButSetCompleteFunc(bt, autocomplete_bone, (void *)ob->parent);
}
else {
strcpy(ob->parsubstr, "");
}
uiBlockEndAlign(block);
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
}
Added colorpicker in Panel for: - Transform properties 3d win, while Vertex/Texture paint is on - Paint panel in UV window Note; both use the same GVP struct to store current color in. Also the function used now to add picker isn't complete... might need further thinking over. Consult me when you like them in more places.
2004-07-10 17:40:40 +00:00
}
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
Bugfix #2999. Nkey buttons had a limit for input of 1000.0. That's not much... made it 10 times larger, to match the max zoom level. Nevertheless; on our ancient todo is that we once should give number buttons 2 limits. One for the actual min/max values, and one for the best sliding experience (matching zoom level or distance for example).
2005-09-11 11:03:09 +00:00
lim= 10000.0f*MAX2(1.0, G.vd->grid);
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
if(ob==G.obedit) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
if(ob->type==OB_ARMATURE) v3d_editarmature_buts(block, ob, lim);
- added some "Transform Properties" for MetaElem (Metaball in edit mode, N key). It is locx, loxy, locz, dx, dy, dz and stiffness
2004-05-30 14:12:14 +00:00
if(ob->type==OB_MBALL) v3d_editmetaball_buts(block, ob, lim);
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
else v3d_editvertex_buts(block, ob, lim);
}
Killed silly modal PoseMode mode! :) - PoseMode now is a state Armature Objects can be in. So, while in PoseMode for an Armature, you can just select another Object or Armature. - The old PoseMode options (transform, insert keys etc) are accessible with making the Armature Object 'active' (and have object in PoseMode). - At this moment no multiple Poses can be transformed/edited at the same time. - The old hotkey CTRL+TAB, and view3d header menu, still work to set an Object's PoseMode It was quite a lot recode, so tests & reports are welcome. Oh, as a bonus I added Lasso Select for Bones in PoseMode! It selects using only the line between root and tip of the Bone.
2005-07-23 18:52:31 +00:00
else if(ob->flag & OB_POSEMODE) {
- added buttons for NKEY menu editmode curve, nurbs, armature - same for PoseMode
2003-10-28 16:26:51 +00:00
v3d_posearmature_buts(block, ob, lim);
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
draw the right pannel when weughtpaint+vcol modes are on at the same time. (was drawing the vcol panel in wp mode) it may be good to not allow both modes at once.
2006-12-29 13:13:17 +00:00
else if(G.f & G_WEIGHTPAINT) {
uiNewPanelTitle(block, "Weight Paint Properties");
weight_paint_buttons(block);
}
Added colorpicker in Panel for: - Transform properties 3d win, while Vertex/Texture paint is on - Paint panel in UV window Note; both use the same GVP struct to store current color in. Also the function used now to add picker isn't complete... might need further thinking over. Consult me when you like them in more places.
2004-07-10 17:40:40 +00:00
else if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT)) {
extern VPaint Gvp; /* from vpaint */
static float hsv[3], old[3]; // used as temp mem for picker
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
float *rgb= NULL;
ToolSettings *settings= G.scene->toolsettings;
if(G.f & G_VERTEXPAINT) rgb= &Gvp.r;
else if(settings->imapaint.brush) rgb= settings->imapaint.brush->rgb;
New stuff: - Weight paint options now also show in Nkey panel - added uiNewPanelTitle() in interface API to rename panels. In use now for the Nkey panel title. (Note: original name is identifier, do not change that)
2006-11-16 20:55:11 +00:00
uiNewPanelTitle(block, "Paint Properties");
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
if (rgb)
/* 'f' is for floating panel */
uiBlockPickerButtons(block, rgb, hsv, old, hexcol, 'f', REDRAWBUTSEDIT);
Added colorpicker in Panel for: - Transform properties 3d win, while Vertex/Texture paint is on - Paint panel in UV window Note; both use the same GVP struct to store current color in. Also the function used now to add picker isn't complete... might need further thinking over. Consult me when you like them in more places.
2004-07-10 17:40:40 +00:00
}
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
else if(G.f & G_SCULPTMODE) {
New stuff: - Weight paint options now also show in Nkey panel - added uiNewPanelTitle() in interface API to rename panels. In use now for the Nkey panel title. (Note: original name is identifier, do not change that)
2006-11-16 20:55:11 +00:00
uiNewPanelTitle(block, "Sculpt Properties");
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
sculptmode_draw_interface_tools(block,10,150);
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
} else if(G.f & G_PARTICLEEDIT){
uiNewPanelTitle(block, "Particle Edit Properties");
particle_edit_buttons(block);
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
} else {
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
BoundBox *bb = NULL;
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCX, REDRAWVIEW3D, ICON_UNLOCKED, 10,150,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANEL, "LocX:", 30, 150, 120, 19, &(ob->loc[0]), -lim, lim, 100, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCY, REDRAWVIEW3D, ICON_UNLOCKED, 10,130,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANEL, "LocY:", 30, 130, 120, 19, &(ob->loc[1]), -lim, lim, 100, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_LOCZ, REDRAWVIEW3D, ICON_UNLOCKED, 10,110,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANEL, "LocZ:", 30, 110, 120, 19, &(ob->loc[2]), -lim, lim, 100, 3, "");
More stats-junk stuff! Added in Nkey panel (transform properties) option to show in editmode at choice the global or local coordinate values. Same option works for the "Tech draw" options. :)
2005-04-29 18:43:17 +00:00
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->ob_eul[0]= 180.0*ob->rot[0]/M_PI;
tfp->ob_eul[1]= 180.0*ob->rot[1]/M_PI;
tfp->ob_eul[2]= 180.0*ob->rot[2]/M_PI;
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
if ((ob->parent) && (ob->partype == PARBONE)) {
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTX, REDRAWVIEW3D, ICON_UNLOCKED, 160,130,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotX:", 180, 130, 120, 19, &(tfp->ob_eul[0]), -lim, lim, 1000, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTY, REDRAWVIEW3D, ICON_UNLOCKED, 160,110,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotY:", 180, 110, 120, 19, &(tfp->ob_eul[1]), -lim, lim, 1000, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTZ, REDRAWVIEW3D, ICON_UNLOCKED, 160,90,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotZ:", 180, 90, 120, 19, &(tfp->ob_eul[2]), -lim, lim, 1000, 3, "");
}
else {
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTX, REDRAWVIEW3D, ICON_UNLOCKED, 160,150,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotX:", 180, 150, 120, 19, &(tfp->ob_eul[0]), -lim, lim, 1000, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTY, REDRAWVIEW3D, ICON_UNLOCKED, 160,130,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotY:", 180, 130, 120, 19, &(tfp->ob_eul[1]), -lim, lim, 1000, 3, "");
uiDefIconButBitS(block, ICONTOG, OB_LOCK_ROTZ, REDRAWVIEW3D, ICON_UNLOCKED, 160,110,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
uiDefButF(block, NUM, B_OBJECTPANELROT, "RotZ:", 180, 110, 120, 19, &(tfp->ob_eul[2]), -lim, lim, 1000, 3, "");
}
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->ob_scale[0]= ob->size[0];
tfp->ob_scale[1]= ob->size[1];
tfp->ob_scale[2]= ob->size[2];
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
- Bug fix: at osx, default AA font couldnt be written in .b.blend (unless you manually install font) - Bug fix: string for AA font was only 64 chars... made 256. - Changed API for buttons aligning... it now detects automatic what rows are, or collums, and aligns buttons. This makes call easier: uiBlockBeginAlign(block); ... defBut.... uiBlockEndAlign(block); Only works when you provide buttons in row order! - made sure only 'rounded' theme uses this align stuff - still work in progress.. I commit now because I leave to denmark for 2 days! http://www.blender.org/bf/rt.jpg <- now also groups with rows+collums
2003-11-14 15:49:26 +00:00
uiBlockBeginAlign(block);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEX, REDRAWVIEW3D, ICON_UNLOCKED, 10,80,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELSCALE, "ScaleX:", 30, 80, 120, 19, &(tfp->ob_scale[0]), -lim, lim, 10, 3, "");
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEY, REDRAWVIEW3D, ICON_UNLOCKED, 10,60,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELSCALE, "ScaleY:", 30, 60, 120, 19, &(tfp->ob_scale[1]), -lim, lim, 10, 3, "");
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEZ, REDRAWVIEW3D, ICON_UNLOCKED, 10,40,20,19, &(ob->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButF(block, NUM, B_OBJECTPANELSCALE, "ScaleZ:", 30, 40, 120, 19, &(tfp->ob_scale[2]), -lim, lim, 10, 3, "");
- Added button align code: uiBlockBeginAlign(block, 'v'); 'v'= vertical. 'h'=horizontal ..... (button def calls) uiBlockEndAlign(block); this will allow new themes to have buttons nicely drawn together. - added new rounded draw theme, to test & illustrate the above. - only did parts of button code with align... rest for later - fixed 'minimal' theme to make it usable (with some decoration) - put back 'oldskool' theme... but it just looks plain ugly! remove? Lazy people: http://www.blender.org/bf/rt.jpg check the top header, or Nkey menu, to see the meaning of 'align'.
2003-11-14 00:44:48 +00:00
uiBlockEndAlign(block);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
uiDefButS(block, TOG, REDRAWVIEW3D, "Link Scale", 10, 10, 140, 19, &(tfp->link_scale), 0, 1, 0, 0, "Scale values vary proportionally in all directions");
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
Bugfix #4329 New "Dimension" button: when using TAB to cycle over buttons, the dimension event was sent multiple times, accumulating scaling. The code was also not prepared to handle multiple changes at one event. Also: added object_get_boundbox(Object *ob) in BKE_object.h, so the code now really supports most primitives in Blender.
2006-06-14 08:50:41 +00:00
bb= object_get_boundbox(ob);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
if (bb) {
float scale[3];
Mat4ToSize(ob->obmat, scale);
Bugfix #5313 3D Window "Transform properties" was using bad globals for buttons, this caused things not work with multiple 3d windows open, and (in editmode) set one panel to "Local" and the other to "Global". Also: - added undo push for moving bone to a layer - protected Ikey for posemode to not show a menu without selection
2006-11-27 15:23:21 +00:00
tfp->ob_dims[0] = fabs(scale[0]) * (bb->vec[4][0] - bb->vec[0][0]);
tfp->ob_dims[1] = fabs(scale[1]) * (bb->vec[2][1] - bb->vec[0][1]);
tfp->ob_dims[2] = fabs(scale[2]) * (bb->vec[1][2] - bb->vec[0][2]);
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiBlockBeginAlign(block);
Patch #6140 Transform Properties panel in 3d window. New button "Parbone" showing when parent relation is to a specific bone. This information was nowhere reveiled in the UI until now. Code remark: The code isn't getting more beautiful now with all if() options added. The idea to move the rotation buttons down when a parent bone was set isn't very good, buttons should stay as much as possible on the same location. However, I dont have time for a solution either...
2007-04-09 11:43:46 +00:00
if ((ob->parent) && (ob->partype == PARBONE)) {
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimX:", 160, 60, 140, 19, &(tfp->ob_dims[0]), 0.0, lim, 10, 3, "Manipulate bounding box size");
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimY:", 160, 40, 140, 19, &(tfp->ob_dims[1]), 0.0, lim, 10, 3, "Manipulate bounding box size");
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimZ:", 160, 20, 140, 19, &(tfp->ob_dims[2]), 0.0, lim, 10, 3, "Manipulate bounding box size");
}
else {
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimX:", 160, 80, 140, 19, &(tfp->ob_dims[0]), 0.0, lim, 10, 3, "Manipulate bounding box size");
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimY:", 160, 60, 140, 19, &(tfp->ob_dims[1]), 0.0, lim, 10, 3, "Manipulate bounding box size");
uiDefButF(block, NUM, B_OBJECTPANELDIMS, "DimZ:", 160, 40, 140, 19, &(tfp->ob_dims[2]), 0.0, lim, 10, 3, "Manipulate bounding box size");
}
Last minute patch from Chris Want Nkey "Properties Panel" now has Dimension ("Dim") buttons too. This reads from the actual bounding box value to see the size. Note that dimensions for animated & deformed objects will change per frame. (Cleaned up buttons layout for patch, and added support for Curve, Text and Surface objects)
2006-06-12 20:01:18 +00:00
uiBlockEndAlign(block);
}
- added Theme for File Window - made grid drawing using the main theme color - was annoyed with the primitive grid... so coded something that allows zooming in and out a 100fold without losing gridlines - brought back 'NKEY' for mesh editmode - added to this a 'median' option; when more vertices selected you see the average coordinate. works nice when inputting values as well (todo: make this for other editmodes) - renamed the 'NKEY' panel to 'Transform Properties', also fixed in pulldown menu. I am off for the rest of the day. More committing fun tomorrow! -Ton-
2003-10-18 12:21:41 +00:00
}
Fixed various errors with Blender allowing editing Library linked data. CTRL+V on buttons NKEY Panels join mesh join curve editing buttons boolean vpaint faceselect Manipulator Also; Transform() got in useless loop when you entered without anything selected. Not sure why Martin recoded it this way... maybe as a first step to handlerify it? For evil Python Aussie Bosses? :P
2005-05-12 19:17:12 +00:00
uiClearButLock();
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
}
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
Two stupid fixes for warnings: First one was for drawview.c I gave some types to things that didn't have them example -static void view3d_panel_background(cntrl) // VIEW3D_HANDLER_BACKGROUND +static void view3d_panel_background(short cntrl) // VIEW3D_HANDLER_BACKGR For edit.c I added a newline to the end of the file. Weee Kent
2004-06-29 20:34:10 +00:00
static void view3d_panel_background(short cntrl) // VIEW3D_HANDLER_BACKGROUND
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
{
uiBlock *block;
View3D *vd;
vd= G.vd;
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
block= uiNewBlock(&curarea->uiblocks, "view3d_panel_background", UI_EMBOSS, UI_HELV, curarea->win);
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
uiSetPanelHandler(VIEW3D_HANDLER_BACKGROUND); // for close and esc
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
if(uiNewPanel(curarea, block, "Background Image", "View3d", 340, 10, 318, 204)==0) return;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
Changes to "Face Select" mode * Does not indicate that UV's exist, nor does it add UV's when used. * Only accessible for texturepaint, vertexpaint and weightpaint from a button in the header (Paint Selection Mask) * Not accessible from the mode menu, this is only an option that applies to paint modes. This dosnt effect DNA, face select (G_FACESELECT) can be enabled at any time but is only used when paint modes are enabled. Other changes * UKey is uv unwrap in editmode, Ukey for undo was editmode only anyway. * UVCalc in editmode adds a UV Layer if there is not one alredy. * texture draw in editmode does not draw the face dots (they are get in the way of texturing) * some missing updates were added. * removed manipulator from when paint modes are enabled since the manipulator is not drawn in the 3d view.
2007-09-10 19:32:44 +00:00
if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT) {
Fix for new UI system and vertexpaint/faceselect/weightpaint/texturepaint If backbuffer is in use for selection codes, the system switches back to frontbuffer drawing temporally. Is easier solution now. Next commit; fix for new 'zbuffer clipped selection', which also doesnt work after using a pulldown or popup menu.
2004-10-03 20:02:22 +00:00
uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER); // force old style frontbuffer draw
}
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
if(vd->flag & V3D_DISPBGPIC) {
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
if(vd->bgpic==NULL) {
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
vd->bgpic= MEM_callocN(sizeof(BGpic), "bgpic");
vd->bgpic->size= 5.0;
vd->bgpic->blend= 0.5;
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
vd->bgpic->iuser.fie_ima= 2;
vd->bgpic->iuser.ok= 1;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
}
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
if(!(vd->flag & V3D_DISPBGPIC)) {
superficial changes, button alignment and minor tooltip changes. sculpt mode moved the ParBone button when it didnt need to.
2007-08-14 05:01:39 +00:00
uiDefButBitS(block, TOG, V3D_DISPBGPIC, B_REDR, "Use Background Image", 10, 180, 150, 20, &vd->flag, 0, 0, 0, 0, "Display an image in the background of this 3D View");
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
uiDefBut(block, LABEL, 1, " ", 160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
}
else {
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
uiBlockBeginAlign(block);
superficial changes, button alignment and minor tooltip changes. sculpt mode moved the ParBone button when it didnt need to.
2007-08-14 05:01:39 +00:00
uiDefButBitS(block, TOG, V3D_DISPBGPIC, B_REDR, "Use", 10, 225, 50, 20, &vd->flag, 0, 0, 0, 0, "Display an image in the background of this 3D View");
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
uiDefButF(block, NUMSLI, B_REDR, "Blend:", 60, 225, 150, 20, &vd->bgpic->blend, 0.0,1.0, 0, 0, "Set the transparency of the background image");
uiDefButF(block, NUM, B_REDR, "Size:", 210, 225, 100, 20, &vd->bgpic->size, 0.1, 250.0*vd->grid, 100, 0, "Set the size (width) of the background image");
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
uiDefButF(block, NUM, B_REDR, "X Offset:", 10, 205, 150, 20, &vd->bgpic->xof, -250.0*vd->grid,250.0*vd->grid, 10, 2, "Set the horizontal offset of the background image");
uiDefButF(block, NUM, B_REDR, "Y Offset:", 160, 205, 150, 20, &vd->bgpic->yof, -250.0*vd->grid,250.0*vd->grid, 10, 2, "Set the vertical offset of the background image");
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
The Big Image refactor! Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
2006-12-20 17:57:56 +00:00
uiblock_image_panel(block, &vd->bgpic->ima, &vd->bgpic->iuser, B_REDR, B_REDR);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
}
Two stupid fixes for warnings: First one was for drawview.c I gave some types to things that didn't have them example -static void view3d_panel_background(cntrl) // VIEW3D_HANDLER_BACKGROUND +static void view3d_panel_background(short cntrl) // VIEW3D_HANDLER_BACKGR For edit.c I added a newline to the end of the file. Weee Kent
2004-06-29 20:34:10 +00:00
static void view3d_panel_properties(short cntrl) // VIEW3D_HANDLER_SETTINGS
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
{
uiBlock *block;
View3D *vd;
Added new selection outline as option in View->View Properties panel. And while working there added 3d cursor there as well. I admit it isn't the best location ever, but let's do the threaded discussions after 2.34 is out. :)
2004-07-28 13:21:27 +00:00
float *curs;
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
vd= G.vd;
block= uiNewBlock(&curarea->uiblocks, "view3d_panel_properties", UI_EMBOSS, UI_HELV, curarea->win);
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
uiSetPanelHandler(VIEW3D_HANDLER_PROPERTIES); // for close and esc
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
if(uiNewPanel(curarea, block, "View Properties", "View3d", 340, 30, 318, 254)==0) return;
/* to force height */
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiNewPanelHeight(block, 264);
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
Fix for new UI system and vertexpaint/faceselect/weightpaint/texturepaint If backbuffer is in use for selection codes, the system switches back to frontbuffer drawing temporally. Is easier solution now. Next commit; fix for new 'zbuffer clipped selection', which also doesnt work after using a pulldown or popup menu.
2004-10-03 20:02:22 +00:00
if(G.f & (G_VERTEXPAINT|G_FACESELECT|G_TEXTUREPAINT|G_WEIGHTPAINT)) {
uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER); // force old style frontbuffer draw
}
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefBut(block, LABEL, 1, "Grid:", 10, 220, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
uiBlockBeginAlign(block);
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefButF(block, NUM, REDRAWVIEW3D, "Spacing:", 10, 200, 140, 19, &vd->grid, 0.001, 100.0, 10, 0, "Set the distance between grid lines");
superficial changes, button alignment and minor tooltip changes. sculpt mode moved the ParBone button when it didnt need to.
2007-08-14 05:01:39 +00:00
uiDefButS(block, NUM, REDRAWVIEW3D, "Lines:", 10, 180, 140, 19, &vd->gridlines, 0.0, 100.0, 100, 0, "Set the number of grid lines in perspective view");
gridsubdiv was not initialized properly
2007-10-08 17:37:04 +00:00
uiDefButS(block, NUM, REDRAWVIEW3D, "Divisions:", 10, 160, 140, 19, &vd->gridsubdiv, 1.0, 100.0, 100, 0, "Set the number of grid lines");
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
uiBlockEndAlign(block);
Fixed up the layout and language of the View Properties Panel. (reminder: http://www.blender3d.org/cms/Language_and_terminology.338.0.html )
2004-07-29 02:25:10 +00:00
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefBut(block, LABEL, 1, "3D Display:", 160, 220, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
uiDefButBitS(block, TOG, V3D_SHOW_FLOOR, REDRAWVIEW3D, "Grid Floor",160, 200, 150, 19, &vd->gridflag, 0, 0, 0, 0, "Show the grid floor in free camera mode");
uiDefButBitS(block, TOG, V3D_SHOW_X, REDRAWVIEW3D, "X Axis", 160, 176, 48, 19, &vd->gridflag, 0, 0, 0, 0, "Show the X Axis line");
uiDefButBitS(block, TOG, V3D_SHOW_Y, REDRAWVIEW3D, "Y Axis", 212, 176, 48, 19, &vd->gridflag, 0, 0, 0, 0, "Show the Y Axis line");
uiDefButBitS(block, TOG, V3D_SHOW_Z, REDRAWVIEW3D, "Z Axis", 262, 176, 48, 19, &vd->gridflag, 0, 0, 0, 0, "Show the Z Axis line");
* Preferences for displaying the grid floor, X axis, Y axis, Z axis. (ported from tuhopuu2) Controls are found in the 3D View Properties panel (with the rest of the grid settings). This is more flexible for people like me who hate the grid getting in the way when modelling - turning off the grid floor and turning on the Z axis gives a setup like in Wings 3D or Clay. * Cleaned up the 3D View Properties and Background Image panel's layout while I was adding the new buttons (including change over to UiDefButBit).
2004-01-24 05:06:12 +00:00
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
uiDefBut(block, LABEL, 1, "View Camera:", 10, 140, 140, 19, NULL, 0.0, 0.0, 0, 0, "");
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
== 3D View == Customizable Grid Subdivisions This commit adds a numbut to the View Properties panel that lets you specify how the grid is subdivided. This affects snapping in translations, obviously. Default: 10 (behavior doesn't change) That means people still stuck in feet and inches (shudders) can set it to 12 and have 1 unit = 1 foot. That also means you can work in "heads" when doing body proportions or whatnot (don't think of it as being limite to "CAD" uses).
2006-10-25 23:34:24 +00:00
uiDefButF(block, NUM, REDRAWVIEW3D, "Lens:", 10, 120, 140, 19, &vd->lens, 10.0, 120.0, 100, 0, "The lens angle in perspective view");
Fixed up the layout and language of the View Properties Panel. (reminder: http://www.blender3d.org/cms/Language_and_terminology.338.0.html )
2004-07-29 02:25:10 +00:00
uiBlockBeginAlign(block);
Armature Proxy bugfix: synchronizing the pose went wrong when the proxy had new dependencies added internally (like constraints), changing the evaluation order for pose channels. My optimized code didn't like it, so now it falls back to a reliable slower method. Bug showed as totally messed up characters for proxies... Also: increased range for 3D Window properties clip-start/end, this is still a bad construct though...
2006-12-13 08:50:11 +00:00
uiDefButF(block, NUM, REDRAWVIEW3D, "Clip Start:", 10, 96, 140, 19, &vd->near, vd->grid/100.0, 100.0, 10, 0, "Set the beginning of the range in which 3D objects are displayed (perspective view)");
uiDefButF(block, NUM, REDRAWVIEW3D, "Clip End:", 10, 76, 140, 19, &vd->far, 1.0, 10000.0*vd->grid, 100, 0, "Set the end of the range in which 3D objects are displayed (perspective view)");
Added new selection outline as option in View->View Properties panel. And while working there added 3d cursor there as well. I admit it isn't the best location ever, but let's do the threaded discussions after 2.34 is out. :)
2004-07-28 13:21:27 +00:00
uiBlockEndAlign(block);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefBut(block, LABEL, 1, "3D Cursor:", 160, 150, 140, 19, NULL, 0.0, 0.0, 0, 0, "");
Added new selection outline as option in View->View Properties panel. And while working there added 3d cursor there as well. I admit it isn't the best location ever, but let's do the threaded discussions after 2.34 is out. :)
2004-07-28 13:21:27 +00:00
uiBlockBeginAlign(block);
curs= give_cursor();
Armature Proxy bugfix: synchronizing the pose went wrong when the proxy had new dependencies added internally (like constraints), changing the evaluation order for pose channels. My optimized code didn't like it, so now it falls back to a reliable slower method. Bug showed as totally messed up characters for proxies... Also: increased range for 3D Window properties clip-start/end, this is still a bad construct though...
2006-12-13 08:50:11 +00:00
uiDefButF(block, NUM, REDRAWVIEW3D, "X:", 160, 130, 150, 22, curs, -10000.0*vd->grid, 10000.0*vd->grid, 10, 0, "X co-ordinate of the 3D cursor");
uiDefButF(block, NUM, REDRAWVIEW3D, "Y:", 160, 108, 150, 22, curs+1, -10000.0*vd->grid, 10000.0*vd->grid, 10, 0, "Y co-ordinate of the 3D cursor");
uiDefButF(block, NUM, REDRAWVIEW3D, "Z:", 160, 86, 150, 22, curs+2, -10000.0*vd->grid, 10000.0*vd->grid, 10, 0, "Z co-ordinate of the 3D cursor");
Added new selection outline as option in View->View Properties panel. And while working there added 3d cursor there as well. I admit it isn't the best location ever, but let's do the threaded discussions after 2.34 is out. :)
2004-07-28 13:21:27 +00:00
uiBlockEndAlign(block);
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefBut(block, LABEL, 1, "Display:", 10, 50, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiBlockBeginAlign(block);
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
uiDefButBitS(block, TOG, V3D_SELECT_OUTLINE, REDRAWVIEW3D, "Outline Selected", 10, 30, 140, 19, &vd->flag, 0, 0, 0, 0, "Highlight selected objects with an outline, in Solid, Shaded or Textured viewport shading modes");
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiDefButBitS(block, TOG, V3D_DRAW_CENTERS, REDRAWVIEW3D, "All Object Centers", 10, 10, 140, 19, &vd->flag, 0, 0, 0, 0, "Draw the center points on all objects");
uiDefButBitS(block, TOGN, V3D_HIDE_HELPLINES, REDRAWVIEW3D, "Relationship Lines", 10, -10, 140, 19, &vd->flag, 0, 0, 0, 0, "Draw dashed lines indicating Parent, Constraint, or Hook relationships");
new view option, SolidTex, to draw textures in solid mode. In the view panel as well as the shortcut Shift+T this works in editmode as well as object mode giving results like this http://members.optusnet.com.au/cjbarton/temp1.jpg where before you could only see textures in textured draw type like this http://members.optusnet.com.au/cjbarton/temp2.jpg
2007-09-15 18:12:16 +00:00
uiDefButBitS(block, TOG, V3D_SOLID_TEX, REDRAWVIEW3D, "Solid Tex", 10, -30, 140, 19, &vd->flag2, 0, 0, 0, 0, "Display textures in Solid draw type (Shift T)");
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiBlockEndAlign(block);
Orange: Added an option in View Properties panel to disable drawing of 'relationship lines' - i.e. the dashed lines that connect objects in parent/constraint/hook/IK relationships. After talking to the others I rolled the Armature-specific one into the same setting for simplicity's sake. We can see how it goes, always possible to put it back.
2006-01-11 14:44:23 +00:00
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiDefBut(block, LABEL, 1, "View Locking:", 160, 50, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
uiBlockBeginAlign(block);
superficial changes, button alignment and minor tooltip changes. sculpt mode moved the ParBone button when it didnt need to.
2007-08-14 05:01:39 +00:00
uiDefIDPoinBut(block, test_obpoin_but, ID_OB, REDRAWVIEW3D, "Object:", 160, 30, 140, 19, &vd->ob_centre, "Lock view to center to this Object");
Long wanted feature for animators: option to lock a view to always show a specific object, so you can see long walkcycles or actions well. Option is per 3d window, in "View Properties" panel. It also can optional lock a view to a single bone even! Temporal movie for fun: http://www.blender.org/bf/0001_0060.avi
2006-11-07 15:47:10 +00:00
uiDefBut(block, TEX, REDRAWVIEW3D, "Bone:", 160, 10, 140, 19, vd->ob_centre_bone, 1, 31, 0, 0, "If view locked to Object, use this Bone to lock to view to");
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
static void view3d_panel_preview(ScrArea *sa, short cntrl) // VIEW3D_HANDLER_PREVIEW
{
uiBlock *block;
View3D *v3d= sa->spacedata.first;
int ofsx, ofsy;
block= uiNewBlock(&sa->uiblocks, "view3d_panel_preview", UI_EMBOSS, UI_HELV, sa->win);
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | UI_PNL_SCALE | cntrl);
uiSetPanelHandler(VIEW3D_HANDLER_PREVIEW); // for close and esc
ofsx= -150+(sa->winx/2)/v3d->blockscale;
ofsy= -100+(sa->winy/2)/v3d->blockscale;
if(uiNewPanel(sa, block, "Preview", "View3d", ofsx, ofsy, 300, 200)==0) return;
uiBlockSetDrawExtraFunc(block, BIF_view3d_previewdraw);
if(G.scene->recalc & SCE_PRV_CHANGED) {
G.scene->recalc &= ~SCE_PRV_CHANGED;
//printf("found recalc\n");
New: - ZTransp render now also delivers Z values and Speed vectors in passes Note that speed vectors accumulate within a pixel to store the minimum, so rendering ztransp on top of a non-moving plane won't give speed... Best results you get is by rendering it in a separate layer. The Z value stored is the closest visible transparent face in the pixel. Fixes: - Render to 'spare page' has been enabled again. Because of the strict separation of Render and UI, but especially because a 'render result' now can consist of unlimited images, I've not made this a Render feature. Instead, the render-window itself stores the 'spare' image... I also had to change the convention for it a bit. Now, instead of having two "render buffers" (which was a render feature), the RenderWindow will store each previous frame on a re-render. This storing will only start after you've pressed 'Jkey' once, but then always will happen for as long the rendered image is same size as previously. For clarity, I've also renamed the window title, to 'previous frame'. - RenderWindow shows alpha again on Akey - Display of the Zvalues in ImageWindow has been tweaked. White now denotes closest, and the color range goes from camera clip-sta to clip-end. - Bugfix: on splitting/merging/duplicating windows, the 3D Previewrender was not always freed correctly, potentially causing crashes or memory leaks.
2006-02-08 16:51:09 +00:00
BIF_view3d_previewrender_free(sa->spacedata.first);
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
BIF_preview_changed(0);
}
}
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
static void view3d_blockhandlers(ScrArea *sa)
{
View3D *v3d= sa->spacedata.first;
short a;
Added Panel support in Sequence window, and converted old Nkey menu for it.
2004-06-16 20:25:56 +00:00
/* warning; blocks need to be freed each time, handlers dont remove */
- further work on view3d panels: - you can close them (x icon) or press ESC - option to open panel at mouse location (try Nkey) - using 'collapse' (triangle icon) stows header in bottom - opening again restores at old location - dragging panels or zooming clips nicely with window evaluate: an 'auto close' when mouse goes outside panel Warning: vertex selecting still broken! :) It's 2 am now, bedtime...
2003-10-16 00:17:24 +00:00
uiFreeBlocksWin(&sa->uiblocks, sa->win);
added a glDisable(GL_DEPTH_TEST); before the UI drawing because face select and wp mode were drawing mesh data over the UI.
2006-05-02 07:55:26 +00:00
/*uv face-sel and wp mode when mixed with wire leave depth enabled causing
models to draw over the UI */
glDisable(GL_DEPTH_TEST);
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
for(a=0; a<SPACE_MAXHANDLER; a+=2) {
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
switch(v3d->blockhandler[a]) {
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
case VIEW3D_HANDLER_PROPERTIES:
view3d_panel_properties(v3d->blockhandler[a+1]);
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
break;
Split the 'background and settings' panel in 3d window in 2 parts. Instructions for how to add panels there: - add a handler define code in BIF_space.h - create a menu item that invokes a add_blockhandler() - add to view3d_blockhandlers() the correct handler for it - plus create a panel itself, just copy one... it needs some stuff to get working, docs for that are for later
2003-10-25 22:03:19 +00:00
case VIEW3D_HANDLER_BACKGROUND:
view3d_panel_background(v3d->blockhandler[a+1]);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
break;
case VIEW3D_HANDLER_OBJECT:
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
view3d_panel_object(v3d->blockhandler[a+1]);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
break;
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
case VIEW3D_HANDLER_PREVIEW:
view3d_panel_preview(sa, v3d->blockhandler[a+1]);
Modified sculpt/multires UI: * Changed multires panel's width to the default * Removed floating multires panel * Made multires panel always visible (in EditButtons) * Moved Make/Delete [multires] button into the multires panel * Moved the two sculpt panels into tabs of the multires panel * Removed two extra sculptmode buttons from view header
2006-11-07 20:55:09 +00:00
break;
=== Custom Transform Orientation === Custom Orientations can be added with Ctrl-Shift-C (hotkey suggestions are welcomed), this adds and select the new alignment. Custom Orientations can also be added, deleted, selected from the Transform Orientations panel (View -> Transform Orientations). Standard orientations (global, local, normal, view) can also be selected from this panel. If you plan on using only a single custom orientation and don't really need a list, I suggest you use the hotkey as it adds and selects at the same time. Custom Orientations are save in the scene and are selected per 3D view (like normal orientation). Adding from an object, the orientation is a normalized version of the object's orientation. Adding from mesh data, a single element (vertex, edge, face) must be selected in its respective selection mode. Vertex orientation Z-axis is based on the normal, edge Z-axis on the edge itself (X-axis is on the XoY plane when possible, Y-axis is perpendicular to the rest). Face orientation Z-axis is the face normal, X-axis is perpendicular to the first edge, Y-axis is perpendicular to the rest. (More logical orientations can be suggested). I plan to add: 2 vertice (connected or not) => edge orientation , 3 vertice = face orientation Differences from the patch: - orientations no longer link back to the object they came from, everything is copy on creation. - orientations are overwritten based on name (if you add an orientation with the same name as one that already exists, it overwrites the old one)
2008-01-13 18:24:09 +00:00
case VIEW3D_HANDLER_TRANSFORM:
view3d_panel_transform_spaces(v3d->blockhandler[a+1]);
break;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
- More code for handling Panels in other windows. Added the 'Nkey' object menu as Panel now. Live updates, whoohoo! closing them, minimizing, etc will follow. first bring back vertex selection :)
2003-10-15 16:01:08 +00:00
/* clear action value for event */
v3d->blockhandler[a+1]= 0;
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
}
uiDrawBlocksPanels(sa, 0);
}
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
/* ****************** View3d afterdraw *************** */
typedef struct View3DAfter {
struct View3DAfter *next, *prev;
struct Base *base;
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
int type, flag;
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
} View3DAfter;
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
/* temp storage of Objects that need to be drawn as last */
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
void add_view3d_after(View3D *v3d, Base *base, int type, int flag)
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
{
View3DAfter *v3da= MEM_callocN(sizeof(View3DAfter), "View 3d after");
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
BLI_addtail(&v3d->afterdraw, v3da);
v3da->base= base;
v3da->type= type;
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
v3da->flag= flag;
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
}
/* clears zbuffer and draws it over */
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
static void view3d_draw_xray(View3D *v3d)
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
{
View3DAfter *v3da, *next;
int doit= 0;
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
for(v3da= v3d->afterdraw.first; v3da; v3da= v3da->next)
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
if(v3da->type==V3D_XRAY) doit= 1;
if(doit) {
if(v3d->zbuf) glClear(GL_DEPTH_BUFFER_BIT);
v3d->xray= TRUE;
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
next= v3da->next;
if(v3da->type==V3D_XRAY) {
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
draw_object(v3da->base, v3da->flag);
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
BLI_remlink(&v3d->afterdraw, v3da);
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
MEM_freeN(v3da);
}
}
v3d->xray= FALSE;
}
}
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
/* disables write in zbuffer and draws it over */
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
static void view3d_draw_transp(View3D *v3d)
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
{
View3DAfter *v3da, *next;
glDepthMask(0);
v3d->transp= TRUE;
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
next= v3da->next;
if(v3da->type==V3D_TRANSP) {
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
draw_object(v3da->base, v3da->flag);
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
BLI_remlink(&v3d->afterdraw, v3da);
MEM_freeN(v3da);
}
}
v3d->transp= FALSE;
glDepthMask(1);
}
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
/* *********************** */
split draw_dupli_objects into 2 functions (draw_dupli_objects and draw_dupli_objects_color) so when a dupli is drawn from a set, its selection state wont make it draw selected. draw_dupli_objects works the same as before
2007-04-12 07:59:14 +00:00
/*
In most cases call draw_dupli_objects,
draw_dupli_objects_color was added because when drawing set dupli's
we need to force the color
*/
static void draw_dupli_objects_color(View3D *v3d, Base *base, int color)
{
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
ListBase *lb;
DupliObject *dob;
Base tbase;
Duplicator feature: Vertex/Face/Frame duplication now draws using OpenGL display lists. Makes drawing go much faster (2-5 times, depending on size of duplicated object). This system uses boundbox checks too, so outside of view it draws faster. Note for face duplication: I've fixe a bug for incorrect alignment when the parent was rotated when a parenting happened, the 'inverse parent correction matrix' then messed up alignment. For face duplication it now works OK, but for vertex-dupli not... need a way to fix this backwards compatible.
2006-11-29 12:44:48 +00:00
BoundBox *bb= NULL;
GLuint displist=0;
Composite & Pass render goodies: - New Passes: UV and Rad(iosity) - New Nodes: UV Map and Index Mask - Z-combine now is antialiased As usual, please check the log. Has nice pics! http://www.blender3d.org/cms/Composite__UV_Map__ID.830.0.html For devs: the antialias code from Vector Blur is now exported in compo too. Works pretty good. Even fixed a bug in antialias, so vectorblur will be better. Also: found out that OpenGL display list speedup accidentally was still triggered with the rt button... so it did not work by default.
2006-12-10 20:30:15 +00:00
short transflag, use_displist= -1; /* -1 is initialize */
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
char dt, dtx;
* Dupli objects (dupliverts, dupligroup, etc) now get invisibility based on their parent object, not the original instantiated objects. i.e, if an object is invisible, its child dupli objects will be too.
2006-11-21 03:22:34 +00:00
if (base->object->restrictflag & OB_RESTRICT_VIEW) return;
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
tbase.flag= OB_FROMDUPLI|base->flag;
lb= object_duplilist(G.scene, base->object);
for(dob= lb->first; dob; dob= dob->next) {
Fixes in commit for Group Proxy feature; - Groups with hidden parts didn't render OK - Layer buttons sent out wrong events
2006-11-14 20:41:38 +00:00
if(dob->no_draw);
else {
tbase.object= dob->ob;
/* extra service: draw the duplicator in drawtype of parent */
dt= tbase.object->dt; tbase.object->dt= base->object->dt;
dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
/* negative scale flag has to propagate */
transflag= tbase.object->transflag;
if(base->object->transflag & OB_NEG_SCALE)
tbase.object->transflag ^= OB_NEG_SCALE;
BIF_ThemeColorBlend(color, TH_BACK, 0.5);
Duplicator feature: Vertex/Face/Frame duplication now draws using OpenGL display lists. Makes drawing go much faster (2-5 times, depending on size of duplicated object). This system uses boundbox checks too, so outside of view it draws faster. Note for face duplication: I've fixe a bug for incorrect alignment when the parent was rotated when a parenting happened, the 'inverse parent correction matrix' then messed up alignment. For face duplication it now works OK, but for vertex-dupli not... need a way to fix this backwards compatible.
2006-11-29 12:44:48 +00:00
/* generate displist, test for new object */
if(use_displist==1 && dob->prev && dob->prev->ob!=dob->ob) {
use_displist= -1;
glDeleteLists(displist, 1);
}
/* generate displist */
if(use_displist == -1) {
Bugfix #5560 Dupliverted Lamps did not draw in the 3D window anymore. Caused by OpenGL displaylist optimize which cannot work for lamps... (yet)
2007-01-07 14:20:17 +00:00
/* lamp drawing messes with matrices, could be handled smarter... but this works */
- Make dupliverts inside a dupligroup render and draw as instances. - Possible fix for a dupli render memory leak, but i'm not sure.
2008-01-04 17:48:07 +00:00
if(dob->ob->type==OB_LAMP || dob->type==OB_DUPLIGROUP)
Bugfix #5560 Dupliverted Lamps did not draw in the 3D window anymore. Caused by OpenGL displaylist optimize which cannot work for lamps... (yet)
2007-01-07 14:20:17 +00:00
use_displist= 0;
else {
/* disable boundbox check for list creation */
object_boundbox_flag(dob->ob, OB_BB_DISABLED, 1);
/* need this for next part of code */
bb= object_get_boundbox(dob->ob);
Mat4One(dob->ob->obmat); /* obmat gets restored */
displist= glGenLists(1);
glNewList(displist, GL_COMPILE);
draw_object(&tbase, DRAW_CONSTCOLOR);
glEndList();
use_displist= 1;
object_boundbox_flag(dob->ob, OB_BB_DISABLED, 0);
}
Duplicator feature: Vertex/Face/Frame duplication now draws using OpenGL display lists. Makes drawing go much faster (2-5 times, depending on size of duplicated object). This system uses boundbox checks too, so outside of view it draws faster. Note for face duplication: I've fixe a bug for incorrect alignment when the parent was rotated when a parenting happened, the 'inverse parent correction matrix' then messed up alignment. For face duplication it now works OK, but for vertex-dupli not... need a way to fix this backwards compatible.
2006-11-29 12:44:48 +00:00
}
if(use_displist) {
mymultmatrix(dob->mat);
if(boundbox_clip(dob->mat, bb))
glCallList(displist);
myloadmatrix(G.vd->viewmat);
}
else {
Mat4CpyMat4(dob->ob->obmat, dob->mat);
draw_object(&tbase, DRAW_CONSTCOLOR);
}
Fixes in commit for Group Proxy feature; - Groups with hidden parts didn't render OK - Layer buttons sent out wrong events
2006-11-14 20:41:38 +00:00
tbase.object->dt= dt;
tbase.object->dtx= dtx;
tbase.object->transflag= transflag;
}
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
}
Complex issue in group duplicators... since they can duplicate entire animation systems, all transforms of all duplicated group members have to be set first, before drawing or converting for render. This because then still deformation can be calculated.
2006-02-28 20:43:21 +00:00
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
/* Transp afterdraw disabled, afterdraw only stores base pointers, and duplis can be same obj */
Complex issue in group duplicators... since they can duplicate entire animation systems, all transforms of all duplicated group members have to be set first, before drawing or converting for render. This because then still deformation can be calculated.
2006-02-28 20:43:21 +00:00
free_object_duplilist(lb); /* does restore */
Duplicator feature: Vertex/Face/Frame duplication now draws using OpenGL display lists. Makes drawing go much faster (2-5 times, depending on size of duplicated object). This system uses boundbox checks too, so outside of view it draws faster. Note for face duplication: I've fixe a bug for incorrect alignment when the parent was rotated when a parenting happened, the 'inverse parent correction matrix' then messed up alignment. For face duplication it now works OK, but for vertex-dupli not... need a way to fix this backwards compatible.
2006-11-29 12:44:48 +00:00
if(use_displist)
glDeleteLists(displist, 1);
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
}
split draw_dupli_objects into 2 functions (draw_dupli_objects and draw_dupli_objects_color) so when a dupli is drawn from a set, its selection state wont make it draw selected. draw_dupli_objects works the same as before
2007-04-12 07:59:14 +00:00
static void draw_dupli_objects(View3D *v3d, Base *base)
{
/* define the color here so draw_dupli_objects_color can be called
* from the set loop */
int color= (base->flag & SELECT)?TH_SELECT:TH_WIRE;
/* debug */
if(base->object->dup_group && base->object->dup_group->id.us<1)
color= TH_REDALERT;
draw_dupli_objects_color(v3d, base, color);
}
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
void view3d_update_depths(View3D *v3d)
{
/* Create storage for, and, if necessary, copy depth buffer */
if(!v3d->depths) v3d->depths= MEM_callocN(sizeof(ViewDepths),"ViewDepths");
if(v3d->depths) {
ViewDepths *d= v3d->depths;
if(d->w != v3d->area->winx ||
Fixed bug #5610, Sculpt mode stops working suddenly (after reloading file), was caused by reading the zbuffer after it had been cleared for drawing xray objects.
2007-01-06 19:46:33 +00:00
d->h != v3d->area->winy ||
!d->depths) {
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
d->w= v3d->area->winx;
d->h= v3d->area->winy;
if(d->depths)
MEM_freeN(d->depths);
d->depths= MEM_mallocN(sizeof(float)*d->w*d->h,"View depths");
d->damaged= 1;
}
if(d->damaged) {
glReadPixels(v3d->area->winrct.xmin,v3d->area->winrct.ymin,d->w,d->h,
GL_DEPTH_COMPONENT,GL_FLOAT, d->depths);
glGetDoublev(GL_DEPTH_RANGE,d->depth_range);
d->damaged= 0;
}
}
}
Fixed bug #6870, Sculpt mode + wireframe = nothing When sculpt object is in wireframe mode (including if the current view is in wireframe mode) a second copy is drawn only to the depth buffer so that sculpting can take place as normal.
2007-12-08 21:53:17 +00:00
/* Enable sculpting in wireframe mode by drawing sculpt object only to the depth buffer */
static void draw_sculpt_depths(View3D *v3d)
{
Object *ob = OBACT;
int dt= MIN2(v3d->drawtype, ob->dt);
if(v3d->zbuf==0 && dt>OB_WIRE)
dt= OB_WIRE;
if(dt == OB_WIRE) {
GLboolean depth_on;
int orig_vdt = v3d->drawtype;
int orig_zbuf = v3d->zbuf;
int orig_odt = ob->dt;
glGetBooleanv(GL_DEPTH_TEST, &depth_on);
v3d->drawtype = ob->dt = OB_SOLID;
v3d->zbuf = 1;
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
glEnable(GL_DEPTH_TEST);
draw_object(BASACT, 0);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
if(!depth_on)
glDisable(GL_DEPTH_TEST);
v3d->drawtype = orig_vdt;
v3d->zbuf = orig_zbuf;
ob->dt = orig_odt;
}
}
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
void draw_depth(ScrArea *sa, void *spacedata)
{
View3D *v3d= spacedata;
Base *base;
Scene *sce;
use Z depth for the ortho border zoom also, if there is no depth values set then fallback to previous method.
2008-03-21 17:13:35 +00:00
short zbuf, flag;
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.
2008-03-21 16:27:43 +00:00
float glalphaclip;
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
/* temp set drawtype to solid */
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.
2008-03-21 16:27:43 +00:00
/* Setting these temporarily is not nice */
Objects with transp and xray work with border zoom (shift+b), zooming behind an object to one with xray now works, transp objects work like normal objects.
2008-03-20 21:43:32 +00:00
zbuf = v3d->zbuf;
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.
2008-03-21 16:27:43 +00:00
flag = v3d->flag;
glalphaclip = U.glalphaclip;
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.
2008-03-21 16:27:43 +00:00
U.glalphaclip = 0.5; /* not that nice but means we wont zoom into billboards */
v3d->flag &= ~V3D_SELECT_OUTLINE;
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
setwinmatrixview3d(sa->winx, sa->winy, NULL); /* 0= no pick rect */
setviewmatrixview3d(); /* note: calls where_is_object for camera... */
Mat4MulMat4(v3d->persmat, v3d->viewmat, sa->winmat);
Mat4Invert(v3d->persinv, v3d->persmat);
Mat4Invert(v3d->viewinv, v3d->viewmat);
glClear(GL_DEPTH_BUFFER_BIT);
myloadmatrix(v3d->viewmat);
persp(PERSP_STORE); // store correct view for persp(PERSP_VIEW) calls
if(v3d->flag & V3D_CLIPPING) {
view3d_set_clipping(v3d);
}
v3d->zbuf= TRUE;
glEnable(GL_DEPTH_TEST);
/* draw set first */
if(G.scene->set) {
for(SETLOOPER(G.scene->set, base)) {
if(v3d->lay & base->lay) {
Objects with transp and xray work with border zoom (shift+b), zooming behind an object to one with xray now works, transp objects work like normal objects.
2008-03-20 21:43:32 +00:00
draw_object(base, 0);
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
if(base->object->transflag & OB_DUPLI) {
draw_dupli_objects_color(v3d, base, TH_WIRE);
}
}
}
}
for(base= G.scene->base.first; base; base= base->next) {
if(v3d->lay & base->lay) {
/* dupli drawing */
if(base->object->transflag & OB_DUPLI) {
draw_dupli_objects(v3d, base);
}
draw_object(base, 0);
}
}
Objects with transp and xray work with border zoom (shift+b), zooming behind an object to one with xray now works, transp objects work like normal objects.
2008-03-20 21:43:32 +00:00
/* this isnt that nice, draw xray objects as if they are normal */
if (v3d->afterdraw.first) {
View3DAfter *v3da, *next;
int num = 0;
v3d->xray= TRUE;
glDepthFunc(GL_ALWAYS); /* always write into the depth bufer, overwriting front z values */
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
next= v3da->next;
if(v3da->type==V3D_XRAY) {
draw_object(v3da->base, 0);
num++;
}
/* dont remove this time */
}
v3d->xray= FALSE;
glDepthFunc(GL_LEQUAL); /* Now write the depth buffer normally */
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
next= v3da->next;
if(v3da->type==V3D_XRAY) {
v3d->xray= TRUE; v3d->transp= FALSE;
} else if (v3da->type==V3D_TRANSP) {
v3d->xray= FALSE; v3d->transp= TRUE;
}
draw_object(v3da->base, 0); /* Draw Xray or Transp objects normally */
BLI_remlink(&v3d->afterdraw, v3da);
MEM_freeN(v3da);
}
v3d->xray= FALSE;
v3d->transp= FALSE;
}
v3d->zbuf = zbuf;
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.
2008-03-21 16:27:43 +00:00
U.glalphaclip = glalphaclip;
v3d->flag = flag;
shift+b zoom in perspective mode, (apricot feature for better navigation on large maps)
2008-03-20 20:03:13 +00:00
}
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
static void draw_viewport_fps(ScrArea *sa);
for button popups, dont close unless you click or press escape, this would often close when dragging a button value (or when using a tablet I am told)
2007-12-11 23:05:10 +00:00
Update space dispatch: - drawXXXspace, changeXXXspace, and winqreadXXXspace now receive the area and spacedata as explicit arguments, allowing them to access private data w/o going through globals. - pass the new BWinEvent through to the winqreadXXXspace, allowing future access to extended event data. Removed direct calls to winqreadXXXspace to simulate user actions, replaced by calls to action functions in edit.c or the appropriate handler.
2003-03-24 01:46:05 +00:00
void drawview3dspace(ScrArea *sa, void *spacedata)
Initial revision
2002-10-12 11:37:38 +00:00
{
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
View3D *v3d= spacedata;
Initial revision
2002-10-12 11:37:38 +00:00
Base *base;
Object *ob;
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
Scene *sce;
Attempted fix for bug #8441: editing in particle mode with limit visible enabled is really slow on some cards. Cause might be the large number of calls to glReadPixels, now it uses the same system as sculpt to store the depths once, code was already there for the case those depths were available, it just wasn't storing them.
2008-03-13 10:27:35 +00:00
char retopo, sculptparticle;
Sculptmode bugfix: use actual active object to check when to update zbuffer data when drawing with xray objects.
2007-01-09 03:00:58 +00:00
Object *obact = OBACT;
Initial revision
2002-10-12 11:37:38 +00:00
Bugfix #4214 Dependency order issue: Camera view was calculated before Camera Object got evaluated for dependency changes, causing lags.
2006-05-23 14:57:40 +00:00
/* update all objects, ipos, matrices, displists, etc. Flags set by depgraph or manual,
no layer check here, gets correct flushed */
Bugfix, report from studio Manos; This tweaks the dependency rules for Scenes/Objects a bit. Here is the rule: - Each Scene has own dependency graph, and only solves dependencies for objects in the scene - However, when using multiple linked Scene-sets, the *current* scene is allowed to have dependencies to objects in a 'set'. This works by first calculating the sets, then the current scene. Example: the current scene can have lights with a track/location constraint to a character in a set.
2007-01-31 10:59:39 +00:00
/* sets first, we allow per definition current scene to have dependencies on sets */
if(G.scene->set) {
for(SETLOOPER(G.scene->set, base))
object_handle_update(base->object); // bke_object.h
Bugfix #4214 Dependency order issue: Camera view was calculated before Camera Object got evaluated for dependency changes, causing lags.
2006-05-23 14:57:40 +00:00
}
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
Bugfix, report from studio Manos; This tweaks the dependency rules for Scenes/Objects a bit. Here is the rule: - Each Scene has own dependency graph, and only solves dependencies for objects in the scene - However, when using multiple linked Scene-sets, the *current* scene is allowed to have dependencies to objects in a 'set'. This works by first calculating the sets, then the current scene. Example: the current scene can have lights with a track/location constraint to a character in a set.
2007-01-31 10:59:39 +00:00
for(base= G.scene->base.first; base; base= base->next)
object_handle_update(base->object); // bke_object.h
Bugfix #4214 Dependency order issue: Camera view was calculated before Camera Object got evaluated for dependency changes, causing lags.
2006-05-23 14:57:40 +00:00
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
setwinmatrixview3d(sa->winx, sa->winy, NULL); /* 0= no pick rect */
Added correct call to have curve paths calculated, when the anim system discovers it wasn't done yet. Needs displist now, not calc-path. :) Solves reported bug in regression file bowl.blend (camera didnt move) and errors in NLA stride paths.
2005-07-26 09:21:20 +00:00
setviewmatrixview3d(); /* note: calls where_is_object for camera... */
Initial revision
2002-10-12 11:37:38 +00:00
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
Mat4MulMat4(v3d->persmat, v3d->viewmat, sa->winmat);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
Mat4Invert(v3d->persinv, v3d->persmat);
Mat4Invert(v3d->viewinv, v3d->viewmat);
Initial revision
2002-10-12 11:37:38 +00:00
Finally switched to porting UI stuff from tuhopuu! This commit is based on the patch & cool design work of Matt. It includes the new Lamp drawing style, and replaces the Object center dots with a similar styled OpenGL drawn dot. Important side-note is that removing the old glDrawPixels() for centers or lamps will not only make Blender faster, but also prevents crashing on a couple of cheaper 3d cards (as reported for S3 and Intel on-board cards) Notes: - The new default only draws Object centers when selected or active. If you like to see them always, use the View Properties Panel. You can also save that in the .B.blend - The size for centers (and lamps) is in the User settings "View & Controls" - Unselected Lamps, and their offset lines from zero Z, are drawn in a new Theme color Changes and additions in Matt's patch: - Lamps and centers are drawn fixed size, in pixels. Also the 'sun' lamp draws screen aligned now. - Center dots now also draw in blue to denote Library linkage or to show that an Object has been linked to other scenes. - When objects are empty (no vertices) they will always draw a center dot. Otherwise these objects would never be selectable anymore! - Added theme setting for center size, and initialization - Removed the old redundant code for drawing centers - Cleanup of drawing routines, made center dots faster - Started removing calls to glBlendFunc(). Regular alpha drawing should become standard, and the (very) occasional exception should return this to default after usage.
2005-11-19 10:55:07 +00:00
/* calculate pixelsize factor once, is used for lamps and obcenters */
{
float len1, len2, vec[3];
VECCOPY(vec, v3d->persinv[0]);
moved source and text to american spelling * colour -> color * centre -> center * normalise -> normalize * modelling -> modeling
2007-04-04 13:18:41 +00:00
len1= Normalize(vec);
Finally switched to porting UI stuff from tuhopuu! This commit is based on the patch & cool design work of Matt. It includes the new Lamp drawing style, and replaces the Object center dots with a similar styled OpenGL drawn dot. Important side-note is that removing the old glDrawPixels() for centers or lamps will not only make Blender faster, but also prevents crashing on a couple of cheaper 3d cards (as reported for S3 and Intel on-board cards) Notes: - The new default only draws Object centers when selected or active. If you like to see them always, use the View Properties Panel. You can also save that in the .B.blend - The size for centers (and lamps) is in the User settings "View & Controls" - Unselected Lamps, and their offset lines from zero Z, are drawn in a new Theme color Changes and additions in Matt's patch: - Lamps and centers are drawn fixed size, in pixels. Also the 'sun' lamp draws screen aligned now. - Center dots now also draw in blue to denote Library linkage or to show that an Object has been linked to other scenes. - When objects are empty (no vertices) they will always draw a center dot. Otherwise these objects would never be selectable anymore! - Added theme setting for center size, and initialization - Removed the old redundant code for drawing centers - Cleanup of drawing routines, made center dots faster - Started removing calls to glBlendFunc(). Regular alpha drawing should become standard, and the (very) occasional exception should return this to default after usage.
2005-11-19 10:55:07 +00:00
VECCOPY(vec, v3d->persinv[1]);
moved source and text to american spelling * colour -> color * centre -> center * normalise -> normalize * modelling -> modeling
2007-04-04 13:18:41 +00:00
len2= Normalize(vec);
Finally switched to porting UI stuff from tuhopuu! This commit is based on the patch & cool design work of Matt. It includes the new Lamp drawing style, and replaces the Object center dots with a similar styled OpenGL drawn dot. Important side-note is that removing the old glDrawPixels() for centers or lamps will not only make Blender faster, but also prevents crashing on a couple of cheaper 3d cards (as reported for S3 and Intel on-board cards) Notes: - The new default only draws Object centers when selected or active. If you like to see them always, use the View Properties Panel. You can also save that in the .B.blend - The size for centers (and lamps) is in the User settings "View & Controls" - Unselected Lamps, and their offset lines from zero Z, are drawn in a new Theme color Changes and additions in Matt's patch: - Lamps and centers are drawn fixed size, in pixels. Also the 'sun' lamp draws screen aligned now. - Center dots now also draw in blue to denote Library linkage or to show that an Object has been linked to other scenes. - When objects are empty (no vertices) they will always draw a center dot. Otherwise these objects would never be selectable anymore! - Added theme setting for center size, and initialization - Removed the old redundant code for drawing centers - Cleanup of drawing routines, made center dots faster - Started removing calls to glBlendFunc(). Regular alpha drawing should become standard, and the (very) occasional exception should return this to default after usage.
2005-11-19 10:55:07 +00:00
v3d->pixsize= 2.0f*(len1>len2?len1:len2);
/* correct for window size */
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
if(sa->winx > sa->winy) v3d->pixsize/= (float)sa->winx;
Finally switched to porting UI stuff from tuhopuu! This commit is based on the patch & cool design work of Matt. It includes the new Lamp drawing style, and replaces the Object center dots with a similar styled OpenGL drawn dot. Important side-note is that removing the old glDrawPixels() for centers or lamps will not only make Blender faster, but also prevents crashing on a couple of cheaper 3d cards (as reported for S3 and Intel on-board cards) Notes: - The new default only draws Object centers when selected or active. If you like to see them always, use the View Properties Panel. You can also save that in the .B.blend - The size for centers (and lamps) is in the User settings "View & Controls" - Unselected Lamps, and their offset lines from zero Z, are drawn in a new Theme color Changes and additions in Matt's patch: - Lamps and centers are drawn fixed size, in pixels. Also the 'sun' lamp draws screen aligned now. - Center dots now also draw in blue to denote Library linkage or to show that an Object has been linked to other scenes. - When objects are empty (no vertices) they will always draw a center dot. Otherwise these objects would never be selectable anymore! - Added theme setting for center size, and initialization - Removed the old redundant code for drawing centers - Cleanup of drawing routines, made center dots faster - Started removing calls to glBlendFunc(). Regular alpha drawing should become standard, and the (very) occasional exception should return this to default after usage.
2005-11-19 10:55:07 +00:00
else v3d->pixsize/= (float)sa->winy;
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->drawtype > OB_WIRE) {
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(G.f & G_SIMULATION)
Initial revision
2002-10-12 11:37:38 +00:00
glClearColor(0.0, 0.0, 0.0, 0.0);
else {
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
float col[3];
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_GetThemeColor3fv(TH_BACK, col);
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
glClearColor(col[0], col[1], col[2], 0.0);
Initial revision
2002-10-12 11:37:38 +00:00
}
Going into vertex paint mode without vertex colors, now it doesn't create vertex colors from shaded mode anymore. Instead there is function in vertex paint mode to create them. Also some fixes for previous commits.
2008-02-26 18:30:41 +00:00
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
Initial revision
2002-10-12 11:37:38 +00:00
glLoadIdentity();
}
else {
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
float col[3];
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
BIF_GetThemeColor3fv(TH_BACK, col);
- The basic layer for Themes in place! - currently only implemented for 3d window - create as many themes you like, and name them - default theme is not editable, and always will be defined at startup (initTheme) - saves in .B.blend - themes for spaces can become local too, so you can set individual 3d windows at theme 'Maya' or so. (to be implemented) - it uses alpha as well...! API: This doesnt use the old method with BFCOLORID blahblah. The API is copied from OpenGL conventions (naming) as much as possible: - void BIF_ThemeColor(ScrArea *sa, int colorid) sets a color... id's are in BIF_resources.h (TH_GRID, TH_WIRE, etc) - void BIF_ThemeColorShade(ScrArea *sa, int colorid, int offset) sets a color with offset, no more weird COLORSHADE_LGREY stuff - void BIF_GetThemeColor3fv(ScrArea *sa, int colorid, float *col) like opengl, this gives you in *col the three rgb values - void BIF_GetThemeColor4ubv(ScrArea *sa, int colorid, char *col) or the one to get 4 bytes ThemeColor calls for globals (UI etc) can also call NULL for *sa... this is to be implemented still. Next step: cleaning up interface.c for all weird colorcalls.
2003-10-17 14:02:08 +00:00
glClearColor(col[0], col[1], col[2], 0.0);
Going into vertex paint mode without vertex colors, now it doesn't create vertex colors from shaded mode anymore. Instead there is function in vertex paint mode to create them. Also some fixes for previous commits.
2008-02-26 18:30:41 +00:00
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
Initial revision
2002-10-12 11:37:38 +00:00
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
myloadmatrix(v3d->viewmat);
- fixed editing vertices again! I had to clean up very old calls to switch matrices for 3d windows. To make it more clear, I've introduced defines for the infamous persp() function: persp(PERSP_WIN); sets matrices at pixel level window persp(PERSP_VIEW); restores matrices back to 3d drawing persp(PERSP_STORE); only called once, to store correct matrices I will now check on frontbuffer drawing of vertices... it's very doubtful if it's used still correctly, was only meant for visual speed in the early nineties you know. :)
2003-10-16 09:39:19 +00:00
persp(PERSP_STORE); // store correct view for persp(PERSP_VIEW) calls
Initial revision
2002-10-12 11:37:38 +00:00
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(v3d->flag & V3D_CLIPPING)
view3d_draw_clipping(v3d);
/* set zbuffer after we draw clipping region */
if(v3d->drawtype > OB_WIRE) {
v3d->zbuf= TRUE;
glEnable(GL_DEPTH_TEST);
}
Moved init of new gridview variable, for adaptive grid steps, out of function that was only called in ortho... grid snapping otherwise can not work. Thanks i-Alexander for reporting!
2005-03-23 21:08:15 +00:00
// needs to be done always, gridview is adjusted in drawgrid() now
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
v3d->gridview= v3d->grid;
Moved init of new gridview variable, for adaptive grid steps, out of function that was only called in ortho... grid snapping otherwise can not work. Thanks i-Alexander for reporting!
2005-03-23 21:08:15 +00:00
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->view==0 || v3d->persp!=0) {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
drawfloor();
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->persp==2) {
Initial revision
2002-10-12 11:37:38 +00:00
if(G.scene->world) {
Fix for #2689 When drawing many stars (or for certain slow gfx cards) you can press ESC to stop it from drawing. The variable set for this escape was not reset, causing a first F12 render to not work. (Ancient bug!). Added: redraw event for "Stars" button in worldbuttons.
2005-06-06 10:35:50 +00:00
if(G.scene->world->mode & WO_STARS) {
Restored the pretty lousy but still popular stars render in blender. Hope our sky guru can come with something cooler for next release!
2006-06-13 20:00:14 +00:00
RE_make_stars(NULL, star_stuff_init_func, star_stuff_vertex_func,
star_stuff_term_func);
Fix for #2689 When drawing many stars (or for certain slow gfx cards) you can press ESC to stop it from drawing. The variable set for this escape was not reset, causing a first F12 render to not work. (Ancient bug!). Added: redraw event for "Stars" button in worldbuttons.
2005-06-06 10:35:50 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->flag & V3D_DISPBGPIC) draw_bgpic();
Initial revision
2002-10-12 11:37:38 +00:00
}
}
else {
- simplified Theme API. No need to include 'current active area' anymore. like: BIF_ThemeColor(TH_GRID); will be sufficient. Blender does the rest. - fixed bug in CTRL-X (reload home file) with themes - fixed bug in horizontal alignment of different height panels. Seems also to solve the drawing error with constraints...
2003-10-19 09:19:58 +00:00
drawgrid();
Initial revision
2002-10-12 11:37:38 +00:00
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->flag & V3D_DISPBGPIC) {
Initial revision
2002-10-12 11:37:38 +00:00
draw_bgpic();
}
}
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(v3d->flag & V3D_CLIPPING)
view3d_set_clipping(v3d);
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* draw set first */
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
if(G.scene->set) {
for(SETLOOPER(G.scene->set, base)) {
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->lay & base->lay) {
Fix in my commit of nov 3, found issue while testing regression stuff. -> Scene set was not drawn in greyish wire anymore Also made sure all colors as used for scene set and dupli's now use a proper call to the ThemeColors, so it blends between choosen wire color and background color.
2005-11-20 13:43:08 +00:00
BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
draw_object(base, DRAW_CONSTCOLOR);
Initial revision
2002-10-12 11:37:38 +00:00
if(base->object->transflag & OB_DUPLI) {
split draw_dupli_objects into 2 functions (draw_dupli_objects and draw_dupli_objects_color) so when a dupli is drawn from a set, its selection state wont make it draw selected. draw_dupli_objects works the same as before
2007-04-12 07:59:14 +00:00
draw_dupli_objects_color(v3d, base, TH_WIRE);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
Bugfix #3304 Actually nice feature too: when using Scene "Set" option, that scene draws its transparent and x-ray stuff independent of the 'foreground' scene. That means that x-ray in a set will be always over the set objects, but stays behind the current scene. For transparent it works the same though... meaning that solid objects from the foreground scene will always draw over transparent from the "Set". Note; this only is true for the 3d window, or the OpenGL render, not for actual rendering of course.
2005-11-03 18:43:05 +00:00
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
/* Transp and X-ray afterdraw stuff for sets is done later */
Initial revision
2002-10-12 11:37:38 +00:00
}
- Added warning print and return in glaDrawPixelsSafe when zoom level exceeds window (glScissor) size. Apparently zooming in on one single pixels larger than a window isn't well supported. - Moved drawing of editmode objects to 2nd loop in drawview.c, this makes sure draw-extra wire is always visible correctly
2005-01-08 13:15:43 +00:00
/* then draw not selected and the duplis, but skip editmode object */
- Dupliframes mball didn't work anymore (should be added to scene_update) - restored nicer drawing for duplicator wireframe. Draws before selected, so you can see the duplicated object better
2005-07-25 21:38:13 +00:00
for(base= G.scene->base.first; base; base= base->next) {
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->lay & base->lay) {
Initial revision
2002-10-12 11:37:38 +00:00
Bug fix #3094 Playback of sequencer sound crashed in combination with dupliverted Objects. (confirmed in osx only btw). Found out there's old not-needed code in the update_for_newframe() call, that was intended to do updates for Manipulators (calling countall()). In countall(), the entire duplilists were generated over, just for counting the totals. First step was removing the countall from update_for_newframe, and added a count_duplilist() call which doesn't generate the full duplilist. That made Blender not crashing anymore, but gives "Error totblock", without printing the block names even... The weird thing also was that the crash showed severe memory corruption in the malloc library, when combining audio scrubbing (SDL) and duplilists. I now suspect there's a remaining issue with DerivedMesh, but for that I need help from Daniel.
2005-09-24 09:05:48 +00:00
/* dupli drawing */
- Dupliframes mball didn't work anymore (should be added to scene_update) - restored nicer drawing for duplicator wireframe. Draws before selected, so you can see the duplicated object better
2005-07-25 21:38:13 +00:00
if(base->object->transflag & OB_DUPLI) {
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
draw_dupli_objects(v3d, base);
Initial revision
2002-10-12 11:37:38 +00:00
}
Bugfix #3426 Object duplicators didn't draw when not selected. Was one 'else' to many in the code! Also noticed that duplicators couldn't be transformed when they have Ipos, was an improper call to do_ipo in duplicator code... also made sure the transformation info in the object is stored/restored before duplicating.
2005-11-21 11:30:53 +00:00
if((base->flag & SELECT)==0) {
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
if(base->object!=G.obedit) draw_object(base, 0);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
Fixed bug #5610, Sculpt mode stops working suddenly (after reloading file), was caused by reading the zbuffer after it had been cleared for drawing xray objects.
2007-01-06 19:46:33 +00:00
retopo= retopo_mesh_check() || retopo_curve_check();
Attempted fix for bug #8441: editing in particle mode with limit visible enabled is really slow on some cards. Cause might be the large number of calls to glReadPixels, now it uses the same system as sculpt to store the depths once, code was already there for the case those depths were available, it just wasn't storing them.
2008-03-13 10:27:35 +00:00
sculptparticle= (G.f & (G_SCULPTMODE|G_PARTICLEEDIT)) && !G.obedit;
Fixed bug #5610, Sculpt mode stops working suddenly (after reloading file), was caused by reading the zbuffer after it had been cleared for drawing xray objects.
2007-01-06 19:46:33 +00:00
if(retopo)
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
view3d_update_depths(v3d);
- Added warning print and return in glaDrawPixelsSafe when zoom level exceeds window (glScissor) size. Apparently zooming in on one single pixels larger than a window isn't well supported. - Moved drawing of editmode objects to 2nd loop in drawview.c, this makes sure draw-extra wire is always visible correctly
2005-01-08 13:15:43 +00:00
/* draw selected and editmode */
- Dupliframes mball didn't work anymore (should be added to scene_update) - restored nicer drawing for duplicator wireframe. Draws before selected, so you can see the duplicated object better
2005-07-25 21:38:13 +00:00
for(base= G.scene->base.first; base; base= base->next) {
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->lay & base->lay) {
Accidentally committed drawing editmode disregarding layer state. Brought back to how it always worked.
2005-02-08 16:25:20 +00:00
if (base->object==G.obedit || ( base->flag & SELECT) )
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
draw_object(base, 0);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
Attempted fix for bug #8441: editing in particle mode with limit visible enabled is really slow on some cards. Cause might be the large number of calls to glReadPixels, now it uses the same system as sculpt to store the depths once, code was already there for the case those depths were available, it just wasn't storing them.
2008-03-13 10:27:35 +00:00
if(!retopo && sculptparticle && !(obact && (obact->dtx & OB_DRAWXRAY))) {
if(G.f & G_SCULPTMODE)
draw_sculpt_depths(v3d);
Fixed bug #5610, Sculpt mode stops working suddenly (after reloading file), was caused by reading the zbuffer after it had been cleared for drawing xray objects.
2007-01-06 19:46:33 +00:00
view3d_update_depths(v3d);
Fixed bug #6870, Sculpt mode + wireframe = nothing When sculpt object is in wireframe mode (including if the current view is in wireframe mode) a second copy is drawn only to the depth buffer so that sculpting can take place as normal.
2007-12-08 21:53:17 +00:00
}
Fixed bug #5610, Sculpt mode stops working suddenly (after reloading file), was caused by reading the zbuffer after it had been cleared for drawing xray objects.
2007-01-06 19:46:33 +00:00
Initial new transform commit. Disabled behind defines. Uncomment //#define NEWTRANSFORM in transform.h to enable. Use at your own risk For more info, see Wiki: http://wiki.blender.org/bin/view.pl/Blenderdev/TransformRefactoring And tuhopuu mailing list: http://projects.blender.org/pipermail/tuhopuu-devel/ Notes for Ton (things that could need bulldozing: - TransData conversions. Objects is ok, but others could be rechecked. (some still use totsel). Need to add pose mode support. - Need more icons in the PET mode dropdown (in the 3D view header) for the new modes - Add new transform calls to Toolbox and Menus and the one right after Extrude. That's pretty much all I can think of now.
2005-02-14 02:53:36 +00:00
if(G.moving) {
Making transform's code more Blenderish with a proper extern include file (BIF_transform.h) and extern function calls (BIF_*). On a side note, Shear was fixed in last commit, just forgot to mention it. It wasn't acting correctly in Edit Mode (and Desoto was poking me about it every sunday).
2005-02-20 01:25:10 +00:00
BIF_drawConstraint();
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
if(G.obedit || (G.f & G_PARTICLEEDIT))
BIF_drawPropCircle(); // only editmode and particles have proportional edit
=== Transform Snap === Draw a circle around the snapping point for visual aid. Different snapping target method, switchable in the 3d view header menu in the Transform menu. * Closest: Snaps the closest vertex to the point * Median: Snaps the median of the selection to the point * Center: Snaps the transform center to the point (this is different from median because you can use Cursor/Boundbox as center) Fix a bug with constraints/snap handling.
2006-12-19 22:25:07 +00:00
BIF_drawSnap();
Initial new transform commit. Disabled behind defines. Uncomment //#define NEWTRANSFORM in transform.h to enable. Use at your own risk For more info, see Wiki: http://wiki.blender.org/bin/view.pl/Blenderdev/TransformRefactoring And tuhopuu mailing list: http://projects.blender.org/pipermail/tuhopuu-devel/ Notes for Ton (things that could need bulldozing: - TransData conversions. Objects is ok, but others could be rechecked. (some still use totsel). Need to add pose mode support. - Need more icons in the PET mode dropdown (in the 3D view header) for the new modes - Add new transform calls to Toolbox and Menus and the one right after Extrude. That's pretty much all I can think of now.
2005-02-14 02:53:36 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
Initial revision
2002-10-12 11:37:38 +00:00
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
/* Transp and X-ray afterdraw stuff */
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
view3d_draw_xray(v3d); // clears zbuffer if it is used!
view3d_draw_transp(v3d);
Fixed bug #6870, Sculpt mode + wireframe = nothing When sculpt object is in wireframe mode (including if the current view is in wireframe mode) a second copy is drawn only to the depth buffer so that sculpting can take place as normal.
2007-12-08 21:53:17 +00:00
Attempted fix for bug #8441: editing in particle mode with limit visible enabled is really slow on some cards. Cause might be the large number of calls to glReadPixels, now it uses the same system as sculpt to store the depths once, code was already there for the case those depths were available, it just wasn't storing them.
2008-03-13 10:27:35 +00:00
if(!retopo && sculptparticle && (obact && (OBACT->dtx & OB_DRAWXRAY))) {
if(G.f & G_SCULPTMODE)
draw_sculpt_depths(v3d);
Fix for bug #5351, sculpt doesn't work in xray mode Moved depth update for sculptmode to after the point where xray/transp objects are drawn
2006-12-04 02:36:04 +00:00
view3d_update_depths(v3d);
Fixed bug #6870, Sculpt mode + wireframe = nothing When sculpt object is in wireframe mode (including if the current view is in wireframe mode) a second copy is drawn only to the depth buffer so that sculpting can take place as normal.
2007-12-08 21:53:17 +00:00
}
Fix for bug #5351, sculpt doesn't work in xray mode Moved depth update for sculptmode to after the point where xray/transp objects are drawn
2006-12-04 02:36:04 +00:00
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(v3d->flag & V3D_CLIPPING)
view3d_clr_clipping();
So! Finally a show-off of the *power* of Martin P's work! :) - Made framework for 3d Transform Manipulators (widgets) - The Manipulators act like '2d buttons', by default with LeftMouse and with while-hold-move-release - Implemented now: Translation Widget, which allows: - four hotspots for axis grab or view-aligned grab - center defined by 'around' setting - SHIFT+LMB gives planar constraint on other 2 axes - works in Object mode and Edit mode (not posemode yet) Enable it with (temporal) icon in 3D header. All other 'normal' transforms then keeps working btw. On the todo for this widget: - choice for Global, Local or Normal orientation The way the widgets are going to work is in review still. Commit is also for Matt for his proposal/paper on topic. Some notes regarding this project; - no life updates (on mouse over) like 3DS, I think that's neurotic - on click, dominant axis changes to theme defined "Transform" color, other axes disappear, like maya - manipulater size is fixed preset, independent zoom. - manipulator follows selection, and is located based on 'around' mode Unresolved; - in maya, when you select 2 or more objects, the manipulator draws on the 'active' object, also interesting - what to do with G,R,S hotkeys? It could switch the manipulator "mode"... - header button/menu for manipulator mode?
2005-03-17 21:31:49 +00:00
BIF_draw_manipulator(sa);
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
if(v3d->zbuf) {
v3d->zbuf= FALSE;
huge commit, sorry! this is part 1 of the UI makeover. It has: - menu system from Matt integrated - buttons drawing from Matt - generic button panel system implemented - converted displaybuttons (not the rest yet) - cleaned up a lot in drawing spaces itself, to make it aligned and pixel exact. - cleaned loads of little compiler warnings, protos... still a lot of work needed, will all be in next week i hope! (warn: 2 new c files! butspace.c and buttons_scene.c)
2003-10-04 20:35:50 +00:00
glDisable(GL_DEPTH_TEST);
}
- fixed editing vertices again! I had to clean up very old calls to switch matrices for 3d windows. To make it more clear, I've introduced defines for the infamous persp() function: persp(PERSP_WIN); sets matrices at pixel level window persp(PERSP_VIEW); restores matrices back to 3d drawing persp(PERSP_STORE); only called once, to store correct matrices I will now check on frontbuffer drawing of vertices... it's very doubtful if it's used still correctly, was only meant for visual speed in the early nineties you know. :)
2003-10-16 09:39:19 +00:00
persp(PERSP_WIN); // set ortho
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
/* Draw Sculpt Mode brush */
Fixed a number of crashes occuring when loading saved files with sculpt mode active. (mostly missing checks for a sculpt session.)
2006-12-25 23:52:17 +00:00
if(!G.obedit && (G.f & G_SCULPTMODE) && area_is_active_area(v3d->area) && sculpt_session()) {
== Radial Control == * Generalized the interactive brush property control from sculpt mode into a simple API * Modified sculpt mode to take advantage of this (even fixes some minor bugs!) * Added shortcuts in particle edit to set brush size/strength (FKEY/shift+FKEY) Still todo are the other modes that have brushes...
2008-01-16 07:19:21 +00:00
RadialControl *rc= sculpt_session()->radialcontrol;
== Sculpt Mode == Added a new input control that smooths the brush stroke. This option controlled by the menu item Sculpt>Input Control>Smooth Stroke. When enabled, the brush has a delayed effect on the model; a green line is drawn to indicate the smoothed path of the stroke. After ~200 pixels, the first half of the stroke will be applied to the model; the process then repeats, with a new segment of the stroke being applied to the model after every 200 pixels. On mouse up, any remaining portion of the stroke will be applied. Other changes: * Added a flags field to SculptData; currently only used for smooth stroke but other flags can be moved into it * Moved the damaged_rects/verts into SculptSession * Simplified brush application by moving init_editdata into do_symmetrical_brush_actions * Removed Averaging from sculpt Input menu; smooth stroke should take its place TODO: * Fix display of the smooth line in Partial Redraw mode * Make the smoothing and delay factors adjustable * Optimize the stroke application (currently using the old 'dot' style of applying the brush)
2007-06-24 22:28:28 +00:00
if(sculpt_data()->flags & SCULPT_INPUT_SMOOTH)
sculpt_stroke_draw();
== Radial Control == * Generalized the interactive brush property control from sculpt mode into a simple API * Modified sculpt mode to take advantage of this (even fixes some minor bugs!) * Added shortcuts in particle edit to set brush size/strength (FKEY/shift+FKEY) Still todo are the other modes that have brushes...
2008-01-16 07:19:21 +00:00
if(rc)
radialcontrol_draw(rc);
== Sculpt Mode == Removed the draw_flag field from SculptData, moved the two draw flags over to SculptData.flags
2007-06-24 23:02:58 +00:00
else if(sculpt_data()->flags & SCULPT_DRAW_BRUSH) {
Fix for bug #5628, sculpt - ghost of circle left when going from 3d view to buttons window. Added a check to insure brush is inside the current view3d before drawing.
2007-01-16 07:35:42 +00:00
short csc[2], car[2];
getmouseco_sc(csc);
getmouseco_areawin(car);
if(csc[0] > v3d->area->winrct.xmin &&
csc[1] > v3d->area->winrct.ymin &&
csc[0] < v3d->area->winrct.xmax &&
csc[1] < v3d->area->winrct.ymax)
fdrawXORcirc((float)car[0], (float)car[1], sculptmode_brush()->size);
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
}
}
Fixed bug #6711, Retopo problem when maximizing 3d view and still painting Caused by some incorrect usage of the current v3d during updates
2007-12-18 21:56:17 +00:00
retopo_paint_view_update(v3d);
Merged Google Summer of Code sculptmode/multires/retopo tools. From the tracker: https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
2006-11-06 01:08:26 +00:00
retopo_draw_paint_lines();
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
if(!G.obedit && OBACT && G.f&G_PARTICLEEDIT && area_is_active_area(v3d->area)){
ParticleSystem *psys = PE_get_current(OBACT);
ParticleEditSettings *pset = PE_settings();
short c[2];
== Radial Control == * Generalized the interactive brush property control from sculpt mode into a simple API * Modified sculpt mode to take advantage of this (even fixes some minor bugs!) * Added shortcuts in particle edit to set brush size/strength (FKEY/shift+FKEY) Still todo are the other modes that have brushes...
2008-01-16 07:19:21 +00:00
if(*PE_radialcontrol())
radialcontrol_draw(*PE_radialcontrol());
else if(psys && psys->edit && pset->brushtype>=0) {
Particles ========= Merge of the famous particle patch by Janne Karhu, a full rewrite of the Blender particle system. This includes: - Emitter, Hair and Reactor particle types. - Newtonian, Keyed and Boids physics. - Various particle visualisation and rendering types. - Vertex group and texture control for various properties. - Interpolated child particles from parents. - Hair editing with combing, growing, cutting, .. . - Explode modifier. - Harmonic, Magnetic fields, and multiple falloff types. .. and lots of other things, some more info is here: http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc The new particle system cannot be backwards compatible. Old particle systems are being converted to the new system, but will require tweaking to get them looking the same as before. Point Cache =========== The new system to replace manual baking, based on automatic caching on disk. This is currently used by softbodies and the particle system. See the Cache API section on: http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint Documentation ============= These new features still need good docs for the release logs, help for this is appreciated.
2007-11-26 22:09:57 +00:00
getmouseco_areawin(c);
fdrawXORcirc((float)c[0], (float)c[1], (float)pset->brush[pset->brushtype].size);
}
}
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(v3d->persp>1) drawviewborder();
Replaced old fly mode for a fly mode that works in all 3 view types - ortho, perspective and camera (cheating, but its still usefull) This one uses the 3d perspective view rather then the camera, and is nicer and easier to control then the old fly mode. it also gives some help in the header. Shift+F to try it.
2006-06-08 18:10:41 +00:00
if(v3d->flag2 & V3D_FLYMODE) drawviewborder_flymode();
Bug report #3092 Excluded the 3D cursor from being clipped with the new ALT+B clipping. Also added a refresh for the object that gets (Pkey) separated in mesh editmode, might solve issue reported by Campbell.
2005-09-23 07:28:15 +00:00
if(!(G.f & G_PLAYANIM)) drawcursor(v3d);
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
if(U.uiflag & USER_SHOW_ROTVIEWICON)
draw_view_axis();
else
draw_view_icon();
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
if(U.uiflag & USER_SHOW_FPS && G.f & G_PLAYANIM) {
draw_viewport_fps(sa);
} else if(U.uiflag & USER_SHOW_VIEWPORTNAME) {
* patch #3876: Rotating view icon submitted by Davide Vercelli This replaces (as a user preference) the static icon shown in the bottom-left of the 3D View with a small rotating axis that updates live in all ortho/perspective modes I made several modifications to the original patch. In the patch, it displayed the axis on top of the 'object info' text since when floating panels are minimised, they sit in the bottom corner and cover the axis up. This annoyance is not limited to the axis, it also covers the frame number and info text, which can be frustrating. Sending them to the bottom is not that useful either, since it's quicker (with esc) and just as much movement to close and re-open them again. I decided to solve this problem at the cause: Now when using the disclosure triangle on floating panels, they 'minimise in place' rather than going to the bottom. User preferences are in the 'View & controls' section to: - Display either the 3D axis or the old icon - The size of the axis - the brightness of the axis (colours are taken from grid theme settings) * patch #3801: Option to show view direction in 3D View submitted by Daniele Fornaciari Simple one, just adds an user pref to show the name of the view's direction as text in the top left corner.
2006-04-25 12:26:46 +00:00
draw_viewport_name(sa);
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
}
Added rename/delete popups to the file and imageselect windows. Redesigned the userpreference window layout. (not finished yet) Enhanced the texteditor with; a rightmousemenu, clipboard text support (for windows !) and the alt-m keystroke generates a 3d text object. (up to 1000 characters) (1, 2, 3, 4 and 7 from http://www.tncci.com/blender/feats.html)
2003-04-28 11:17:21 +00:00
ob= OBACT;
Cleanup & goodies for rigging geeks! :) - PoseMode: Wkey menu, "Flip Left/Right Names". On selected bones, it flips the L/R tags in names, and calls the proper code to rename everything that's related (constraint targets, bone-childs, etc). - PoseMode: Shift+S snapmenu: snap cursor to selected now works - Outliner: select bones now correctly sets 'active' flag for bones, updating the UI as well. Also made sure you cannot select hidden bones in outliner. - 3DWindow: in PoseMode/EditMode draws name of active Bone too (with user option "Draw active object name" set. - Added the new Armature/PoseMode options in View3D pulldowns. Cleanup: - moved Pose code from editaction.c to poseobject.c - removed BSE_editaction.h and BSE_editaction_types.h, moved contents of it to BIF_editaction.h. One include per C file should be fine. :) I know the src/ structure would require more elaborated includes, but we don't have that now...
2005-07-27 10:37:20 +00:00
if(ob && (U.uiflag & USER_DRAWVIEWINFO))
draw_selected_name(ob);
Initial revision
2002-10-12 11:37:38 +00:00
huge commit, sorry! this is part 1 of the UI makeover. It has: - menu system from Matt integrated - buttons drawing from Matt - generic button panel system implemented - converted displaybuttons (not the rest yet) - cleaned up a lot in drawing spaces itself, to make it aligned and pixel exact. - cleaned loads of little compiler warnings, protos... still a lot of work needed, will all be in next week i hope! (warn: 2 new c files! butspace.c and buttons_scene.c)
2003-10-04 20:35:50 +00:00
draw_area_emboss(sa);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
/* it is important to end a view in a transform compatible with buttons */
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
bwin_scalematrix(sa->win, v3d->blockscale, v3d->blockscale, v3d->blockscale);
- expanded internal windowmanager that it allows button panels in any window (type) - each SpaceData struct (not the window!) can get 'block handlers' assigned, basically event codes that invoke drawing button panels. - this is saved in files, and Panels behave in any window like it does now in buttonswindow - it also means that a 'space window' should leave with a matrix set for buttons level - try it in view3d header menu, 'view'->'backdrop'. this opens the old viewbuttons - it all works non blocking! instant updates of viewbuttons visible in 3d window now. Not done yet: - checking and fixing frontbuffer drawing (select a wireframe draws over) - temporally vertices cannot be selected, is my next project - closing or hiding Panels... - styling stuff... i committed for others to review as well. Have fun. this is certainly a huge improvement over the old viewbuttons!
2003-10-15 12:26:26 +00:00
view3d_blockhandlers(sa);
Initial revision
2002-10-12 11:37:38 +00:00
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
sa->win_swap= WIN_BACK_OK;
Initial revision
2002-10-12 11:37:38 +00:00
Changes to "Face Select" mode * Does not indicate that UV's exist, nor does it add UV's when used. * Only accessible for texturepaint, vertexpaint and weightpaint from a button in the header (Paint Selection Mask) * Not accessible from the mode menu, this is only an option that applies to paint modes. This dosnt effect DNA, face select (G_FACESELECT) can be enabled at any time but is only used when paint modes are enabled. Other changes * UKey is uv unwrap in editmode, Ukey for undo was editmode only anyway. * UVCalc in editmode adds a UV Layer if there is not one alredy. * texture draw in editmode does not draw the face dots (they are get in the way of texturing) * some missing updates were added. * removed manipulator from when paint modes are enabled since the manipulator is not drawn in the 3d view.
2007-09-10 19:32:44 +00:00
if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT) {
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
v3d->flag |= V3D_NEEDBACKBUFDRAW;
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
addafterqueue(sa->win, BACKBUFDRAW, 1);
Initial revision
2002-10-12 11:37:38 +00:00
}
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
// test for backbuf select
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
if(G.obedit && v3d->drawtype>OB_WIRE && (v3d->flag & V3D_ZBUF_SELECT)) {
Pooh pooh! This backbuffer system for selection codes works much easier on osx with AUX buffers, than on other systems with GL_BACK buffer... Now i've added a check in force_draw to also redraw the backbuffer, if needed. ANother weak point in the sublooping system in blender.
2004-09-29 18:08:04 +00:00
extern int afterqtest(short win, unsigned short evt); //editscreen.c
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
v3d->flag |= V3D_NEEDBACKBUFDRAW;
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
if(afterqtest(sa->win, BACKBUFDRAW)==0) {
addafterqueue(sa->win, BACKBUFDRAW, 1);
Pooh pooh! This backbuffer system for selection codes works much easier on osx with AUX buffers, than on other systems with GL_BACK buffer... Now i've added a check in force_draw to also redraw the backbuffer, if needed. ANother weak point in the sublooping system in blender.
2004-09-29 18:08:04 +00:00
}
Recode of 'zbuffer selection'. I first was too afraid using the backbuffer selection method, since there's too much trash in drawobject.c and displists... But, I couldn't stand the zbuf selection to miss edges too often. Right now both methods are still in the code, and can be reviewed. Please note for test: - borderselect and circle-select still use old method - new selection works directly on faces & edges - subsurf optimal draw and selection works fine now To detect the closest vertex or edge, i use the old 'spiral selection' code, which is extremely accurate. If your mouse is close to an edge, it should find it. Most evidently I need to test speed... also, the disadvantage of backbuf selection is the limited depth, which can be 16 bits (65 k faces) on systems.
2004-09-28 09:43:37 +00:00
}
BPython: - Made Blender.event var (previously only used by script links) hold ascii value -- where it applies -- of current event during events callback registered with Draw.Register(gui, events, button_events). Useful for gui scripts like Campbell's Python console. No problem using this var to hold the value, since in gui scripts it was not used (always None). - Updated Window and Window.Theme with new theme vars and the Time space. - Script links: -- Added "Render" event for script links (runs twice, second time as "PostEvent", for clean-up actions). Now FrameChanged links don't run when a single pic is rendered. -- Added "Enable Script Links" button in the script buttons tab. Now this bit gets saved in .blends along with the rest of G.f, so users can define per .blend if they are on or off by default. "blender -y" also disables all slinks as happened before with OnLoad ones only. -- Other small changes in the script buttons tab: When a link is added (button "new"), it becomes the active one for the window, no need to press a button to reach it. Also, a pupmenu showing all available texts is shown when "new" is pressed, so users can choose a text w/o having to type. Cancel the popup to leave the string button empty (link exists, but has no script assigned). A pulldown would be better UI-wise, but it's kinda weird to show both scripts and normal texts (Blender doesn't differentiate them) in a script links pulldown. With a popup we can show only texts ending in ".py" (not done in this commit, need opinions) and if the script has no or another extension, case of many in old and current .blend's, there's still the string box for writing its name. -- Implemented Ton's space handler script links: Right now only for the 3d View, but it's trivial to add for others. There are two types: EVENT, to receive 3d View events from a chosen window and DRAW, to draw on the window. Ton's idea was to give scripts a controlled way to integrate better within Blender. Here's how it works: - scripts must have a proper header, like: # SPACEHANDLER.VIEW3D.EVENT and then they are shown in 3d View's View menu, "Space Handler Scripts" submenu. Check (mark, click on it) a script to make it active. EVENT handlers should consult the Blender.event var to get the current event, which can be compared with values from the Draw module: import Blender from Blender import Draw evt = Blender.event if evt == Draw.AKEY: print "a" elif evt == Draw.LEFTMOUSE: print "left mouse button" else: return # ignore, pass event back to Blender Blender.event = None # tell Blender not to process itself the event DRAW handlers are free to draw to their owner 3D View. OpenGL attributes and modelview and projection matrices are pushed before running the handler and poped when it finishes. To communicate between EVENT and DRAW handler scripts we have the Blender.Registry module, as always. Still need to code some nice example, which should also serve to test properly space handlers. Simple tests went fine. - doc updates about the additions. ======= Note: the UI part of the space handlers and script links is of course open for changes, I just tried to make it understandable. Probably we won't use the scriptlinks icon for "None Available" (check 3d View -> View -> Space Handler Scripts), though it hints at what space handlers are. The tooltips may not be accepted either, since other menus don't use them. Opinions welcomed.
2005-05-08 21:20:34 +00:00
/* run any view3d draw handler script links */
if (sa->scriptlink.totscript)
BPY_do_spacehandlers(sa, 0, SPACEHANDLER_VIEW3D_DRAW);
- Blender: added option 'scriptsdir' to Blender.Get(); - small updates to the docs; - Object: small fix to getMatrix: check during_script() to avoid undesired loops; added old behavior (pre 2.34) as option: .getMatrix('oldlocal'); - tentative fix for bug #1275: scene REDRAW scriptlinks were not being executed (the call to do so was missing): http://projects.blender.org/tracker/index.php?func=detail&aid=1275&group_id=9&atid=125 added the call in drawview.c, in drawview3dspace(). This causes the scriptlink to be called for each visible view3d, but that's what happens with object redraw scriptlinks, too. Anyway, this is still a test. The place was chosen based on the idea that a scene redraw scriptlink is like an object redraw one, but for all objs in the scene at once. - Window.Theme: new submodule, to get/set theme options in Blender; - Added the script save_theme.py (Help menu for now), to save the current theme in Blender as an executable script (currently shown in the Scripts->Misc menu). There's more work to do for themes, like defining a proper place for them in the interface, adding documentation (for now the added script and the ones it generates can give a pretty good idea of how to use the new module), probably extending themes to support SpaceScript and so on.
2004-09-21 05:28:17 +00:00
BPython: - Made Blender.event var (previously only used by script links) hold ascii value -- where it applies -- of current event during events callback registered with Draw.Register(gui, events, button_events). Useful for gui scripts like Campbell's Python console. No problem using this var to hold the value, since in gui scripts it was not used (always None). - Updated Window and Window.Theme with new theme vars and the Time space. - Script links: -- Added "Render" event for script links (runs twice, second time as "PostEvent", for clean-up actions). Now FrameChanged links don't run when a single pic is rendered. -- Added "Enable Script Links" button in the script buttons tab. Now this bit gets saved in .blends along with the rest of G.f, so users can define per .blend if they are on or off by default. "blender -y" also disables all slinks as happened before with OnLoad ones only. -- Other small changes in the script buttons tab: When a link is added (button "new"), it becomes the active one for the window, no need to press a button to reach it. Also, a pupmenu showing all available texts is shown when "new" is pressed, so users can choose a text w/o having to type. Cancel the popup to leave the string button empty (link exists, but has no script assigned). A pulldown would be better UI-wise, but it's kinda weird to show both scripts and normal texts (Blender doesn't differentiate them) in a script links pulldown. With a popup we can show only texts ending in ".py" (not done in this commit, need opinions) and if the script has no or another extension, case of many in old and current .blend's, there's still the string box for writing its name. -- Implemented Ton's space handler script links: Right now only for the 3d View, but it's trivial to add for others. There are two types: EVENT, to receive 3d View events from a chosen window and DRAW, to draw on the window. Ton's idea was to give scripts a controlled way to integrate better within Blender. Here's how it works: - scripts must have a proper header, like: # SPACEHANDLER.VIEW3D.EVENT and then they are shown in 3d View's View menu, "Space Handler Scripts" submenu. Check (mark, click on it) a script to make it active. EVENT handlers should consult the Blender.event var to get the current event, which can be compared with values from the Draw module: import Blender from Blender import Draw evt = Blender.event if evt == Draw.AKEY: print "a" elif evt == Draw.LEFTMOUSE: print "left mouse button" else: return # ignore, pass event back to Blender Blender.event = None # tell Blender not to process itself the event DRAW handlers are free to draw to their owner 3D View. OpenGL attributes and modelview and projection matrices are pushed before running the handler and poped when it finishes. To communicate between EVENT and DRAW handler scripts we have the Blender.Registry module, as always. Still need to code some nice example, which should also serve to test properly space handlers. Simple tests went fine. - doc updates about the additions. ======= Note: the UI part of the space handlers and script links is of course open for changes, I just tried to make it understandable. Probably we won't use the scriptlinks icon for "None Available" (check 3d View -> View -> Space Handler Scripts), though it hints at what space handlers are. The tooltips may not be accepted either, since other menus don't use them. Opinions welcomed.
2005-05-08 21:20:34 +00:00
/* run scene redraw script links */
if((G.f & G_DOSCRIPTLINKS) && G.scene->scriptlink.totscript &&
!during_script()) {
- Blender: added option 'scriptsdir' to Blender.Get(); - small updates to the docs; - Object: small fix to getMatrix: check during_script() to avoid undesired loops; added old behavior (pre 2.34) as option: .getMatrix('oldlocal'); - tentative fix for bug #1275: scene REDRAW scriptlinks were not being executed (the call to do so was missing): http://projects.blender.org/tracker/index.php?func=detail&aid=1275&group_id=9&atid=125 added the call in drawview.c, in drawview3dspace(). This causes the scriptlink to be called for each visible view3d, but that's what happens with object redraw scriptlinks, too. Anyway, this is still a test. The place was chosen based on the idea that a scene redraw scriptlink is like an object redraw one, but for all objs in the scene at once. - Window.Theme: new submodule, to get/set theme options in Blender; - Added the script save_theme.py (Help menu for now), to save the current theme in Blender as an executable script (currently shown in the Scripts->Misc menu). There's more work to do for themes, like defining a proper place for them in the interface, adding documentation (for now the added script and the ones it generates can give a pretty good idea of how to use the new module), probably extending themes to support SpaceScript and so on.
2004-09-21 05:28:17 +00:00
BPY_do_pyscript((ID *)G.scene, SCRIPT_REDRAW);
}
=FSAA fix= This commit fixes problems with FSAA (full-screen video card antialiasing) with selection. It turns off FSAA for the backbuffered select drawing function. Since opengl's extension system is incomphrehensible to me (at least not without committing glew), I've basically done a little hack that detects if the value we need for glDisable (MULTISAMPLE_ARB) is defined, and if not defines it. Also, this commit only works on windows, because glx sadly seems to not support arb_multisample at all, and in all likelihood neither does osx. Joe
2007-01-25 22:47:47 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
}
For the OpenGL render option in the 3d view, if a camera is active, it now sets the viewport exactly the same as if rendering.
2007-12-01 19:29:50 +00:00
void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4])
Initial revision
2002-10-12 11:37:38 +00:00
{
Base *base;
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
Scene *sce;
For the OpenGL render option in the 3d view, if a camera is active, it now sets the viewport exactly the same as if rendering.
2007-12-01 19:29:50 +00:00
float v3dwinmat[4][4];
Initial revision
2002-10-12 11:37:38 +00:00
Bugfix for earlier commit, with OpenGL render the 3d view transforms were not always set correct.
2007-12-02 14:48:24 +00:00
if(!winmat)
setwinmatrixview3d(winx, winy, NULL);
Initial revision
2002-10-12 11:37:38 +00:00
setviewmatrixview3d();
Two fixes; - borderselect draws cleaner info in bottom/left corner window - OGL render (in view3d header) option didn't work on successive renders. was due to removing hack that reopened the window each time. But now it needed to be assigned correctly to blender's 'mywindow' system.
2004-09-29 10:49:19 +00:00
myloadmatrix(v3d->viewmat);
For the OpenGL render option in the 3d view, if a camera is active, it now sets the viewport exactly the same as if rendering.
2007-12-01 19:29:50 +00:00
/* when winmat is not NULL, it overrides the regular window matrix */
Orange bug: forgot to restore inverse matrix calculus for OpengGL render in a window... didn't know what it was for, but now I do! It uses the inverse to do pre-clipping on objects.
2006-01-24 17:07:39 +00:00
glMatrixMode(GL_PROJECTION);
For the OpenGL render option in the 3d view, if a camera is active, it now sets the viewport exactly the same as if rendering.
2007-12-01 19:29:50 +00:00
if(winmat)
myloadmatrix(winmat);
mygetmatrix(v3dwinmat);
Orange bug: forgot to restore inverse matrix calculus for OpengGL render in a window... didn't know what it was for, but now I do! It uses the inverse to do pre-clipping on objects.
2006-01-24 17:07:39 +00:00
glMatrixMode(GL_MODELVIEW);
For the OpenGL render option in the 3d view, if a camera is active, it now sets the viewport exactly the same as if rendering.
2007-12-01 19:29:50 +00:00
Mat4MulMat4(v3d->persmat, v3d->viewmat, v3dwinmat);
Orange bug: forgot to restore inverse matrix calculus for OpengGL render in a window... didn't know what it was for, but now I do! It uses the inverse to do pre-clipping on objects.
2006-01-24 17:07:39 +00:00
Mat4Invert(v3d->persinv, v3d->persmat);
Mat4Invert(v3d->viewinv, v3d->viewmat);
Initial revision
2002-10-12 11:37:38 +00:00
Bugfix #3434 The OpenGL preview anim render calculated the camera matrix before calling the animation updates, causing a lag when camera was parented.
2005-11-21 15:59:01 +00:00
free_all_realtime_images();
reshadeall_displist();
Initial revision
2002-10-12 11:37:38 +00:00
if(v3d->drawtype > OB_WIRE) {
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
v3d->zbuf= TRUE;
Initial revision
2002-10-12 11:37:38 +00:00
glEnable(GL_DEPTH_TEST);
}
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(v3d->flag & V3D_CLIPPING)
view3d_set_clipping(v3d);
Initial revision
2002-10-12 11:37:38 +00:00
if (v3d->drawtype==OB_TEXTURE && G.scene->world) {
glClearColor(G.scene->world->horr, G.scene->world->horg, G.scene->world->horb, 0.0);
} else {
- added panel backdrop for buttonswin to themes - made hilite of headers a tinsy bit subtler - opengl render (icon 3d window) uses theme for backdrop
2003-11-08 23:18:32 +00:00
float col[3];
BIF_GetThemeColor3fv(TH_BACK, col);
glClearColor(col[0], col[1], col[2], 0.0);
Initial revision
2002-10-12 11:37:38 +00:00
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
Giant commit! A full detailed description of this will be done later... is several days of work. Here's a summary: Render: - Full cleanup of render code, removing *all* globals and bad level calls all over blender. Render module is now not called abusive anymore - API-fied calls to rendering - Full recode of internal render pipeline. Is now rendering tiles by default, prepared for much smarter 'bucket' render later. - Each thread now can render a full part - Renders were tested with 4 threads, goes fine, apart from some lookup tables in softshadow and AO still - Rendering is prepared to do multiple layers and passes - No single 32 bits trick in render code anymore, all 100% floats now. Writing images/movies - moved writing images to blender kernel (bye bye 'schrijfplaatje'!) - made a new Movie handle system, also in kernel. This will enable much easier use of movies in Blender PreviewRender: - Using new render API, previewrender (in buttons) now uses regular render code to generate images. - new datafile 'preview.blend.c' has the preview scenes in it - previews get rendered in exact displayed size (1 pixel = 1 pixel) 3D Preview render - new; press Pkey in 3d window, for a panel that continuously renders (pkey is for games, i know... but we dont do that in orange now!) - this render works nearly identical to buttons-preview render, so it stops rendering on any event (mouse, keyboard, etc) - on moving/scaling the panel, the render code doesn't recreate all geometry - same for shifting/panning view - all other operations (now) regenerate the full render database still. - this is WIP... but big fun, especially for simple scenes! Compositor - Using same node system as now in use for shaders, you can composit images - works pretty straightforward... needs much more options/tools and integration with rendering still - is not threaded yet, nor is so smart to only recalculate changes... will be done soon! - the "Render Result" node will get all layers/passes as output sockets - The "Output" node renders to a builtin image, which you can view in the Image window. (yes, output nodes to render-result, and to files, is on the list!) The Bad News - "Unified Render" is removed. It might come back in some stage, but this system should be built from scratch. I can't really understand this code... I expect it is not much needed, especially with advanced layer/passes control - Panorama render, Field render, Motion blur, is not coded yet... (I had to recode every single feature in render, so...!) - Lens Flare is also not back... needs total revision, might become composit effect though (using zbuffer for visibility) - Part render is gone! (well, thats obvious, its default now). - The render window is only restored with limited functionality... I am going to check first the option to render to a Image window, so Blender can become a true single-window application. :) For example, the 'Spare render buffer' (jkey) doesnt work. - Render with border, now default creates a smaller image - No zbuffers are written yet... on the todo! - Scons files and MSVC will need work to get compiling again OK... thats what I can quickly recall. Now go compiling!
2006-01-23 22:05:47 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
/* abuse! to make sure it doesnt draw the helpstuff */
G.f |= G_SIMULATION;
Potential fix for #1684 Buttons (editingbuttons) flicker when adding armature bones. Added proper redraw event extra for buttons menu
2004-10-28 21:50:32 +00:00
/* first draw set */
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
if(G.scene->set) {
Initial revision
2002-10-12 11:37:38 +00:00
Recode of the "Set Scene chaining" patch from Nathan. - code for detecting loops was overly complex, and detected loops wrong even (when chains partially overlap it gave error) - that code could NULLify sets of other scenes than the one you tested - and that code should be in blenkernel, so it can be called in more locations, like fixing potential loops in old files - the code for looping over the chained scenes was bad too, I created a nice #define to keep code readable. (See SETLOOPER in BKE_scene.h) ALso fixes reports in tracker :)
2006-05-15 10:46:04 +00:00
for(SETLOOPER(G.scene->set, base)) {
Initial revision
2002-10-12 11:37:38 +00:00
if(v3d->lay & base->lay) {
if ELEM3(base->object->type, OB_LAMP, OB_CAMERA, OB_LATTICE);
else {
where_is_object(base->object);
Fix in my commit of nov 3, found issue while testing regression stuff. -> Scene set was not drawn in greyish wire anymore Also made sure all colors as used for scene set and dupli's now use a proper call to the ThemeColors, so it blends between choosen wire color and background color.
2005-11-20 13:43:08 +00:00
BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
draw_object(base, DRAW_CONSTCOLOR);
Initial revision
2002-10-12 11:37:38 +00:00
if(base->object->transflag & OB_DUPLI) {
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
draw_dupli_objects(v3d, base);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
}
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
/* Transp and X-ray afterdraw stuff for sets is done later */
Initial revision
2002-10-12 11:37:38 +00:00
}
Armature related fixes and cleanups: * Armatures that had constraint targets inside other armatures weren't transform()-ing correctly * Issues with lattice deformed objects that are parents of bones when rendering an animation. Seems to be mostly OK now with the exception of the first rendered frame -- weird bugs like this have plagued blender for ages, which leads me to believe that RE_rotateBlenderScene() is a piece of garbage that nobody understands (especially me). * made a few helper functions to clean up some repeated code related to clearing constraint status and rebuilding displists.
2004-01-27 06:08:37 +00:00
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* first not selected and duplis */
Initial revision
2002-10-12 11:37:38 +00:00
base= G.scene->base.first;
while(base) {
if(v3d->lay & base->lay) {
if ELEM3(base->object->type, OB_LAMP, OB_CAMERA, OB_LATTICE);
else {
if(base->object->transflag & OB_DUPLI) {
Big commit with work on Groups & Libraries: -> Any Group Duplicate now can get local timing and local NLA override. This enables to control the entire animation system of the Group. Two methods for this have been implemented. 1) The quick way: just give the duplicator a "Startframe" offset. 2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator to override NLA/action of any Grouped Object. For "Group NLA" to work, an ActionStrip needs to know which Object in a group it controls. On adding a strip, the code checks if an Action was already used by an Object in the Group, and assigns it automatic to that Object. You can also set this in the Nkey "Properties" panel for the strip. Change in NLA: the SHIFT+A "Add strip" command now always adds strips to the active Object. (It used to check where mouse was). This allows to add NLA strips to Objects that didn't have actions/nla yet. Important note: In Blender, duplicates are fully procedural and generated on the fly for each redraw. This means that redraw speed equals to stepping through frames, when using animated Duplicated Groups. -> Recoded entire duplicator system The old method was antique and clumsy, using globals and full temporal copies of Object. The new system is nicer in control, faster, and since it doesn't use temporal object copies anymore, it works better with Derived Mesh and DisplayList and rendering. By centralizing the code for duplicating, more options can be easier added. Features to note: - Duplicates now draw selected/unselected based on its Duplicator setting. - Same goes for the drawtype (wire, solid, selection outline, etc) - Duplicated Groups can be normally selected too Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a listing of all groups, allowing to add Group instances immediate. -> Library System - SHIFT+F4 data browse now shows the entire path for linked data - Outliner draws Library Icons to denote linked data - Outliner operation added: "Make Local" for library data. - Outliner now also draws Groups in regular view, allowing to unlink too. -> Fixes - depsgraph missed signal update for bone-parented Objects - on reading file, the entire database was tagged to "recalc" fully, causing unnecessary slowdown on reading. Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
draw_dupli_objects(v3d, base);
Initial revision
2002-10-12 11:37:38 +00:00
}
else if((base->flag & SELECT)==0) {
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
draw_object(base, 0);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
base= base->next;
}
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* draw selected */
Initial revision
2002-10-12 11:37:38 +00:00
base= G.scene->base.first;
while(base) {
if ( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) ) {
if ELEM3(base->object->type, OB_LAMP, OB_CAMERA, OB_LATTICE);
As reported on bf-committers maillist: new object centers were drawing in sets. To fix it, I got rid of a very ancient hack to enable set grey wire drawing (setting a global to pretend it's picking select draw). Now this setting is nicely passed on via functions as argument.
2005-11-28 16:59:12 +00:00
else draw_object(base, 0);
Initial revision
2002-10-12 11:37:38 +00:00
}
base= base->next;
}
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
Two fixes; - borderselect draws cleaner info in bottom/left corner window - OGL render (in view3d header) option didn't work on successive renders. was due to removing hack that reopened the window each time. But now it needed to be assigned correctly to blender's 'mywindow' system.
2004-09-29 10:49:19 +00:00
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
/* Transp and X-ray afterdraw stuff */
Fix for bug: drawing x-ray and transparency with sets didn't work well, now it draws those type of objects from sets also at the end.
2008-05-06 15:31:17 +00:00
view3d_draw_xray(v3d); // clears zbuffer if it is used!
view3d_draw_transp(v3d);
Armature "XRay mode" now draws nicely with solid too. For it to work, I had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
2005-07-13 19:42:08 +00:00
New feature; User definable Clipping Planes. Press ALT+B in 3d window, draw a rect, and it becomes a clipping volume of 4 planes. You then can rotate the view anyway you like. Works for each 3d window individually. Disable it with another ALT+B press. Commit is huge because it had to change all selection code as well. The user-clipping planes are in 'eye space', the other clipping happens in projected 'viewport space'. Nice to notice is that the 'x=3200' convention (to denote a coordinate is clipped) now is a define. Define value is still a number though... but we now can get up to screens of 12000 pixels without issues! Known issue; here it refuses to draw the 'object centers' or Lamp icons within the clipping region. Can't find any reason for it... however, we might move to non-pixmaps for it anyway. Testing might reveil numerous issues, will be standby for it. Curious? Check this http://www.blender.org/bf/rt4.jpg
2005-08-20 19:18:35 +00:00
if(v3d->flag & V3D_CLIPPING)
view3d_clr_clipping();
New: - XRAY draw for armatures now is generic "Draw Extra" option for any Object type. This feature just moves drawing to the end, after clearing the zbuffer again. - Solid draw mode now displays materials with Alpha, with the new "Draw extra" option "Transp" set. This also moves drawing transparent to the end, but it doesn't sort the transparent faces. Still looks OK. Note: this is not enabled in mesh editmode. Here all the fancy extra drawing just makes it nearly impossible to do OK. - Re-ordered Object Buttons -> "Draw" panel Fixes: - do_versions had check for the UserDef in it (new ogl texture cache). that can't be there, should be in usiblender.c (stupid exception). - same error caused reading older files to not always fix version changes on armatures (commit yesterday). - Outline select drawing happened also on picking-select draw, needless slowdown.
2005-07-14 12:44:33 +00:00
if(v3d->zbuf) {
v3d->zbuf= FALSE;
Initial revision
2002-10-12 11:37:38 +00:00
glDisable(GL_DEPTH_TEST);
}
G.f &= ~G_SIMULATION;
Replace all glFinish() with glFlush(). This is supposed to fix gradual slowdown of Blender interface on ATI cards.
2004-06-16 11:34:45 +00:00
glFlush();
Initial revision
2002-10-12 11:37:38 +00:00
glLoadIdentity();
free_all_realtime_images();
}
double tottime = 0.0;
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
static ScrArea *oldsa;
static double swaptime;
static int curmode;
Initial revision
2002-10-12 11:37:38 +00:00
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
/* used for fps display */
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
#define REDRAW_FRAME_AVERAGE 8
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
static double redrawtime;
static double lredrawtime;
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
static float redrawtimes_fps[REDRAW_FRAME_AVERAGE];
static short redrawtime_index;
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
== Ipo == This fixes [#11118] Record Mouse in IPO Curve Editor 2.46rc3 and adds thereby a new feature: correct audio sync to IPO mouse recording :)
2008-05-12 17:16:54 +00:00
int update_time(int cfra)
Initial revision
2002-10-12 11:37:38 +00:00
{
static double ltime;
double time;
== Ipo == This fixes [#11118] Record Mouse in IPO Curve Editor 2.46rc3 and adds thereby a new feature: correct audio sync to IPO mouse recording :)
2008-05-12 17:16:54 +00:00
if ((audiostream_pos() != cfra)
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
&& (G.scene->audio.flag & AUDIO_SYNC)) {
return 0;
}
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
time = PIL_check_seconds_timer();
tottime += (time - ltime);
ltime = time;
return (tottime < 0.0);
}
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
static void draw_viewport_fps(ScrArea *sa)
{
fix mixed declarations and code warning that breaks strict compilers
2007-12-11 15:35:39 +00:00
float fps;
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
char printable[16];
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
int i, tot;
for button popups, dont close unless you click or press escape, this would often close when dragging a button value (or when using a tablet I am told)
2007-12-11 23:05:10 +00:00
fps timer was starting off at 0 fps
2008-05-07 18:33:10 +00:00
if (!lredrawtime || !redrawtime)
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
return;
for button popups, dont close unless you click or press escape, this would often close when dragging a button value (or when using a tablet I am told)
2007-12-11 23:05:10 +00:00
printable[0] = '\0';
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
#if 0
/* this is too simple, better do an average */
fps = (float)(1.0/(lredrawtime-redrawtime))
#else
redrawtimes_fps[redrawtime_index] = (float)(1.0/(lredrawtime-redrawtime));
for (i=0, tot=0, fps=0.0f ; i < REDRAW_FRAME_AVERAGE ; i++) {
if (redrawtimes_fps[i]) {
fps += redrawtimes_fps[i];
tot++;
}
}
fix for [#10458] Rc4 Blender crash when activate playback FPS than Alt+A to play animation.
2008-05-05 06:30:19 +00:00
if (tot) {
redrawtime_index++;
if (redrawtime_index >= REDRAW_FRAME_AVERAGE)
redrawtime_index = 0;
fps = fps / tot;
}
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
#endif
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
/* is this more then half a frame behind? */
if (fps+0.5 < FPS) {
BIF_ThemeColor(TH_REDALERT);
sprintf(printable, "fps: %.2f", (float)fps);
} else {
BIF_ThemeColor(TH_TEXT_HI);
sprintf(printable, "fps: %i", (int)(fps+0.5));
}
glRasterPos2i(10, sa->winy-20);
BMF_DrawString(G.fonts, printable);
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
static void inner_play_prefetch_frame(int mode, int cfra)
Initial revision
2002-10-12 11:37:38 +00:00
{
ScrArea *sa;
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
int oldcfra = CFRA;
ScrArea *oldcurarea = curarea;
Biiig commit! Thanks to 2-3 weeks of cvs freeze... Render: - New; support for dual CPU render (SDL thread) Currently only works with alternating scanlines, but gives excellent performance. For both normal render as unified implemented. Note the "mutex" locks on z-transp buffer render and imbuf loads. - This has been made possible by major cleanups in render code, especially getting rid of globals (example Tin Tr Tg Tb Ta for textures) or struct OSA or using Materials or Texture data to write to. - Made normal render fully 4x32 floats too, and removed all old optimizes with chars or shorts. - Made normal render and unified render use same code for sky and halo render, giving equal (and better) results for halo render. Old render now also uses PostProcess options (brightness, mul, gamma) - Added option ("FBuf") in F10 Output Panel, this keeps a 4x32 bits buffer after render. Using PostProcess menu you will note an immediate re- display of image too (32 bits RGBA) - Added "Hue" and "Saturation" sliders to PostProcess options - Render module is still not having a "nice" API, but amount of dependencies went down a lot. Next todo: remove abusive "previewrender" code. The last main global in Render (struct Render) now can be re-used for fully controlling a render, to allow multiple "instances" of render to open. - Renderwindow now displays a smal bar on top with the stats, and keeps the stats after render too. Including "spare" page support. Not only easier visible that way, but also to remove the awkward code that was drawing stats in the Info header (extreme slow on some ATIs too) - Cleaned up blendef.h and BKE_utildefines.h, these two had overlapping defines. - I might have forgotten stuff... and will write a nice doc on the architecture!
2004-12-27 19:28:52 +00:00
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
if (!U.prefetchframes) {
Initial revision
2002-10-12 11:37:38 +00:00
return;
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
CFRA = cfra;
Bug #2019 Separate in Mesh editmode, selectmode 'face', and with a selection that used to be in vertex mode a full select (like selecting the 2 opposing faces in a cube) caused crash. There was still no good face-select awareness there... tsk! :)
2004-12-15 11:36:46 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
sa= G.curscreen->areabase.first;
while(sa) {
if(sa==oldsa) {
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
scrarea_do_winprefetchdraw(sa);
Initial revision
2002-10-12 11:37:38 +00:00
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
else if(mode & 1) { /* all view3d and seq spaces */
Initial revision
2002-10-12 11:37:38 +00:00
if ELEM(sa->spacetype, SPACE_VIEW3D, SPACE_SEQ) {
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
scrarea_do_winprefetchdraw(sa);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
else if(mode & 4) { /* all seq spaces */
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
if (sa->spacetype == SPACE_SEQ) {
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
scrarea_do_winprefetchdraw(sa);
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
}
}
Initial revision
2002-10-12 11:37:38 +00:00
sa= sa->next;
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
CFRA = oldcfra;
curarea = oldcurarea;
}
static void inner_play_prefetch_startup(int mode)
{
int i;
if (!U.prefetchframes) {
return;
}
seq_start_threads();
for (i = 0; i <= U.prefetchframes; i++) {
int cfra = CFRA + i;
inner_play_prefetch_frame(mode, cfra);
}
seq_wait_for_prefetch_ready();
}
static void inner_play_prefetch_shutdown(int mode)
{
if (!U.prefetchframes) {
return;
}
seq_stop_threads();
}
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
static int cached_dynamics(int sfra, int efra)
{
Base *base = G.scene->base.first;
Object *ob;
ParticleSystem *psys;
Point Cache Refactoring ======================= Caching and Baking: - The point cache is now cleared on DAG_object_flush_update(), and not cleared for time dependency graph updates. - There is now a Bake button instead of Protect. Also cache start and end frames were added to softbody and particles. - The cloth autoprotect feature was removed. - The Ctrl+B menu now also bakes cloth and particles next to softbody and fluids. Additionally there are now frree bake and free cache menu entries. - The point cache api has been changed. There is now a PTCacheID struct for each point cache type that can be filled and then used to call the point cache functions. - PointCache struct was added to DNA and is automatically allocated for each physics type. - Soft body now supports Bake Editing just like cloth. - Tried to make the systems deal consistently with time ipo's and offsets. Still not sure it all works correct, but too complicated to solve completely now. Library Linking: - Added some more warnings to prevent editing settings on library linked objects. - Linked objects now read from the cache located next to the original library file, and never write to it. This restores old behavior for softbodies. For local simulation the mesh and not the object should be linked. - Dupligroups and proxies can't create local point caches at the moment, how to implement that I'm not sure. We probably need a proxy point cache for that to work (ugh). Physics UI: - Renamed deflection panel to collision for consistency and reorganized the buttons. Also removed some softbody collision buttons from the softbody panel that were duplicated in this panel for cloth. - Tweaked field panel buttons to not jump around when changing options. - Tabbing e.g. Soft Body Collision into the Soft Body panel, it now only shows Collision to make the panel names readable. - I tried to make enabled/disabling physics more consistent, since all three system did things different. Now the two modifier buttons to enable the modifier for the viewport and rendering are also duplicated in the physics panels. Toggling the Soft Body and Cloth buttons now both remove their modifiers. - Fixed modifier error drawing glitch. Particles: - Particles are now recalculated more often than before. Previously it did partial updates based on the changes, but that doesn't work well with DAG_object_flush_update() .. - Fixed memory leak loading keyed particle system. Now keys are not written to file anymore but always created after loading. - Make particle threads work with autothreads. Continue Physics: - The timeline play now has a Continue Physics option in the playback menu, which keeps the simulations going without writing them to the cache. - This doesn't always work that well, some changes are not immediately updated, but this can be improved later. Still it's fun to get a feel for the physics. Todo: - Point cache can get out of sync with and undo and changing a file without saving it. - Change the point cache file format to store a version (so old point cache files can be either converted or at least ignored), and to do correct endian conversion. - Menu item and/or buttons for Ctrl+B. - A system("rm ..") was changed to remove() since the former is very slow for clearing point caches. These system() calls were already giving trouble in a bug in the tracker, but really most use of this system("") should be changed and tested. - The Soft Body Collision and Clot Collision panel titles don't mention there's point cache settings there too, doing that makes them unreadable with the default panel setup.. but may need to make the names longer anyway.
2008-04-10 11:39:20 +00:00
int i, cached=1;
PTCacheID pid;
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
while(base && cached) {
ob = base->object;
if(ob->softflag & OB_SB_ENABLE && ob->soft) {
Point Cache Refactoring ======================= Caching and Baking: - The point cache is now cleared on DAG_object_flush_update(), and not cleared for time dependency graph updates. - There is now a Bake button instead of Protect. Also cache start and end frames were added to softbody and particles. - The cloth autoprotect feature was removed. - The Ctrl+B menu now also bakes cloth and particles next to softbody and fluids. Additionally there are now frree bake and free cache menu entries. - The point cache api has been changed. There is now a PTCacheID struct for each point cache type that can be filled and then used to call the point cache functions. - PointCache struct was added to DNA and is automatically allocated for each physics type. - Soft body now supports Bake Editing just like cloth. - Tried to make the systems deal consistently with time ipo's and offsets. Still not sure it all works correct, but too complicated to solve completely now. Library Linking: - Added some more warnings to prevent editing settings on library linked objects. - Linked objects now read from the cache located next to the original library file, and never write to it. This restores old behavior for softbodies. For local simulation the mesh and not the object should be linked. - Dupligroups and proxies can't create local point caches at the moment, how to implement that I'm not sure. We probably need a proxy point cache for that to work (ugh). Physics UI: - Renamed deflection panel to collision for consistency and reorganized the buttons. Also removed some softbody collision buttons from the softbody panel that were duplicated in this panel for cloth. - Tweaked field panel buttons to not jump around when changing options. - Tabbing e.g. Soft Body Collision into the Soft Body panel, it now only shows Collision to make the panel names readable. - I tried to make enabled/disabling physics more consistent, since all three system did things different. Now the two modifier buttons to enable the modifier for the viewport and rendering are also duplicated in the physics panels. Toggling the Soft Body and Cloth buttons now both remove their modifiers. - Fixed modifier error drawing glitch. Particles: - Particles are now recalculated more often than before. Previously it did partial updates based on the changes, but that doesn't work well with DAG_object_flush_update() .. - Fixed memory leak loading keyed particle system. Now keys are not written to file anymore but always created after loading. - Make particle threads work with autothreads. Continue Physics: - The timeline play now has a Continue Physics option in the playback menu, which keeps the simulations going without writing them to the cache. - This doesn't always work that well, some changes are not immediately updated, but this can be improved later. Still it's fun to get a feel for the physics. Todo: - Point cache can get out of sync with and undo and changing a file without saving it. - Change the point cache file format to store a version (so old point cache files can be either converted or at least ignored), and to do correct endian conversion. - Menu item and/or buttons for Ctrl+B. - A system("rm ..") was changed to remove() since the former is very slow for clearing point caches. These system() calls were already giving trouble in a bug in the tracker, but really most use of this system("") should be changed and tested. - The Soft Body Collision and Clot Collision panel titles don't mention there's point cache settings there too, doing that makes them unreadable with the default panel setup.. but may need to make the names longer anyway.
2008-04-10 11:39:20 +00:00
BKE_ptcache_id_from_softbody(&pid, ob, ob->soft);
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
for(i=sfra; i<=efra && cached; i++)
Point Cache Refactoring ======================= Caching and Baking: - The point cache is now cleared on DAG_object_flush_update(), and not cleared for time dependency graph updates. - There is now a Bake button instead of Protect. Also cache start and end frames were added to softbody and particles. - The cloth autoprotect feature was removed. - The Ctrl+B menu now also bakes cloth and particles next to softbody and fluids. Additionally there are now frree bake and free cache menu entries. - The point cache api has been changed. There is now a PTCacheID struct for each point cache type that can be filled and then used to call the point cache functions. - PointCache struct was added to DNA and is automatically allocated for each physics type. - Soft body now supports Bake Editing just like cloth. - Tried to make the systems deal consistently with time ipo's and offsets. Still not sure it all works correct, but too complicated to solve completely now. Library Linking: - Added some more warnings to prevent editing settings on library linked objects. - Linked objects now read from the cache located next to the original library file, and never write to it. This restores old behavior for softbodies. For local simulation the mesh and not the object should be linked. - Dupligroups and proxies can't create local point caches at the moment, how to implement that I'm not sure. We probably need a proxy point cache for that to work (ugh). Physics UI: - Renamed deflection panel to collision for consistency and reorganized the buttons. Also removed some softbody collision buttons from the softbody panel that were duplicated in this panel for cloth. - Tweaked field panel buttons to not jump around when changing options. - Tabbing e.g. Soft Body Collision into the Soft Body panel, it now only shows Collision to make the panel names readable. - I tried to make enabled/disabling physics more consistent, since all three system did things different. Now the two modifier buttons to enable the modifier for the viewport and rendering are also duplicated in the physics panels. Toggling the Soft Body and Cloth buttons now both remove their modifiers. - Fixed modifier error drawing glitch. Particles: - Particles are now recalculated more often than before. Previously it did partial updates based on the changes, but that doesn't work well with DAG_object_flush_update() .. - Fixed memory leak loading keyed particle system. Now keys are not written to file anymore but always created after loading. - Make particle threads work with autothreads. Continue Physics: - The timeline play now has a Continue Physics option in the playback menu, which keeps the simulations going without writing them to the cache. - This doesn't always work that well, some changes are not immediately updated, but this can be improved later. Still it's fun to get a feel for the physics. Todo: - Point cache can get out of sync with and undo and changing a file without saving it. - Change the point cache file format to store a version (so old point cache files can be either converted or at least ignored), and to do correct endian conversion. - Menu item and/or buttons for Ctrl+B. - A system("rm ..") was changed to remove() since the former is very slow for clearing point caches. These system() calls were already giving trouble in a bug in the tracker, but really most use of this system("") should be changed and tested. - The Soft Body Collision and Clot Collision panel titles don't mention there's point cache settings there too, doing that makes them unreadable with the default panel setup.. but may need to make the names longer anyway.
2008-04-10 11:39:20 +00:00
cached &= BKE_ptcache_id_exist(&pid, i);
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
}
for(psys=ob->particlesystem.first; psys; psys=psys->next) {
if(psys->part->type==PART_HAIR) {
Point Cache Refactoring ======================= Caching and Baking: - The point cache is now cleared on DAG_object_flush_update(), and not cleared for time dependency graph updates. - There is now a Bake button instead of Protect. Also cache start and end frames were added to softbody and particles. - The cloth autoprotect feature was removed. - The Ctrl+B menu now also bakes cloth and particles next to softbody and fluids. Additionally there are now frree bake and free cache menu entries. - The point cache api has been changed. There is now a PTCacheID struct for each point cache type that can be filled and then used to call the point cache functions. - PointCache struct was added to DNA and is automatically allocated for each physics type. - Soft body now supports Bake Editing just like cloth. - Tried to make the systems deal consistently with time ipo's and offsets. Still not sure it all works correct, but too complicated to solve completely now. Library Linking: - Added some more warnings to prevent editing settings on library linked objects. - Linked objects now read from the cache located next to the original library file, and never write to it. This restores old behavior for softbodies. For local simulation the mesh and not the object should be linked. - Dupligroups and proxies can't create local point caches at the moment, how to implement that I'm not sure. We probably need a proxy point cache for that to work (ugh). Physics UI: - Renamed deflection panel to collision for consistency and reorganized the buttons. Also removed some softbody collision buttons from the softbody panel that were duplicated in this panel for cloth. - Tweaked field panel buttons to not jump around when changing options. - Tabbing e.g. Soft Body Collision into the Soft Body panel, it now only shows Collision to make the panel names readable. - I tried to make enabled/disabling physics more consistent, since all three system did things different. Now the two modifier buttons to enable the modifier for the viewport and rendering are also duplicated in the physics panels. Toggling the Soft Body and Cloth buttons now both remove their modifiers. - Fixed modifier error drawing glitch. Particles: - Particles are now recalculated more often than before. Previously it did partial updates based on the changes, but that doesn't work well with DAG_object_flush_update() .. - Fixed memory leak loading keyed particle system. Now keys are not written to file anymore but always created after loading. - Make particle threads work with autothreads. Continue Physics: - The timeline play now has a Continue Physics option in the playback menu, which keeps the simulations going without writing them to the cache. - This doesn't always work that well, some changes are not immediately updated, but this can be improved later. Still it's fun to get a feel for the physics. Todo: - Point cache can get out of sync with and undo and changing a file without saving it. - Change the point cache file format to store a version (so old point cache files can be either converted or at least ignored), and to do correct endian conversion. - Menu item and/or buttons for Ctrl+B. - A system("rm ..") was changed to remove() since the former is very slow for clearing point caches. These system() calls were already giving trouble in a bug in the tracker, but really most use of this system("") should be changed and tested. - The Soft Body Collision and Clot Collision panel titles don't mention there's point cache settings there too, doing that makes them unreadable with the default panel setup.. but may need to make the names longer anyway.
2008-04-10 11:39:20 +00:00
if(psys->softflag & OB_SB_ENABLE && psys->soft) {
BKE_ptcache_id_from_softbody(&pid, ob, psys->soft);
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
Point Cache Refactoring ======================= Caching and Baking: - The point cache is now cleared on DAG_object_flush_update(), and not cleared for time dependency graph updates. - There is now a Bake button instead of Protect. Also cache start and end frames were added to softbody and particles. - The cloth autoprotect feature was removed. - The Ctrl+B menu now also bakes cloth and particles next to softbody and fluids. Additionally there are now frree bake and free cache menu entries. - The point cache api has been changed. There is now a PTCacheID struct for each point cache type that can be filled and then used to call the point cache functions. - PointCache struct was added to DNA and is automatically allocated for each physics type. - Soft body now supports Bake Editing just like cloth. - Tried to make the systems deal consistently with time ipo's and offsets. Still not sure it all works correct, but too complicated to solve completely now. Library Linking: - Added some more warnings to prevent editing settings on library linked objects. - Linked objects now read from the cache located next to the original library file, and never write to it. This restores old behavior for softbodies. For local simulation the mesh and not the object should be linked. - Dupligroups and proxies can't create local point caches at the moment, how to implement that I'm not sure. We probably need a proxy point cache for that to work (ugh). Physics UI: - Renamed deflection panel to collision for consistency and reorganized the buttons. Also removed some softbody collision buttons from the softbody panel that were duplicated in this panel for cloth. - Tweaked field panel buttons to not jump around when changing options. - Tabbing e.g. Soft Body Collision into the Soft Body panel, it now only shows Collision to make the panel names readable. - I tried to make enabled/disabling physics more consistent, since all three system did things different. Now the two modifier buttons to enable the modifier for the viewport and rendering are also duplicated in the physics panels. Toggling the Soft Body and Cloth buttons now both remove their modifiers. - Fixed modifier error drawing glitch. Particles: - Particles are now recalculated more often than before. Previously it did partial updates based on the changes, but that doesn't work well with DAG_object_flush_update() .. - Fixed memory leak loading keyed particle system. Now keys are not written to file anymore but always created after loading. - Make particle threads work with autothreads. Continue Physics: - The timeline play now has a Continue Physics option in the playback menu, which keeps the simulations going without writing them to the cache. - This doesn't always work that well, some changes are not immediately updated, but this can be improved later. Still it's fun to get a feel for the physics. Todo: - Point cache can get out of sync with and undo and changing a file without saving it. - Change the point cache file format to store a version (so old point cache files can be either converted or at least ignored), and to do correct endian conversion. - Menu item and/or buttons for Ctrl+B. - A system("rm ..") was changed to remove() since the former is very slow for clearing point caches. These system() calls were already giving trouble in a bug in the tracker, but really most use of this system("") should be changed and tested. - The Soft Body Collision and Clot Collision panel titles don't mention there's point cache settings there too, doing that makes them unreadable with the default panel setup.. but may need to make the names longer anyway.
2008-04-10 11:39:20 +00:00
for(i=sfra; i<=efra && cached; i++)
cached &= BKE_ptcache_id_exist(&pid, i);
}
}
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
}
base = base->next;
}
return cached;
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
void inner_play_anim_loop(int init, int mode)
{
ScrArea *sa;
static int last_cfra = -1;
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
static int cached = 0;
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
/* init */
if(init) {
oldsa= curarea;
== Core == This adds fractional FPS support to blender and should finally make NTSC work correctly. NTSC has an FPS of 30.0/1.001 which is approximately 29.97 FPS. Therefore, it is not enough to simply make frs_sec a float, since you can't represent this accurately enough. I added a seperate variable frs_sec_base and FPS is now frs_sec / frs_sec_base. I changed all the places, where frs_sec was used to my best knowledge. For convenience sake, I added several macros, that should make life easier in the future: FRA2TIME(a) : convert frame number to a double precision time in seconds TIME2FRA(a) : the same in the opposite direction FPS : return current FPS as a double precision number (last resort) This closes bug #6715 Standard framerates not supported / breaks sync -- 23.967 29.967 etc. https://projects.blender.org/tracker/?func=detail&aid=6715&group_id=9&atid=125 Please give this heavy testing with NTSC files, quicktime in/export and the python interface. Errors are most probably only spotted on longer timelines, so that is also important. The patch was tested by Troy Sobotka and me, so it most probably should work out of the box, but wider testing is important, since errors are very subtle. Enjoy!
2007-10-21 15:42:08 +00:00
swaptime= 1.0/FPS;
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
tottime= 0.0;
curmode= mode;
last_cfra = -1;
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
cached = cached_dynamics(PSFRA,PEFRA);
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
fps timer was starting off at 0 fps
2008-05-07 18:33:10 +00:00
redrawtime = 0.0;
[#8397] "playback fps' jumps all over the map average over the last 8 times to reduce flickering. ideally this would show how many frames were drawn in the last second. but I think this is good enough just to get an idea how fast the animation is playing without annoying flicker.
2008-05-01 14:51:06 +00:00
redrawtime_index = REDRAW_FRAME_AVERAGE;
while(redrawtime_index--) {
redrawtimes_fps[redrawtime_index] = 0.0;
}
fix for [#10458] Rc4 Blender crash when activate playback FPS than Alt+A to play animation.
2008-05-05 06:30:19 +00:00
redrawtime_index = 0;
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
lredrawtime = 0.0;
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
return;
}
if (CFRA != last_cfra) {
int pf;
set_timecursor(CFRA);
Initial revision
2002-10-12 11:37:38 +00:00
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
update_for_newframe_nodraw(1); /* adds no events in UI */
sa= G.curscreen->areabase.first;
while(sa) {
if(sa==oldsa) {
scrarea_do_windraw(sa);
}
else if(curmode & 1) { /* all view3d and seq spaces */
if ELEM(sa->spacetype, SPACE_VIEW3D, SPACE_SEQ) {
scrarea_do_windraw(sa);
}
}
else if(curmode & 4) { /* all seq spaces */
if (sa->spacetype == SPACE_SEQ) {
scrarea_do_windraw(sa);
}
}
sa= sa->next;
}
if (last_cfra == -1) {
last_cfra = CFRA - 1;
}
if (U.prefetchframes) {
pf = last_cfra;
if (CFRA - last_cfra >= U.prefetchframes ||
CFRA - last_cfra < 0) {
pf = CFRA - U.prefetchframes;
fprintf(stderr,
"SEQ-THREAD: Lost sync, "
"stopping threads, "
"back to skip mode...\n");
seq_stop_threads();
} else {
while (pf < CFRA) {
int c;
pf++;
c = pf + U.prefetchframes;
if (c >= PEFRA) {
c -= PEFRA;
c += PSFRA;
}
inner_play_prefetch_frame(curmode, c);
}
}
}
}
last_cfra = CFRA;
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* make sure that swaptime passed by */
Initial revision
2002-10-12 11:37:38 +00:00
tottime -= swaptime;
== Ipo == This fixes [#11118] Record Mouse in IPO Curve Editor 2.46rc3 and adds thereby a new feature: correct audio sync to IPO mouse recording :)
2008-05-12 17:16:54 +00:00
while (update_time(CFRA)) {
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
PIL_sleep_ms(1);
}
if (CFRA >= PEFRA) {
if (tottime > 0.0) {
tottime = 0.0;
}
CFRA = PSFRA;
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
audiostream_stop();
audiostream_start( CFRA );
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
cached = cached_dynamics(PSFRA,PEFRA);
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
} else {
2nd try at committing to trunk (instead of particles branch) :) Fixes for bugs in #7833 - Hair softbody cache was reset on rendering. - When Alt-a playback is synced to audio frames are skipped. This caused dynamics caching to go crazy. Now the first loop of playback goes through all frames if there are non cached dynamic systems. Invalid point caches weren't cleared when new systems were created. This caused messed up shapes when softbody was added.
2007-11-29 21:09:16 +00:00
if (cached
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
&& (G.scene->audio.flag & AUDIO_SYNC)) {
CFRA = audiostream_pos();
} else {
CFRA++;
}
if (CFRA < last_cfra) {
fprintf(stderr,
"SEQ-THREAD: CFRA running backwards: %d\n",
CFRA);
}
Initial revision
2002-10-12 11:37:38 +00:00
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
}
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
/* play_anim: 'mode' defines where to play and if repeat is on (now bitfield):
* - mode & 1 : All view3d and seq areas
* - mode & 2 : No replay
* - mode & 4 : All seq areas
*/
Initial revision
2002-10-12 11:37:38 +00:00
int play_anim(int mode)
{
ScrArea *sa, *oldsa;
int cfraont;
unsigned short event=0;
Used valgrind to find some uninitialized variables
2008-01-05 19:11:10 +00:00
short val = 0; /* its possible qtest() wont run and val must be initialized */
Armature speed ups, Part I -------------------------- Major speed up for armatures during times when you aren't posing a figure. Background: the calculation of poses generated by actions and the calculation of displists were getting somewhat out of sync. This was being remedied by 'clearing the constraint done flag' of the pose channels and recalculating the displists every time the 3d view was redrawn, making life slow and unpleasant. Commenting out the code that was doing this, then reinserting the 'clearing the constraint done flag' at the right times made things a bit more perky.
2004-01-02 23:29:34 +00:00
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
/* patch for very very old scenes */
Initial revision
2002-10-12 11:37:38 +00:00
if(SFRA==0) SFRA= 1;
if(EFRA==0) EFRA= 250;
The revised patch from Leon for new particle effects. New is that objects can have a force field, and Meshes can even deflect (collide) particles. This is in a new sub-menu in Object buttons F7 The full instructions where on the web, Leon mailed it me and I will put it in CMS tomorrow. For those who like to play with it now, here are demo files: http://download.blender.org/demo/test/ Quite some changes where in the integration though... so previous created particle deflectors will not work. Changes to mention now are: - gravity is renamed to 'force field' - force field and deflector options are in Object now, not in Mesh - the options also have its own struct, doesnt add to Object by default - force fields are possible for all object types, but only work on center. So empty objects are typical for it. Work to do: - add draw method in 3d win to denote forcefield objects - check on the UI (panel with different size?) - add 'recalc' button in deflector panel
2004-06-26 18:18:11 +00:00
== Preview Range == Preview Range is a useful tool for animating (espcially on longer timelines). It allows you to only run through a limited set of frames to quickly preview the timing of a section of movement without going through the whole timeline. It means you don't have to set/reset start/end frame for rendering everytime you wish to only preview a region of frames. Hi Ton, Attached is a patch (I know you've already got lots of them in the tracker ;-) ) for a feature that I've sometimes wanted. It seems that this sort of thing is supported in other packages, but I can't be sure. Note: I may have left in a few bits and pieces I didn't mean to in the patch (this is off a source tree which had quite a few revisions in it, all of which was experimental) == Preview Range == Preview range is useful for animating (espcially on longer timelines). It allows you to only run through a limited set of frames to quickly preview the timing of a section of movement without going through the whole timeline. It means you don't have to set/reset start/end frame for rendering everytime you wish to only preview a region of frames. * 'Ctrl P' in Action/NLA/Timeline sets preview range. Click+drag to form selection-box defining region of frames to preview * 'Alt P' in Action/NLA/Timeline to clear preview range * 'Pre' button beside Start/End fields in timeline toggles whether start/end fields refer to scene or preview * 'Ctrl Rightarrow' and 'Ctrl Leftarrow' jump to start/end of preview region when it is set * 'S' and 'E' set the start/end frames of preview region when it is set (just like normally) in Timeline only * In Action/NLA editors, frames out of preview region are now drawn darkened when preview-region is set See the following page for more info later: http://wiki.blender.org/index.php/User:Aligorith/Preview_Range
2007-03-19 07:32:36 +00:00
if(PSFRA>PEFRA) return 0;
Initial revision
2002-10-12 11:37:38 +00:00
/* waitcursor(1); */
first of the c code comment translation in the mother of all directories!
2003-04-28 14:43:20 +00:00
G.f |= G_PLAYANIM; /* in sequence.c and view.c this is handled */
Initial revision
2002-10-12 11:37:38 +00:00
cfraont= CFRA;
oldsa= curarea;
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
if (curarea && curarea->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = curarea->spacedata.first;
if (sseq->mainb == 0) mode |= 4;
}
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
inner_play_prefetch_startup(mode);
== Ipo == This fixes [#11118] Record Mouse in IPO Curve Editor 2.46rc3 and adds thereby a new feature: correct audio sync to IPO mouse recording :)
2008-05-12 17:16:54 +00:00
update_time(CFRA);
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
inner_play_anim_loop(1, mode); /* 1==init */
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
audiostream_start( CFRA );
When pressing ALT+A, i noticed other windows advance 1 frame. This is caused by swapbuffers system, which redraws the other windows when the CFRA timer already advanced 1 frame. Added an extra redraw to fix this. Could fix report #964, will wait for JWalton to verify.
2004-05-07 11:59:41 +00:00
/* forces all buffers to be OK for current frame (otherwise other windows get redrawn with CFRA+1) */
curarea->win_swap= WIN_BACK_OK;
screen_swapbuffers();
== Sequencer == Attention! Rather large sequencer rewrite: * Implemented layer blending using implicit effects. (works like layers in "The Gimp" or Photoshop.) * Fixed Space-Bar start-stop in preview windows. You can start playback using spacebar within a preview-window and it _works_! * Fixed Flip Y (didn't work for float) * Fixed premul (didn't work for float) * Added IPOs to _all_ tracks. In blend-mode REPLACE it drives the "mul"-parameter in all other blend modes it drives the effect. * you can meta single tracks. * moved "mute track" from "M" to "Shift-M" * added "Shift-L" for "lock track" * changed inner workings for Metas. Now all ImBufs have to use the reference counting mechanism. (Only interesting for coders :) !!! Really important change, that affects current files! Since you can mute tracks and now there is real layer blending capabilities in place, I changed the silly behaviour that chose the output track. Old behaviour: if we have an effect track visible, use the uppermost effect track. If there is _no_ effect track visible, use the lowest input track. New behaviour: always use the uppermost track. With blend modes active: work our way down starting from the uppermost track to the first "replace"-mode track. This is the way the gimp, photoshop, basically _all_ other applications work... So if this change ruins your day: please try to fix your files using "mute". If this doesn't work out, I can still restore the old behaviour, but I really hope, that this is _not_ necessary! Rational: most people won't get affected by this change, since you can't really do anything usefull with the (old) sequencer without at least one effect track and then you are on the safe side...
2008-01-01 11:44:42 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
while(TRUE) {
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
if (U.uiflag & USER_SHOW_FPS)
lredrawtime = PIL_check_seconds_timer();
Initial revision
2002-10-12 11:37:38 +00:00
while(qtest()) {
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
/* we test events first because of MKEY event */
Initial revision
2002-10-12 11:37:38 +00:00
event= extern_qread(&val);
if(event==ESCKEY) break;
else if(event==MIDDLEMOUSE) {
Converted the Userpreference buttons to zr's new ButBit calls. Also added USER_* to each define located in DNA_userdef.h.
2004-01-13 14:50:45 +00:00
if(U.flag & USER_VIEWMOVE) {
Initial revision
2002-10-12 11:37:38 +00:00
if(G.qual & LR_SHIFTKEY) viewmove(0);
else if(G.qual & LR_CTRLKEY) viewmove(2);
else viewmove(1);
}
else {
if(G.qual & LR_SHIFTKEY) viewmove(1);
else if(G.qual & LR_CTRLKEY) viewmove(2);
else viewmove(0);
}
fix for [#11121] mouse wheel dont work when playing animation
2008-05-10 19:05:46 +00:00
} else if (event==WHEELDOWNMOUSE || (val && event==PADMINUS)) { /* copied from persptoetsen */
bugfix for own bug. mousewheel while playing in the sequencer crashes blender.
2008-05-28 21:15:40 +00:00
if (G.vd) { /* when using the sequencer this can be NULL */
/* this min and max is also in viewmove() */
if(G.vd->persp==V3D_CAMOB) {
G.vd->camzoom-= 10;
if(G.vd->camzoom<-30) G.vd->camzoom= -30;
}
else if(G.vd->dist<10.0*G.vd->far) G.vd->dist*=1.2f;
fix for [#11121] mouse wheel dont work when playing animation
2008-05-10 19:05:46 +00:00
}
} else if (event==WHEELUPMOUSE || (val && event==PADPLUSKEY)) { /* copied from persptoetsen */
bugfix for own bug. mousewheel while playing in the sequencer crashes blender.
2008-05-28 21:15:40 +00:00
if (G.vd) {
if(G.vd->persp==V3D_CAMOB) {
G.vd->camzoom+= 10;
if(G.vd->camzoom>300) G.vd->camzoom= 300;
}
else if(G.vd->dist> 0.001*G.vd->grid) G.vd->dist*=.83333f;
fix for [#11121] mouse wheel dont work when playing animation
2008-05-10 19:05:46 +00:00
}
} else if(event==MKEY) {
Big Commit. Now time-markers work in all time-related spaces (i.e. Ipo, Action Editor, NLA editor, TimeLine, Sound). The hotkeys and functionality set should be the same for each of these modes (with a few exceptions still). I've had to change a few hotkeys here and there, so hopefully they aren't too bad. Marker Operations: MKEY - Add Marker SHIFT MKEY - Rename marker (was CTRL MKEY) XKEY - Delete Marker PAGE UP - Jump to next marker PAGE DOWN - Jump to previous marker CTRL A - Select all markers SHIFT G - Transform markers (NLA, IPO, Action) G - Transform markers (Sound, Timeline) CTRL SHIFT D - Duplicate markers (NLA, IPO, Action) SHIFT D - Duplicate markers (Sound, Timeline) BKEY - select markers and other keyframes (if any) I've also made a few little tool additions to NLA and Action editors: * NLA editor - Snap To Frame. Now with the option to offset strip so that it starts at the current frame. Added menus for this. * Action editor - Snap To Frame A few new menus for this too
2006-11-30 01:57:14 +00:00
if(val) add_marker(CFRA-1);
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
== Sequencer == Attention! Rather large sequencer rewrite: * Implemented layer blending using implicit effects. (works like layers in "The Gimp" or Photoshop.) * Fixed Space-Bar start-stop in preview windows. You can start playback using spacebar within a preview-window and it _works_! * Fixed Flip Y (didn't work for float) * Fixed premul (didn't work for float) * Added IPOs to _all_ tracks. In blend-mode REPLACE it drives the "mul"-parameter in all other blend modes it drives the effect. * you can meta single tracks. * moved "mute track" from "M" to "Shift-M" * added "Shift-L" for "lock track" * changed inner workings for Metas. Now all ImBufs have to use the reference counting mechanism. (Only interesting for coders :) !!! Really important change, that affects current files! Since you can mute tracks and now there is real layer blending capabilities in place, I changed the silly behaviour that chose the output track. Old behaviour: if we have an effect track visible, use the uppermost effect track. If there is _no_ effect track visible, use the lowest input track. New behaviour: always use the uppermost track. With blend modes active: work our way down starting from the uppermost track to the first "replace"-mode track. This is the way the gimp, photoshop, basically _all_ other applications work... So if this change ruins your day: please try to fix your files using "mute". If this doesn't work out, I can still restore the old behaviour, but I really hope, that this is _not_ necessary! Rational: most people won't get affected by this change, since you can't really do anything usefull with the (old) sequencer without at least one effect track and then you are on the safe side...
2008-01-01 11:44:42 +00:00
if(val && ELEM3(event, ESCKEY, SPACEKEY, RIGHTMOUSE)) break;
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
inner_play_anim_loop(0, 0);
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
Timline goodies; - Mkey while ALT+A inserts markers. Note for Matt; You forgot to check for 'val'. The delay in tuho I brought back to max 1 frame. Delays are common in realtime gfx apps, the picture you see is old, and its possible you press a key while next frame is already drawing, and then it has to increase the frame value still... :) - RMB escapes from anim playback - on activate object, Timeline redraws too - Added keyline drawing for Material Ipos. The CTRL+Page keys work with it. Softbody: - Renamed buttons to call "Spring constant" now "Stiff(ness)" and the "Friction" became "Damping".
2005-05-08 20:10:59 +00:00
screen_swapbuffers();
display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip
2007-12-11 14:19:05 +00:00
if (U.uiflag & USER_SHOW_FPS)
redrawtime = lredrawtime;
== Preview Range == Preview Range is a useful tool for animating (espcially on longer timelines). It allows you to only run through a limited set of frames to quickly preview the timing of a section of movement without going through the whole timeline. It means you don't have to set/reset start/end frame for rendering everytime you wish to only preview a region of frames. Hi Ton, Attached is a patch (I know you've already got lots of them in the tracker ;-) ) for a feature that I've sometimes wanted. It seems that this sort of thing is supported in other packages, but I can't be sure. Note: I may have left in a few bits and pieces I didn't mean to in the patch (this is off a source tree which had quite a few revisions in it, all of which was experimental) == Preview Range == Preview range is useful for animating (espcially on longer timelines). It allows you to only run through a limited set of frames to quickly preview the timing of a section of movement without going through the whole timeline. It means you don't have to set/reset start/end frame for rendering everytime you wish to only preview a region of frames. * 'Ctrl P' in Action/NLA/Timeline sets preview range. Click+drag to form selection-box defining region of frames to preview * 'Alt P' in Action/NLA/Timeline to clear preview range * 'Pre' button beside Start/End fields in timeline toggles whether start/end fields refer to scene or preview * 'Ctrl Rightarrow' and 'Ctrl Leftarrow' jump to start/end of preview region when it is set * 'S' and 'E' set the start/end frames of preview region when it is set (just like normally) in Timeline only * In Action/NLA editors, frames out of preview region are now drawn darkened when preview-region is set See the following page for more info later: http://wiki.blender.org/index.php/User:Aligorith/Preview_Range
2007-03-19 07:32:36 +00:00
if((mode & 2) && CFRA==PEFRA) break; /* no replay */
Initial revision
2002-10-12 11:37:38 +00:00
}
if(event==SPACEKEY);
else CFRA= cfraont;
Bug fix 823 Animated metaballs didn't update correctly when changing frame, this when they were parented (for example) to an object with Ipo. The fix consists of three things: - the test_displist() call doesn't remake displist anymore, but frees it. this works, because when drawing an mball object it checks for a displist and creates one when needed - the main drawing routine drawview3d() now has a separate loop where first all objects are updated with where_is_object(), then they're drawn. This effectively solves lag for mballs. Might improve other lags too! - included in NumPad-9 call to test_displist() too, to force a full upgraded 3d view
2004-04-08 12:00:58 +00:00
== Sequencer == This patch adds prefetch buffering to the sequencer (see the tracker for additional details: https://projects.blender.org/tracker/?func=detail&aid=7307&group_id=9&atid=127 ) We create seperate render threads (currently one, because of the fact, that sequence rendering modifies global structures...), that render up to the defined userpref value "Prefetch frames" in advance. (Pressing Alt-A will _first_ fill the buffer and then start playing.) Bassam and I did some extensive testing, so it should work. If you don't configure your number of prefetch frames, prefetching is disabled! (Sane defaults... :) Also: if the machine is definitely too slow and runs out of the prefetch area, prefetching is disabled automatically and we are back to good old frame skipping mode. My Dual Athlon is able to handle 4 parallel DV streams at once (sometimes a little bit choppy, but prefetching is never disabled!) I fixed also a long standing bug in the audio code, that made playback run backwards at the beginning...
2007-10-01 08:03:11 +00:00
inner_play_prefetch_shutdown(mode);
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
audiostream_stop();
Initial revision
2002-10-12 11:37:38 +00:00
if(oldsa!=curarea) areawinset(oldsa->win);
/* restore all areas */
sa= G.curscreen->areabase.first;
while(sa) {
Tiny usability fix: Until now, pressing ALT-A in a sequencer space without image preview was pretty useless: It only showed an advancing green frame pointer :) Now, if you press ALT-A over a sequencer space with strips, it will also animate all sequence previews. So, no need to press SHIFT-ALT-A in that situation anymore. Of course, pressing ALT-A over a preview will still only play that preview. Windows other than sequencer windows remain unaffected by this commit.
2006-11-13 17:31:39 +00:00
if( ((mode & 1) && sa->spacetype==SPACE_VIEW3D) || sa==curarea) addqueue(sa->win, REDRAW, 1);
Initial revision
2002-10-12 11:37:38 +00:00
sa= sa->next;
}
/* groups could have changed ipo */
allspace(REMAKEIPO, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWNLA, 0);
allqueue (REDRAWACTION, 0);
Result of 2 weeks of quiet coding work in Greece :) Aim was to get a total refresh of the animation system. This is needed because; - we need to upgrade it with 21st century features - current code is spaghetti/hack combo, and hides good design - it should become lag-free with using dependency graphs A full log, with complete code API/structure/design explanation will follow, that's a load of work... so here below the list with hot changes; - The entire object update system (matrices, geometry) is now centralized. Calls to where_is_object and makeDispList are forbidden, instead we tag objects 'changed' and let the depgraph code sort it out - Removed all old "Ika" code - Depgraph is aware of all relationships, including meta balls, constraints, bevelcurve, and so on. - Made depgraph aware of relation types and layers, to do smart flushing of 'changed' events. Nothing gets calculated too often! - Transform uses depgraph to detect changes - On frame-advance, depgraph flushes animated changes Armatures; Almost all armature related code has been fully built from scratch. It now reveils the original design much better, with a very clean implementation, lag free without even calculating each Bone more than once. Result is quite a speedup yes! Important to note is; 1) Armature is data containing the 'rest position' 2) Pose is the changes of rest position, and always on object level. That way more Objects can use same Pose. Also constraints are in Pose 3) Actions only contain the Ipos to change values in Poses. - Bones draw unrotated now - Drawing bones speedup enormously (10-20 times) - Bone selecting in EditMode, selection state is saved for PoseMode, and vice-versa - Undo in editmode - Bone renaming does vertexgroups, constraints, posechannels, actions, for all users of Armature in entire file - Added Bone renaming in NKey panel - Nkey PoseMode shows eulers now - EditMode and PoseMode now have 'active' bone too (last clicked) - Parenting in EditMode' CTRL+P, ALT+P, with nice options! - Pose is added in Outliner now, with showing that constraints are in the Pose, not Armature - Disconnected IK solving from constraints. It's a separate phase now, on top of the full Pose calculations - Pose itself has a dependency graph too, so evaluation order is lag free. TODO NOW; - Rotating in Posemode has incorrect inverse transform (Martin will fix) - Python Bone/Armature/Pose API disabled... needs full recode too (wait for my doc!) - Game engine will need upgrade too - Depgraph code needs revision, cleanup, can be much faster! (But, compliments for Jean-Luc, it works like a charm!) - IK changed, it now doesnt use previous position to advance to next position anymore. That system looks nice (no flips) but is not well suited for NLA and background render. TODO LATER; We now can do loadsa new nifty features as well; like: - Kill PoseMode (can be option for armatures itself) - Make B-Bones (Bezier, Bspline, like for spines) - Move all silly button level edit to 3d window (like CTRL+I = add IK) - Much better & informative drawing - Fix action/nla editors - Put all ipos in Actions (object, mesh key, lamp color) - Add hooks - Null bones - Much more advanced constraints... Bugfixes; - OGL render (view3d header) had wrong first frame on anim render - Ipo 'recording' mode had wrong playback speed - Vertex-key mode now sticks to show 'active key', until frame change -Ton-
2005-07-03 17:35:38 +00:00
/* restore for cfra */
Commit message and the brunt of the code courtesy of intrr, apologies for the size of this; Finally, the Sequencer audio support and global audio/animation sync stuff! (See http://intrr.org/blender/audiosequencer.html) Stuff that has been done: ./source/blender/blenloader/intern/writefile.c ./source/blender/blenloader/intern/readfile.c Added code to make it handle sounds used by audio strips, and to convert Scene data from older (<2.28) versions to init Scene global audio settings (Scene->audio) to defaults. ./source/blender/include/BSE_seqaudio.h ./source/blender/src/seqaudio.c The main audio routines that start/stop/scrub the audio stream at a certain frame position, provide the frame reference for the current stream position, mix the audio, convert the audio, mixdown the audio into a file. ./source/blender/makesdna/DNA_sound_types.h Introduced new variables in the bSound struct to accomodate the sample data after converted to the scene's global mixing format (stream, streamlen). Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound belongs to a sequence strip. ./source/blender/makesdna/DNA_scene_types.h Added AudioData struct, which holds scene-global audio settings. ./source/blender/makesdna/DNA_sequence_types.h Added support for audio strips. Some variables to hold Panning/Attenuation information, position information, reference to the sample, and some flags. ./source/blender/makesdna/DNA_userdef_types.h ./source/blender/src/usiblender.c Added a "Mixing buffer size" userpref. Made the versions stuff initialize it to a default for versions <2.28. ./source/blender/makesdna/DNA_space_types.h ./source/blender/src/filesel.c Added a Cyan dot to .WAV files. Any other suggestions on a better color? :) ./source/blender/src/editsound.c Changes (fixes) to the WAV file loader, re-enabled some gameengine code that is needed for dealing with bSounds and bSamples. ./source/blender/src/editipo.c ./source/blender/src/drawseq.c ./source/blender/src/editnla.c ./source/blender/src/space.c ./source/blender/src/drawview.c ./source/blender/src/renderwin.c ./source/blender/src/headerbuttons.c - Created two different wrappers for update_for_newframe(), one which scrubs the audio, one which doesn't. - Replaced some of the occurences of update_for_newframe() with update_for_newframe_muted(), which doesn't scrub the audio. - In drawview.c: Changed the synchronization scheme to get the current audio position from the audio engine, and use that as a reference for setting CFRA. Implements a/v sync and framedrop. - In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as volume envelopes. - In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing (update_for_newframe()) for moving the sequence editor framebar. ./source/blender/src/editseq.c Added support for audio strips and a default directory for WAV files which gets saved from the last Shift-A operation. ./source/blender/src/buttons.c Added Scene-global audio sequencer settings in Sound buttons. ./source/blender/src/sequence.c Various stuff that deals with handling audio strips differently than usual strips.
2003-07-13 20:16:56 +00:00
update_for_newframe_muted();
Biiig commit! Thanks to 2-3 weeks of cvs freeze... Render: - New; support for dual CPU render (SDL thread) Currently only works with alternating scanlines, but gives excellent performance. For both normal render as unified implemented. Note the "mutex" locks on z-transp buffer render and imbuf loads. - This has been made possible by major cleanups in render code, especially getting rid of globals (example Tin Tr Tg Tb Ta for textures) or struct OSA or using Materials or Texture data to write to. - Made normal render fully 4x32 floats too, and removed all old optimizes with chars or shorts. - Made normal render and unified render use same code for sky and halo render, giving equal (and better) results for halo render. Old render now also uses PostProcess options (brightness, mul, gamma) - Added option ("FBuf") in F10 Output Panel, this keeps a 4x32 bits buffer after render. Using PostProcess menu you will note an immediate re- display of image too (32 bits RGBA) - Added "Hue" and "Saturation" sliders to PostProcess options - Render module is still not having a "nice" API, but amount of dependencies went down a lot. Next todo: remove abusive "previewrender" code. The last main global in Render (struct Render) now can be re-used for fully controlling a render, to allow multiple "instances" of render to open. - Renderwindow now displays a smal bar on top with the stats, and keeps the stats after render too. Including "spare" page support. Not only easier visible that way, but also to remove the awkward code that was drawing stats in the Info header (extreme slow on some ATIs too) - Cleaned up blendef.h and BKE_utildefines.h, these two had overlapping defines. - I might have forgotten stuff... and will write a nice doc on the architecture!
2004-12-27 19:28:52 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
waitcursor(0);
G.f &= ~G_PLAYANIM;
if (event==ESCKEY || event==SPACEKEY) return 1;
else return 0;
}
Reference in New Issue Copy Permalink