Commit Graph

31 Commits (24a67fa1dadc14e3561ae5828a9f6991334183e0)

Author SHA1 Message Date
Buginator 803b52125e fix / add headers. merge sync: r11298
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11300 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:59:26 +02:00
Safety0ff 5c74291bab qwzm:
-Check that file is open before trying to write to it.
-Remove unnecessary include.
-Use 256 for fallback texture dimensions when writing a pie 2.
-Fix rounding when exporting to pie 2.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10759 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:51 +02:00
Safety0ff 1ade59528c qwzm:
-Touch up r10748 and fix a typo it introduced.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10754 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
Safety0ff dfdb343064 QWZM:
-Reviewed loadPIE and savePIE functions.
-Improved documentation of savePIE function.
-Added bounds checking to prevent currentFrame being an invalid value.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10748 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:42 +02:00
Safety0ff 78a9b96ea6 QWZM: Unclobber indentation (refs r10729,r10740.)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10747 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff ec73038633 QWZM:
Copy display/wzmutils .c & .h to the qwzm folder so that they can be modified for cpp/Qt/QWZM.
Revert r10279 for display/wzmutils .c & .h so that they work like wzmviewer expects them to.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10741 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff 2c08757b1c QWZM: Apply UI improvement patch by Emdek.
Modifications I made to it:
-Fixed the mesh selection issue in the patch.
-Witheld renaming the program (needs more discussion,) and changed version string.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10740 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff f146e9c044 QWZM:
-Added experimental PIE export.
-Added experimental PIE 3 import.
-Merged PIE and WZM opening into one dialog.
-Fixed ambiguous shortcuts.
-Single mesh display.
-Turned on alpha blending (for textures with alpha.)
-Improved (but not removed,) use of hardcoded paths for texture finding.
-Fixed some memory leaks.
-Way less potential program exits.
-Disabled (i.e. grayed out) buttons that don't currently do anything.
-Fixed some warnings.

Possibly other stuff, and probably new bugs. ;P
Refs #1763




git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10729 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:18 +02:00
Christian Ohm 48a60262bc Make it possible to override the QGLViewer paths for qwzm.
This makes it possible to compile qwzm on systems that use different paths
without modifying version controlled files.

Create a file called "config" in qwzm's directory that sets the
QGLVIEWER_INCL/LIBS variables. E.g. for Ubuntu 9.10 the following works:

QGLVIEWER_INCL = /usr/include/qglviewer-qt4
QGLVIEWER_LIBS = -lqglviewer-qt4

Current Debian unstable only needs the LIBS line.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9635 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:04 +01:00
Per Inge Mathisen 2d24d351e5 qwzm: Make use of QGLViewer. This lets us rotate and translate the model, as well as add various
helpful hints to the scene. Note that you need to install QGLViewer to use qwzm now.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6592 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-07 18:21:06 +00:00
Per Inge Mathisen ea999b01a7 qwzm: Port over level parsing fix from pie2wzm. Fix connector parsing error.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6588 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:25:30 +00:00
Per Inge Mathisen 9b26e6c1bd qwzm: Add missing file from way back.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6587 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:13:02 +00:00
Per Inge Mathisen 2528179e0b pie2wzm: Support new WZM connector spec.
qwzm: Fix tessellation bug in PIE conversion code. Fix crash.
wzm base: Detect more errors, print nicer WZM output.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6508 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 19:28:22 +00:00
Per Inge Mathisen 739fbcce41 qwzm: Add beginnings of connector support.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6496 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 00:37:11 +00:00
Per Inge Mathisen 7314ba1b29 qwzm: Add short-cut keys and some GUI prettifying.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 18:29:33 +00:00
Per Inge Mathisen b63790aaba qwzm: Forgot to commit one file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6458 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 17:55:19 +00:00
Per Inge Mathisen 0d243ce82d qwzm: Show animation frames as they are animated. Allow user to manually step through frames.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6452 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 21:27:42 +00:00
Per Inge Mathisen 001c5f2326 qwzm: You can now add and remove animation frames to models.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6451 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 20:34:08 +00:00
Per Inge Mathisen 7c477d668d qwzm: Allow basic editing of animation frames. You can change timing, translation and rotation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6447 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 21:27:19 +00:00
Per Inge Mathisen 5a98e7c029 qwzm: Add dialog to display the animation frames for each model mesh.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6446 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 20:59:57 +00:00
Per Inge Mathisen 541335f18e I forgot one file...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 22:07:24 +00:00
Per Inge Mathisen f714179393 qwzm: Refactor model loading functions to save code lines and remove duplicate code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6242 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:31:51 +00:00
Per Inge Mathisen 3d34a03813 qwzm: Move conversion functions into their own file. Add TODO messages to stdout for stuff that doesn't work.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:07:17 +00:00
Per Inge Mathisen 753bc5ac03 qwzm: Add import from PIE feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:52:00 +00:00
Per Inge Mathisen 07c1245e01 qwzm: Add 3DS import feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 19:50:54 +00:00
Per Inge Mathisen 632b539aea wzmutils: Add WZM save model function.
qwzm: Add more dummy GUI stubs. Implement save and save as.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 17:47:10 +00:00
Per Inge Mathisen 615520bc59 wzmviewer/qwzm: Unify animation code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6236 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 15:16:03 +00:00
Per Inge Mathisen ecb8208534 qwzm: Brute force fix for infinitely extrapolating interpolation in no animation case.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6235 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:47:35 +00:00
Per Inge Mathisen d7c9a522c9 qwzm: Fix animation bug due to using different timers for drawing and animating.
However, introduces new bug, when animation is not on, interpolation function will 
extrapolate into infinity, creating really funny non-animation animation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:10:10 +00:00
Per Inge Mathisen 232629a685 qwzm: Add more error reporting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6232 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:57:43 +00:00
Per Inge Mathisen 797701f42b Add WZM editor written in Qt. Be warned that it is still buggy and incomplete.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 17:56:58 +00:00