Merge pull request #17 from fwilleke80/update-projects

Update for R20 - R23
fwilleke80 · Jan 13, 2021 · dab8163 · dab8163
2 parents a34544b + 6e9f386
commit dab8163
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,10 @@
 *.xcscheme
 *.plist
 *.dylib
+*.xlib
+*.msg
+*.stamp
+.DS_Store
 
 # Windows files
 *.exp
@@ -16,3 +20,7 @@
 /*.obj
 *.lastbuildstate
 *.obj
+
+# Other files
+projecttool_log.txt
+generated
diff --git a/compile_instructions.md b/compile_instructions.md
@@ -0,0 +1,6 @@
+# PointProjector - Build instructions
+
+* Copy the PointProjector repository into the `plugins` folder
+* Download the maxon project tool [https://developers.maxon.net/?page_id=1118]()
+* Unpack the tool and run on windows `kernel_app_64bit.exe g_updateproject=<yourfolder>`
+* Build the PointProjector project with XCode or VisualStudio
diff --git a/compile_instructions.txt b/compile_instructions.txt
diff --git a/example/pointprojector_example_r23.c4d b/example/pointprojector_example_r23.c4d
diff --git a/PointProjector/project/projectdefinition.txt → project/projectdefinition.txt b/PointProjector/project/projectdefinition.txt → project/projectdefinition.txt
@@ -14,4 +14,4 @@ C4D=true
 stylecheck.level=3
 
 // Custom ID
-ModuleId=net.fkemmler.pointprojector
+ModuleId=de.frankwilleke.pointprojector
diff --git a/PointProjector/res/c4d_symbols.h → res/c4d_symbols.h b/PointProjector/res/c4d_symbols.h → res/c4d_symbols.h
diff --git a/PointProjector/res/description/oProjector.h → res/description/oProjector.h b/PointProjector/res/description/oProjector.h → res/description/oProjector.h
diff --git a/...tProjector/res/description/oProjector.res → res/description/oProjector.res b/...tProjector/res/description/oProjector.res → res/description/oProjector.res
diff --git a/PointProjector/res/oProjector.tif → res/oProjector.tif b/PointProjector/res/oProjector.tif → res/oProjector.tif
diff --git a/...tProjector/res/strings_de/c4d_strings.str → res/strings_de/c4d_strings.str b/...tProjector/res/strings_de/c4d_strings.str → res/strings_de/c4d_strings.str
diff --git a/...res/strings_de/description/oProjector.str → res/strings_de/description/oProjector.str b/...res/strings_de/description/oProjector.str → res/strings_de/description/oProjector.str
diff --git a/...tProjector/res/strings_us/c4d_strings.str → res/strings_us/c4d_strings.str b/...tProjector/res/strings_us/c4d_strings.str → res/strings_us/c4d_strings.str
diff --git a/...res/strings_us/description/oProjector.str → res/strings_us/description/oProjector.str b/...res/strings_us/description/oProjector.str → res/strings_us/description/oProjector.str
diff --git a/PointProjector/source/lib/wsFunctions.cpp → source/lib/wsFunctions.cpp b/PointProjector/source/lib/wsFunctions.cpp → source/lib/wsFunctions.cpp
diff --git a/PointProjector/source/lib/wsFunctions.h → source/lib/wsFunctions.h b/PointProjector/source/lib/wsFunctions.h → source/lib/wsFunctions.h
diff --git a/...Projector/source/lib/wsPointProjector.cpp → source/lib/wsPointProjector.cpp b/...Projector/source/lib/wsPointProjector.cpp → source/lib/wsPointProjector.cpp
diff --git a/PointProjector/source/lib/wsPointProjector.h → source/lib/wsPointProjector.h b/PointProjector/source/lib/wsPointProjector.h → source/lib/wsPointProjector.h
diff --git a/PointProjector/source/main.cpp → source/main.cpp b/PointProjector/source/main.cpp → source/main.cpp
diff --git a/PointProjector/source/main.h → source/main.h b/PointProjector/source/main.h → source/main.h
diff --git a/PointProjector/source/object/oProjector.cpp → source/object/oProjector.cpp b/PointProjector/source/object/oProjector.cpp → source/object/oProjector.cpp
@@ -269,6 +269,14 @@ void oProjector::CheckDirty(BaseObject *op, BaseDocument *doc)
 	// Iterate modifier and its parents and add their dirty checksums
 	dirtyness += AddDirtySums(op, false, dirtyFlags);
 
+#if API_VERSION >= 23000
+	// Add falloff dirtiness
+	if (_falloff)
+	{
+		dirtyness += _falloff->GetDirty(doc);
+	}
+#endif
+
 	// Compare dirty checksum to previous one, set modifier dirty if necessary
 	if (dirtyness != _lastDirtyness + 1)
 	{