Bugfixes

Many bugfixes related to project importing, also some for the model viewer.
Also contains many things related to shaders and materials, not included in the released version.

Styles/Default/syntax.css

@@ -57,4 +57,27 @@
 .propeditor-property {
 	-fx-font-weight: bold;
 	-fx-fill: #CE81D6;
+}
+
+/** -- HLSL -- */
+
+.hlsl-comments {
+	-fx-fill: green;
+}
+.hlsl-enums {
+	-fx-fill: rgb(186, 85, 211);
+}
+.hlsl-numbers {
+	-fx-fill: #e5af25;
+}
+.hlsl-types {
+	-fx-fill: #008b8b;
+}
+.hlsl-keywords {
+	-fx-fill: rgb(0, 0, 255);
+	-fx-font-weight: bold;
+}
+.hlsl-functions {
+	-fx-fill: #e57402;
+	-fx-font-weight: bold;
 }

reg_file.txt

@@ -77581,4 +77581,41 @@ weaponCell
 weaponCharging
 weaponElectro
 weaponPoison
-wing
+wing
+
+materials_compiled_states_link~	0x40212000
+materials_compiled_states~	0x40212001
+materials_uncompiled_shader_fragments~	0x40212002
+materials_compiled_shaders~	0x40212004
+
+GenericStatic
+Generic2D
+Particles_Decal
+Particles_DecalInvertDepth
+Particles_DecalIgnoreDepth
+Particles_DepthDecal
+Particles_Additive
+Particles_AdditiveInvertDepth
+Particles_AdditiveIgnoreDepth
+Particles_Modulate
+Particles_NormalMap
+Particles_DepthNormalMap
+Particles_AlphaTestDissolve
+ParticlesLightFog_Decal
+ParticlesLightFog_DecalInvertDepth
+ParticlesLightFog_DecalIgnoreDepth
+ParticlesLightFog_DepthDecal
+ScreenAdditive
+ScreenBlend
+ScreenTint
+ScreenBrighten
+ScreenSkyBox
+ScreenBackground
+ScreenAdditiveTexture
+ScreenBlendTexture
+ScreenTintTexture
+ScreenBrightenTexture
+BuildBasis_0_0
+BuildBasis_0_1
+BuildBasis_1_0
+BuildBasis_1_1

reg_type.txt

@@ -62,7 +62,7 @@ cfx	0x278CF8F2
 dds	0x17952E6C
 snr	0x01a527db
 sns	0x01eef63a
-cpp	0x0469A3F7
+smt	0x0469A3F7
 eapd	0x022D2C83
 package	0x06EFC6AA
 instrument	0x03055F61

src/sporemodder/EditorManager.java

@@ -28,9 +28,6 @@
 
 import javafx.collections.ListChangeListener;
 import javafx.scene.Node;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Dialog;
 import javafx.scene.control.Tab;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -49,10 +46,12 @@
 import sporemodder.view.editors.PropEditorFactory;
 import sporemodder.view.editors.RWModelViewer;
 import sporemodder.view.editors.SearchableEditor;
+import sporemodder.view.editors.SmtTextEditorFactory;
 import sporemodder.view.editors.SpuiEditorFactory;
 import sporemodder.view.editors.TextEditorFactory;
 import sporemodder.view.editors.TlsaEditorFactory;
 import sporemodder.view.editors.XmlEditorFactory;
+import sporemodder.view.syntax.HlslSyntax;
 import sporemodder.view.syntax.SyntaxFormatFactory;
 import sporemodder.view.syntax.XmlSyntax;
 
@@ -114,6 +113,7 @@ public void initialize(Properties properties) {
 		// Default editors
 		// The default one goes first, as it will be the last one to be checked
 		editorFactories.add(defaultEditorFactory);
+		editorFactories.add(new SmtTextEditorFactory());
 		editorFactories.add(new XmlEditorFactory());
 		editorFactories.add(new PctpEditorFactory());
 		editorFactories.add(new TlsaEditorFactory());
@@ -126,6 +126,7 @@ public void initialize(Properties properties) {
 		// Default syntax highlighting
 		//TODO add more here!
 		syntaxHighlighters.add(new XmlSyntax());
+		syntaxHighlighters.add(new HlslSyntax());
 
 
 		// Load the icons for the project tree

src/sporemodder/FileManager.java

@@ -59,7 +59,7 @@ public static FileManager get() {
 
 	@Override public void initialize(Properties properties) {
 
-		searchableExtensions.addAll(Arrays.asList("prop_t", "xml", "locale", "txt", "trigger", "tlsa_t", "pctp_t", "pfx"));
+		searchableExtensions.addAll(Arrays.asList("prop_t", "xml", "locale", "txt", "trigger", "tlsa_t", "pctp_t", "pfx", "smt_t", "hlsl"));
 
 		protectedPackages.addAll(Arrays.asList("patchdata.package", "spore_audio1.package", "spore_audio2.package", 
 				"spore_content.package", "spore_game.package", "spore_graphics.package", "spore_pack_03.package", 

src/sporemodder/FormatManager.java

@@ -31,6 +31,7 @@
 import sporemodder.file.prop.PropConverter;
 import sporemodder.file.raster.RasterConverter;
 import sporemodder.file.rw4.RenderWareConverter;
+import sporemodder.file.shaders.SmtConverter;
 import sporemodder.file.tlsa.TLSAConverter;
 
 public class FormatManager extends AbstractManager {
@@ -39,6 +40,7 @@ public class FormatManager extends AbstractManager {
 
 	@Override
 	public void initialize(Properties properties) {
+		converters.add(new SmtConverter());
 		converters.add(new RasterConverter());
 		converters.add(new PCTPConverter());
 		converters.add(new TLSAConverter());

src/sporemodder/MainApp.java

@@ -30,6 +30,7 @@
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
+import sporemodder.file.shaders.FXCompiler;
 
 /**
  * The main class of the program.
@@ -48,6 +49,7 @@ public class MainApp extends Application {
 	private FormatManager formatManager;
 	private FileManager fileManager;
 	private UpdateManager updateManager;
+	private FXCompiler fxCompiler;
 
 	private Properties settings;
 
@@ -135,6 +137,10 @@ public UpdateManager getUpdateManager() {
 		return updateManager;
 	}
 
+	public FXCompiler getFXCompiler() {
+		return fxCompiler;
+	}
+
 	/**
 	 * Returns the current instance of the MainApp class.
 	 */
@@ -160,6 +166,7 @@ private void init(boolean testInit) {
 		formatManager = new FormatManager();
 		fileManager = new FileManager();
 		updateManager = new UpdateManager();
+		fxCompiler = new FXCompiler();
 
 		// Initialize it first, otherwise we can't get the settings
 		pathManager.initialize(null);
@@ -185,6 +192,7 @@ private void init(boolean testInit) {
 		projectManager.initialize(settings);
 		if (!testInit) documentationManager.initialize(settings);
 		formatManager.initialize(settings);
+		fxCompiler.initialize(settings);
 
 		// The plugin must go last, as plugins will use the other managers
 		pluginManager.initialize(settings);
@@ -201,6 +209,7 @@ public void saveSettings() {
 		documentationManager.saveSettings(settings);
 		formatManager.saveSettings(settings);
 		fileManager.saveSettings(settings);
+		fxCompiler.saveSettings(settings);
 
 		try (OutputStream stream = new FileOutputStream(pathManager.getProgramFile("config.properties"))) {
 			settings.store(stream, null);
@@ -219,6 +228,7 @@ public void stop() {
 		// The plugin must go first, as plugins will use the other managers
 		pluginManager.dispose();
 
+		fxCompiler.dispose();
 		documentationManager.dispose();
 		formatManager.dispose();
 		editorManager.dispose();

src/sporemodder/ProjectManager.java

@@ -1750,6 +1750,7 @@ private void importFile(File sourceFile, File destFolder) throws IOException {
 
 				MemoryStream stream = XmlPropParser.xmlToProp(in);
 				stream.seek(0);
+				//stream.writeToFile(new File(destFolder, name + ".prop"));
 
 				PropertyList list = new PropertyList();
 				list.read(stream);
@@ -1919,6 +1920,7 @@ public boolean importOldProject() {
 		ImportProjectTask task = new ImportProjectTask(project, sourceFolder, fileRegistry, propRegistry, typeRegistry);
 		task.showProgressDialog();
 
+		hasher.replaceRegistries(null, null, null);
 		hasher.setUpdateProjectRegistry(false);
 		saveNamesRegistry(project);
 		hasher.getProjectRegistry().clear();
@@ -1978,4 +1980,13 @@ public boolean showSaveDialog() {
 			return false;
 		}
 	}
+
+	public static void main(String[] args) throws IOException {
+		MainApp.testInit();
+
+		File file = new File("C:\\Users\\Eric\\Downloads\\DI_ItemDrop.prop.xml");
+		File destFolder = new File("C:\\Users\\Eric\\Desktop");
+
+		ProjectManager.get().importFile(file, destFolder);
+	}
 }

src/sporemodder/UIManager.java

@@ -543,6 +543,7 @@ public boolean tryAction(SimpleAction action, String errorText) {
 			return true;
 		}
 		catch (Exception e) {
+			e.printStackTrace();
 			showErrorDialog(e, errorText, true);
 			return false;
 		}

src/sporemodder/UpdateManager.java

@@ -68,7 +68,7 @@ public class UpdateManager {
 
     private static final String GITHUB_URL = "https://api.github.com";
 
-    public final VersionInfo versionInfo = new VersionInfo(2, 0, 2, null);
+    public final VersionInfo versionInfo = new VersionInfo(2, 0, 3, null);
 
     public static UpdateManager get() {
     	return MainApp.get().getUpdateManager();

src/sporemodder/file/dbpf/DBPFPackingTask.java

@@ -161,7 +161,7 @@ public boolean accept(File arg0) {
 					boolean bUsesConverter = false;
 
 					String name = file.getName();
-					file = getNestedFile(file, name);
+					file = getNestedFile(file, name, converters);
 
 					// Skip if there was a problem
 					if (file == null) continue;
@@ -285,20 +285,17 @@ public DBPFItem getTemporaryItem() {
 	}
 
 	//TODO consider changing how nested files work
-	private File getNestedFile(File file, String name) {
+	private File getNestedFile(File file, String name, List<Converter> converters) {
 		if (!file.isFile()) {
-			if (name.contains(".") && !name.endsWith(".effdir.unpacked")) {
-				File newFile = new File(file, name);
-				if (!newFile.exists()) {
-					failedFiles.put(file, new UnsupportedOperationException("Couldn't find file " + name + " inside subfolder " + name));
-					return null;
-				}
-				file = newFile;
+			for (Converter converter : converters) {
+				if (converter.isEncoder(file)) return file;
 			}
-			else if (!name.endsWith(".effdir.unpacked")) {
-				failedFiles.put(file, new UnsupportedOperationException("Nested subfolders are not supported. File: " + name));
+			File newFile = new File(file, name);
+			if (!newFile.exists()) {
+				failedFiles.put(file, new UnsupportedOperationException("Couldn't find file " + name + " inside subfolder " + name));
 				return null;
 			}
+			file = newFile;
 		}
 
 		return file;

src/sporemodder/file/effects/EffectDirectory.java

@@ -340,15 +340,18 @@ public void read(StreamReader stream) throws IOException {
 
 			componentOffsets[type] = offset + 4;
 
-			List<EffectComponent> list = new ArrayList<EffectComponent>(count);
-			components.set(type, list);
-
-			String keyword = factories[type].getKeyword();
-
-			for (int i = 0; i < count; ++i) {
-				EffectComponent component = factories[type].create(this, version);
-				component.setName(keyword + '-' + Integer.toString(i));
-				list.add(component);
+			if (type < factories.length && factories[type] != null &&
+					version >= factories[type].getMinVersion() && version <= factories[type].getMaxVersion()) {
+				List<EffectComponent> list = new ArrayList<EffectComponent>(count);
+				components.set(type, list);
+
+				String keyword = factories[type].getKeyword();
+
+				for (int i = 0; i < count; ++i) {
+					EffectComponent component = factories[type].create(this, version);
+					component.setName(keyword + '-' + Integer.toString(i));
+					list.add(component);
+				}
 			}
 
 			stream.seek(offset + size);
@@ -762,8 +765,11 @@ public static <T> void copyArray(T[] dest, T[] source) {
 	public static void main(String[] args) throws IOException {
 		MainApp.testInit();
 
-		String path = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effect Editor\\gameEffects_3~\\games.effdir";
-		String outputPath = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effect Editor\\gameEffects_3~\\games.effdir.unpacked";
+//		String path = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effect Editor\\gameEffects_3~\\editors.effdir";
+//		String outputPath = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effect Editor\\gameEffects_3~\\editors.effdir.unpacked";
+
+		String path = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effects\\gameEffects_3~\\base.effdir";
+		String outputPath = "E:\\Eric\\Eclipse Projects\\SporeModder FX\\Projects\\Effects\\gameEffects_3~\\base.effdir.unpacked";
 
 		long time = System.currentTimeMillis();
 

src/sporemodder/file/effects/LightEffect.java

@@ -81,6 +81,8 @@ public LightEffect(EffectDirectory effectDirectory, int version) {
 
 	@Override public void read(StreamReader in) throws IOException {
 
+		System.out.println(in.getFilePointer());
+
 		flags = in.readInt();  // & 0xF ?
 		type = in.readByte();
 
@@ -110,8 +112,10 @@ public LightEffect(EffectDirectory effectDirectory, int version) {
 		out.writeInt(flags);
 		out.writeByte(type);
 
-		out.writeFloat(life);
-		out.writeShort(loop);
+		if (version > 1) {
+			out.writeFloat(life);
+			out.writeShort(loop);
+		}
 
 		out.writeInt(color.size());
 		for (ColorRGB f : color) f.writeLE(out);