Philip Allgaier avatar Philip Allgaier committed 888680f

Fixed hydrax integration error: Previously water color change was only taken into account when "Caelum Integration" was flagged. Now the color changes directly regardless of flag state.

Comments (0)

Files changed (2)

Plugins/OgHydrax/HydraxWaterEditor.cpp

     PROPERTY_PTR(mFullReflectionDistance, "full_reflection_distance", Ogre::Real, 0, 0, SETTER(Ogre::Real, CHydraxEditor, _setFullReflectionDistance));
     PROPERTY_PTR(mGlobalTransparency, "global_transparency", Ogre::Real, 0, 0, SETTER(Ogre::Real, CHydraxEditor, _setGlobalTransparency));
     PROPERTY_PTR(mNormalDistortion, "normal_distortion", Ogre::Real, 0, 0, SETTER(Ogre::Real, CHydraxEditor, _setNormalDistortion));
-    PROPERTY_PTR(mOriginalWaterColour, "watercolour", Ogre::ColourValue, Ogre::ColourValue(0,0,0), 0, 0);
+    PROPERTY_PTR(mOriginalWaterColour, "watercolour", Ogre::ColourValue, Ogre::ColourValue(0,0,0), 0, SETTER(Ogre::ColourValue, CHydraxEditor, _setWaterColour));
 
     PROPERTY_PTR(mComponentSun, "components::sun", bool, 0, 0, SETTER(bool, CHydraxEditor, _setComponentSun));
     PROPERTY_PTR(mComponentFoam, "components::foam", bool, 0, 0, SETTER(bool, CHydraxEditor, _setComponentFoam));

qtOgitor/src/main.cpp

 void setupOgre(Ogre::String plugins, Ogre::String config, Ogre::String log)
 {
     // Create the main ogre object
-    mOgreRoot = OGRE_NEW Ogre::Root( plugins);
+    mOgreRoot = OGRE_NEW Ogre::Root(plugins);
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
     // load additional plugins
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.