Commit Graph

1106 Commits

Author SHA1 Message Date
Brecht Van Lommel
cb89decfdc Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:

* GLSL support in the viewport and game engine, enable in the game
  menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
  gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
  storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.

* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
  An extra texture slot shows up once the last slot is used.

* Memory limit for undo, not enabled by default yet because it
  needs the .B.blend to be changed.
* Multiple undo for image painting.

* An offset for dupligroups, so not all objects in a group have to
  be at the origin.
2008-09-04 20:51:28 +00:00
Campbell Barton
b818b1a164 cleanup mesh materials option was setting incorrect material indicies 2008-09-03 03:24:01 +00:00
Ian Thompson
aa4e4da8c3 Text Editor (GSOC 2008)
=======================
Merge of branch soc-2008-quorn to trunk:
Merged 14970:16308 to trunk@16307, updated to HEAD.
Merged 16318

Main features from this branch:
 - Python text plugins
 - Suggestions and documentation elements
 - Improved syntax highlighting
 - Word wrap
 - Additional editing tools
 - Various undo and clipboard fixes
 - File header info and modification checks
2008-09-01 14:04:22 +00:00
Ian Thompson
3bab89cc1c Merge from trunk 16122-16307 2008-08-30 14:32:16 +00:00
Ian Thompson
bccce7e30e Fix for class variable parsing/listing bug. 2008-08-30 11:27:27 +00:00
Ian Thompson
0257f500e7 Fix for text plug-in scripts on 64-bit platforms. 2008-08-26 17:09:17 +00:00
Ton Roosendaal
39a8125e4c Typo in copyright notice (VF -> BF) 2008-08-22 12:48:12 +00:00
Geoffrey Bantle
09c4e88336 -> more FLT tweaks
LOD editor input ranges were too low.
Also fixed the interface drawing so it
always started at bottom of screen area.
2008-08-20 20:10:33 +00:00
Geoffrey Bantle
e7cf01d083 -> Fix for last commit
The range of allowed values for the LOD editor
 inputs was too low.
2008-08-20 19:18:52 +00:00
Geoffrey Bantle
6d7fa6020e -> LOD and DOF editor scripts
Two new scripts for the 'Misc' Menu. LOD and DOF
 Editors for creating/editing DOF and LOD FLT nodes
 inside of blender.
2008-08-20 19:10:33 +00:00
Ian Thompson
e1ceab6ed6 Missed parentheses from except clause, has a whole different meaning. 2008-08-18 14:16:34 +00:00
Ian Thompson
7f30e5fdd2 Better class support with inheritance for text parsing. 2008-08-18 10:01:49 +00:00
Daniel Genrich
fd0072e77c Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported! 2008-08-17 17:08:00 +00:00
Ian Thompson
3a62928777 Fix for numeric var types creating an error. 2008-08-17 10:08:38 +00:00
Ian Thompson
d1d1d2b870 Improvements to the base BPyTextPlugin module:
- Added a centralized function for resolving targets (aaa.bbb.ccc)
 - Added documentation support for locally defined classes and methods
 - The time taken to parse now dictates how long to use the cache before parsing again
 - Other tweaks and comments and support for numeric var types

The text plugin scripts have been updated to make use of these features.
2008-08-15 23:14:22 +00:00
Ian Thompson
bda3e4f8e2 Merge from trunk 16031:16122 2008-08-15 00:00:27 +00:00
Martin Poirier
db42038bcf merging trunk 15964 -> 16116 2008-08-14 21:16:48 +00:00
Diego Borghetti
ae3a875ad2 Part one of the 2.47 release commit 2008-08-14 06:33:19 +00:00
Ian Thompson
65d0ef3e74 Speed improvements for reading text lines and the option to specify a range for Text.asLines([start[, end]]) Also some tweaks for the plug-in scripts and updates to pydocs. 2008-08-12 15:17:08 +00:00
Campbell Barton
f876930904 fix for [#17365] PLY export script writes comment in invalid way
this is good for 2.47
2008-08-11 03:52:21 +00:00
Ian Thompson
a5d955632f Added sys.path module search to BPyTextPlugin module and fixed IndentationError when parsing. 2008-08-10 17:00:25 +00:00
Ian Thompson
5dad154414 Fixed inconsistencies between the text plugins and them not suggesting when called from the menu. 2008-08-10 16:07:14 +00:00
Ian Thompson
ed972db1a3 Merge from trunk: 15912:16031 2008-08-09 10:12:59 +00:00
Ian Thompson
d42891975b Typing 'from a import b' threw an error if b was not found. Accidentally moved this out of the try block in an earlier tidy-up. 2008-08-08 15:54:04 +00:00
Remigiusz Fiedler
98302f6c7c forgot update ver.number in last commit 2008-08-08 11:40:51 +00:00
Geoffrey Bantle
1d425f8da2 -> Fix for warnings in FLT exporter and Palette Manager
Removed buffer overflow masking warnings from the
FLT exporter and Palette Manager.
2008-08-07 22:31:35 +00:00
Geoffrey Bantle
66d6221899 -> Slight tweak to FLT exporter
FLT files written by the FLT exporter would
reference external files (other FLT files,
texture maps, ect) with standard backslash
seperators on win32. However, many tools
that deal with FLT files expect directory
seperators to always be forward slashes
regardless of platform.
2008-08-07 04:38:35 +00:00
Ian Thompson
6c0f4660ed Various UI drawing and event tweaks to make markers feel more natural and avoid getting in the way. If there is a marker under the cursor, ESC will remove it and others in its group. Otherwise all temporary markers are removed. Tab finds/cycles/removes temp. markers, cycles non-temp. markers (under cursor) and behaves normally in all other cases. 2008-08-06 13:46:44 +00:00
Ian Thompson
799ba2c351 Added a Python interface to the marker system with a few additional functions for modifying text selections in general. Tweaked some of the events and drawing code and added a template completion script along the lines of gedit's snippets. 2008-08-05 23:23:31 +00:00
Martin Poirier
e238066525 Merging with trunk
15568 - 15963
2008-08-05 02:27:09 +00:00
Campbell Barton
07bc1e56fe own bug in weightpaint cleaning, wasnt removing as many groups from verts as it should be. 2008-08-04 23:20:12 +00:00
Remigiusz Fiedler
ac7aef6b3d DXF-importer script. Works well with 2.46winXP
Please commit to 2.47 branch
patch history:
 v1.12 - 2008.08.03
 c2 warningfix: relocating of globals: layersmap, oblist 
 c2 modif UI: buttons newScene+targetLayer moved to start panel
 v1.12 - 2008.07.04
 c1 added control Curve's OrderU parameter
 c1 modif UI: preset buttons X-2D-3D moved to start panel
 b6 added handling exception of not registered LAYERs (Hammer-HL-editor DXF output)
 b5 rebuild UI: global preset 2D for Curve-Import
 b5 added UI-options: PL-MESH N+N plmesh_flip and normals_out 
 b5 added support for SPLINEs, added control OrderU parameter
 b5 rewrote draw module for NURBS_curve and Bezier_curve
 v1.12 - 2008.06.22
 b4 change versioning system 1.0.12 -> 1.12
 b4 print at start version-info to console
 b3 bugfix: ob.name conflict with existing meshes (different ob.name/mesh.name)
2008-08-03 15:57:09 +00:00
Ian Thompson
ed5002458b Merged 15771:15912 from trunk 2008-08-01 23:39:52 +00:00
Remigiusz Fiedler
91ece746b8 commit by jms:
Rvk1 to rvk2 script python did not work anymore with the softbodie in blender 2.46.  Only one line needs to be removed.
2008-07-28 10:13:56 +00:00
Ian Thompson
6531d859ba TextPlugin update: Converted try-except blocks to use try-catch-else to allow better error tracking. Commented the descriptor classes and improved variable support for basic types (string, list, etc.) 2008-07-26 20:02:10 +00:00
Ian Thompson
07b8c7e887 Updated the textplugin_outliner.py plug-in to use the new Draw.PupTreeMenu and updated this menu to support titles. 2008-07-21 19:11:38 +00:00
Ian Thompson
5435d7c3ea Oops, typo in rev. 15664 caused error 2008-07-21 11:21:49 +00:00
Ian Thompson
fab7270e40 Script template added for text plug-ins 2008-07-21 10:07:03 +00:00
Ian Thompson
6352cd509e BPyTextPlugin now has descriptors for variables, functions and classes (and their variables/functions). Each descriptor also holds the line number of the definition allowing a simple outliner to be written.
Text.setCursorPos(row, col) now pops the text into view if it is in the active window space. The outliner uses this to jump to any definition in a script; it is invoked with Ctrl+T.
2008-07-21 00:38:42 +00:00
Ian Thompson
f042a468fd Merged 15170:15635 from trunk (no conflicts or even merges) 2008-07-18 23:35:34 +00:00
Ian Thompson
123407e0b4 Added a documentation panel with primitive word-wrap functionality. It can be displayed by Text.showDoc(string) in python and has a text-plugin script for function docs which may be invoked with Ctrl+I inside its params list. Eg. type "dir(" <Ctrl+I> 2008-07-18 23:12:19 +00:00
Ian Thompson
b205cf34b4 All parsing is now done in one sweep and cached to allow details to be obtained without re-parsing. A text can be manually parsed with parse_text(text) which also updates the cache. 2008-07-18 11:00:34 +00:00
Ian Thompson
062643eefd Fixed error when scripts were run without a visible Text to work on. 2008-07-16 12:56:23 +00:00
Ian Thompson
cc89221a24 Previously relying on import to run scripts didn't work every time and was not the right way to do it. Also fixed a problem with 'import *' not working and added the sys.modules list to the import suggestion list with a timed update. 2008-07-16 10:33:48 +00:00
Ian Thompson
512eec04aa Made suggestions case-insensitive which also puts _ prefixed items at the bottom. Improvements have also been made to the way the list works, when it should disappear/update/confirm, etc. 2008-07-15 17:03:59 +00:00
Ian Thompson
9037159d7a Text plugin script updates: Better error handling, variable parsing, token caching for repeat parsing of the same document. Fixed joining of multiline statements and context detection. 2008-07-15 12:55:20 +00:00
Ian Thompson
aeb4d0c631 Created a BPy module BPyTextPlugin to centralize functions used across the text plugin scripts. Also created two more scripts to handle imports and member suggestions. 2008-07-15 07:34:46 +00:00
Ian Thompson
dbb61988fd Any script can now register a unique key combination as part of its bpy header. For a supported space type, the user may press this shortcut to invoke the script.
Space types that are to support shortcuts like this should call BPY_menu_do_shortcut(...) from the event queue read method (See winqreadtextspace in drawtext.c for example)
2008-07-15 07:04:31 +00:00
Martin Poirier
84ae0fc000 merge with trunk (15330 -> 15566) 2008-07-14 14:09:36 +00:00
Maxime Curioni
270184e1b2 soc-2008-mxcurioni: merge-repair with trunk rev 15456 2008-07-06 19:53:32 +00:00