Game Development Community

Question with T3D merge

by Juan Lemus · in Arcane FX (Public) · 03/13/2010 (9:41 am) · 3 replies

Hi guys I was following your guide for AFX2.0 - T3D merge, to make a personalize merge, but I’m having a hard time following the indications. The problem that it’s still the guide for TGEA and that most of the files and search terms don’t exist anymore. Is there a more actualize version of this guide that I can help me with my customize merge? Or do I need to some extra add on to be able to do the merge?
NextNext Thread
PrevPrevious Thread
More from Arcane FX (Public)


Associate Jeff Faust
Faust Logic, Inc.
#1
03/14/2010 (2:39 pm)
Given the frequency of GarageGame's T3D changes and the fact that we released AFX 2 across three engines, there are some deeper details that we don't get to as quickly as in past releases. Also, I usually don't prepare a merge guide until the release is past beta. AFX-for-T3D is the first time we've released a new product while still in beta, so unfortunately there's no up-to-date merge document at release time.

Eventually, there will be an AFX-for-T3D merge guide in the AFX Wiki, but that still shouldn't keep you from doing a merge. Nearly all AFX mods are clearly labeled with "AFX CODE BLOCK" comments (it does get a bit messy in the particle system sources). With a tool like Beyond Compare (which I highly recommend) you can compare all the source files in the Engine/source folders, and all the changes should stand out pretty clearly.

A good approach is to do what I call a "triangulated merge". Use Beyond Compare (or any similar tool) to identify all files changed between Stock T3D and Stock AFX-for-T3D. Then do the same thing to identify files changed between Stock T3D and your own project. Then compare the modified files in both groups. Those files that are common to both groups are the ones that contain overlapping changes that you need to merge carefully.

Torque Owner Jeff Yaskus
jy games
#2
03/16/2010 (2:39 pm)
Jeff / Juan --- an even easier method

Download the logicking's free "code patch" tool ... it does a 3 way comparison/merge.
http://www.logicking.com/index.php?page=downloads

Its insane how much help it has been to me ... you select the core build, your build and the "mod" build ... and a directory to write all the output.

It merges the core + your + mod into a complete new version for you. If there are any conflicts, it pulls up winmerge (install it first) and lets you sort it out by hand.

Big help and its free

Associate Jeff Faust
Faust Logic, Inc.
#3
03/26/2010 (6:29 am)
Much of the AFX2-for-T3D Merging Guide is now available on the AFX Wiki at:
arcane-fx.com/wiki/Upkeep_:_T3D_Engine_Modifications

There are still some information holes, particularly in the area of particle-system enhancement and engine bug-fixes, but you may find it helpful for answering some merging questions.