R20 Update

.gitignore

@@ -1,5 +1,11 @@
 build/
+generated/
+project/*
+!project/projectdefinition.txt
 *.cdl64
 *.exp
 *.lib
 *.dylib
+*.xlib
+*.profraw
+.DS_Store

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "craftr/modules/maxon.c4d"]
-	path = craftr/modules/maxon.c4d
-	url = https://github.com/craftr-build/NiklasRosenstein.maxon.c4d.git
 [submodule "_vendor/aaocean"]
 	path = _vendor/aaocean
 	url = [email protected]:NiklasRosenstein/mirror-aaOcean.git
+[submodule "craftr/net.maxon.c4d"]
+	path = craftr/net.maxon.c4d
+	url = [email protected]:craftr-build/net.maxon.c4d.git

README.md

@@ -54,3 +54,9 @@ aaOcean Shader and Deformer by [Amaan Akram][0], ported to Cinema 4D by
 [0]: http://www.amaanakram.com/
 [1]: http://www.psd.de/
 [2]: http://niklasrosenstein.com/
+
+## Changelog
+
+### v1.0.1
+
+- R20 Update

build.craftr

@@ -0,0 +1,33 @@
+import * from 'craftr'
+project('com.niklasrosenstein.c4d-aaOcean', '1.0')
+link_module('./craftr/net.maxon.c4d')
+import c4d from 'net.maxon.c4d'
+
+includes = [
+  'res',
+  '_vendor/aaocean/externals/aaOcean/src',
+  '_vendor/aaocean/externals/helpers'
+]
+
+target('aaOcean')
+depends(['net.maxon.c4d:addons'])
+properties({
+  'cxx.srcs': ['source/aaOceanC4D.cpp'],
+  'cxx.type': 'library',
+  'cxx.includes': includes,
+  'cxx.enableOpenmp': True,
+  'c4d.SourceProcessor': False
+})
+c4d.build()
+
+target('plugin')
+depends(['net.maxon.c4d:addons'])
+depends([':aaOcean'])
+properties({
+  'cxx.srcs': ['source/main.cpp', 'source/aaOceanDeformer.cpp', 'source/aaOCeanShader.cpp'],
+  'cxx.includes': includes,
+  'cxx.enableOpenmp': True,
+  'cxx.productDirectory': '.',
+  'cxx.productName': 'c4d-aaOcean' + c4d.plugin_suffix
+})
+c4d.build()

project/projectdefinition.txt

@@ -0,0 +1,5 @@
+ModuleId=com.niklasrosenstein.c4d-aaOcean
+Platform=Win64;OSX
+Type=DLL
+stylecheck=false
+APIS=cinema.framework

src/aaOceanC4D.cpp → source/aaOceanC4D.cpp

@@ -18,6 +18,7 @@
 
 #include "aaOceanC4D.h"
 #include <aaOceanClass.cpp>
+#include <c4d_apibridge.h>
 
 aaOceanC4D::aaOceanC4D()
 {
@@ -74,7 +75,6 @@ Bool aaOceanC4D::IsChoppy() {
   return _oc->isChoppy();
 }
 
-
 Bool RegisterAaOceanDescription() {
-  return RegisterDescription(DaaOceanC4D, "aaOceanC4D");
+  return RegisterDescription(DaaOceanC4D, "aaOceanC4D"_s);
 }

src/aaOceanDeformer.cpp → source/aaOceanDeformer.cpp

@@ -17,6 +17,7 @@
  */
 
 #include <c4d.h>
+#include <c4d_apibridge.h>
 #include <description/OaaOceanDeformer.h>
 #include "aaOceanC4D.h"
 #include "utils.h"
@@ -114,6 +115,12 @@ class aaOceanDeformer : public ObjectData
 
 Bool RegisterAaOceanDeformer()
 {
-  return RegisterObjectPlugin(OaaOceanDeformer, "aaOceanDeformer", OBJECT_MODIFIER,
-    aaOceanDeformer::Alloc, "OaaOceanDeformer", AutoBitmap("aaoceandeformer.png"), 0);
+  return RegisterObjectPlugin(
+    OaaOceanDeformer,
+    "aaOceanDeformer"_s,
+    OBJECT_MODIFIER,
+    aaOceanDeformer::Alloc,
+    "OaaOceanDeformer"_s,
+    AutoBitmap("aaoceandeformer.png"_s),
+    0);
 }

src/aaOceanShader.cpp → source/aaOceanShader.cpp

@@ -17,6 +17,7 @@
  */
 
 #include <c4d.h>
+#include <c4d_apibridge.h>
 #include <description/XaaOceanShader.h>
 #include "aaOceanC4D.h"
 #include "utils.h"
@@ -82,5 +83,11 @@ class aaOceanShader : public ShaderData
 
 Bool RegisterAaOceanShader() {
   Int32 const info = 0;
-  return RegisterShaderPlugin(XaaOceanShader, "aaOceanShader", info, aaOceanShader::Alloc, "XaaOceanShader", 0);
+  return RegisterShaderPlugin(
+    XaaOceanShader,
+    "aaOceanShader"_s,
+    info,
+    aaOceanShader::Alloc,
+    "XaaOceanShader"_s,
+    0);
 }

src/main.cpp → source/main.cpp

@@ -17,6 +17,7 @@
  */
 
 #include <c4d.h>
+#include <c4d_apibridge.h>
 #include "aaOceanC4D.h"
 
 extern Bool RegisterAaOceanDeformer();
@@ -33,7 +34,7 @@ Bool PluginStart() {
 Bool PluginMessage(Int32 msg, void* pdata) {
   switch (msg) {
     case C4DPL_INIT_SYS:
-      return ::resource.Init();
+      return c4d_apibridge::GlobalResource().Init();
   }
   return true;
 }