Skip to content
This repository has been archived by the owner on Sep 3, 2019. It is now read-only.

Refactor3d #507

Merged
merged 7 commits into from
Oct 21, 2014
Merged

Refactor3d #507

merged 7 commits into from
Oct 21, 2014

Conversation

cwillisf
Copy link
Contributor

Instead of loading the 3D rendering code dynamically from a separate SWF, this change uses conditional compilation to build the editor SWF with or without 3D features depending on the value of a new SCRATCH::allow3d flag.
It might be more effective to view the diffs for individual commits, since the first commit moves several files.
This change will require updates to the way Travis builds this code.

@sclements
Copy link
Contributor

Does the Travis auto-build support conditional compiling? I'd like to still use it and build upon it.

@cwillisf
Copy link
Contributor Author

I don't know how to configure Travis but if it supports either passing command line arguments to the compiler (like "-define=namespace::variable_name,value") or using a flex-config.xml file then it can support conditional compilation. See also: http://help.adobe.com/en_US/flex/using/WS2db454920e96a9e51e63e3d11c0bf69084-7abd.html

@cwillisf
Copy link
Contributor Author

I think I just found how to do it. I'll see if I can get it working.

@sclements
Copy link
Contributor

Great! We'll have to coordinate the proper website changes to support this. 👍

To simplify building and debugging the 3D rendering code, I moved it
into the main src/ directory. This breaks the AIR 2.6 build, but an
upcoming change will fix that.
The 'SCRATCH::allow3d' flag now controls 3D-related code.
sclements added a commit that referenced this pull request Oct 21, 2014
@sclements sclements merged commit 41dc70e into master Oct 21, 2014
@sclements sclements deleted the refactor3d branch October 21, 2014 20:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants